From 8097e200c7b22a4dce0067b9730e08f64432b0af Mon Sep 17 00:00:00 2001
From: Niktia <seekergame123@gmail.com>
Date: Wed, 19 Feb 2025 18:56:38 +0300
Subject: [PATCH] .

---
 .../ru/myitschool/work/data/auth/AuthNetworkDataSource.kt     | 4 ++--
 .../java/ru/myitschool/work/domain/user/GetUserUseCase.kt     | 2 +-
 .../main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt | 1 -
 .../java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt     | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/data/auth/AuthNetworkDataSource.kt b/app/src/main/java/ru/myitschool/work/data/auth/AuthNetworkDataSource.kt
index e359888..444d099 100644
--- a/app/src/main/java/ru/myitschool/work/data/auth/AuthNetworkDataSource.kt
+++ b/app/src/main/java/ru/myitschool/work/data/auth/AuthNetworkDataSource.kt
@@ -4,6 +4,7 @@ import android.util.Log
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.request.header
+import io.ktor.client.request.patch
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
@@ -24,6 +25,7 @@ object AuthNetworkDataSource {
         runCatching {
             val result = client.get("$SERVER_ADDRESS/api/login") {
                 header(HttpHeaders.Authorization, token)
+
             }
             Log.d("result", "${result.status}")
             if (result.status == HttpStatusCode.Unauthorized) {
@@ -31,7 +33,5 @@ object AuthNetworkDataSource {
             }
             result.body<UserDto>()
         }
-
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt b/app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt
index 786add4..f49a288 100644
--- a/app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt
+++ b/app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt
@@ -7,7 +7,7 @@ class GetUserUseCase(
     private val repo: UserRepo,
     private val authStorageDataSource: AuthStorageDataSource
 ) {
-    suspend fun getUserFromStorage() : UserDto? {
+    private fun getUserFromStorage() : UserDto? {
         return authStorageDataSource.userInfo
     }
     suspend operator fun invoke() = repo.getUser(getUserFromStorage()?.login!!)
diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt
index a9ddaab..c3575f8 100644
--- a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanFragment.kt
@@ -66,7 +66,6 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) {
                 }
                 is QrScanViewModel.Action.CloseWithResult -> {
                     sendResult(QrScanDestination.packToBundle(action.result))
-                    goBack()
                 }
             }
         }
diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt
index 14565ab..e28da09 100644
--- a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanViewModel.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ru.myitschool.work.domain.user.EnterUseCase
 import ru.myitschool.work.utils.MutablePublishFlow
 
 // НЕ ИЗМЕНЯЙТЕ ЭТОТ ФАЙЛ. В ТЕСТАХ ОН БУДЕМ ВОЗВРАЩЁН В ИСХОДНОЕ СОСТОЯНИЕ
@@ -90,4 +91,5 @@ class QrScanViewModel(
 
         const val CAMERA_PERMISSION = Manifest.permission.CAMERA
     }
+
 }
\ No newline at end of file