From 78e5ed449438763dace073879d65eb1218eb946c Mon Sep 17 00:00:00 2001
From: Niktia <seekergame123@gmail.com>
Date: Thu, 20 Feb 2025 14:59:48 +0300
Subject: [PATCH] debugs

---
 .../main/java/ru/myitschool/work/data/user/CodeDto.kt | 11 +++++++++++
 .../work/data/user/UserNetworkDataSource.kt           |  6 ++++--
 .../ru/myitschool/work/ui/profile/ProfileFragment.kt  |  2 ++
 .../myitschool/work/ui/qr/result/QrResultFragment.kt  |  2 +-
 .../ru/myitschool/work/ui/qr/scan/QrScanFragment.kt   | 11 +++++++----
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/ru/myitschool/work/data/user/CodeDto.kt

diff --git a/app/src/main/java/ru/myitschool/work/data/user/CodeDto.kt b/app/src/main/java/ru/myitschool/work/data/user/CodeDto.kt
new file mode 100644
index 0000000..74c6110
--- /dev/null
+++ b/app/src/main/java/ru/myitschool/work/data/user/CodeDto.kt
@@ -0,0 +1,11 @@
+package ru.myitschool.work.data.user
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable;
+
+@Serializable
+data class CodeDto(
+
+    @SerialName("value")
+    val value : String
+)
diff --git a/app/src/main/java/ru/myitschool/work/data/user/UserNetworkDataSource.kt b/app/src/main/java/ru/myitschool/work/data/user/UserNetworkDataSource.kt
index be3abbc..693dff1 100644
--- a/app/src/main/java/ru/myitschool/work/data/user/UserNetworkDataSource.kt
+++ b/app/src/main/java/ru/myitschool/work/data/user/UserNetworkDataSource.kt
@@ -5,6 +5,7 @@ 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.setBody
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpStatusCode
@@ -50,9 +51,10 @@ class UserNetworkDataSource {
     }
     suspend fun enter(value : String, login : String): Result<Boolean> = withContext(Dispatchers.IO) {
         runCatching {
-            val result = client.patch("$SERVER_ADDRESS/api/open") {
+            val result = client.patch("$SERVER_ADDRESS/api/$login/open") {
                 header(HttpHeaders.Authorization, token)
-
+                header(HttpHeaders.ContentType, "application/json")
+                setBody(CodeDto(value))
             }
             Log.d("result", "${result.status}")
             if (result.status != HttpStatusCode.OK) {
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
index fe19dd9..c4166a3 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
@@ -36,6 +36,8 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
         }
         viewBinding.qrScan.setOnClickListener{
             findNavController().navigate(R.id.action_fragment_profile_to_fragment_qr)
+
+
         }
         val adapter = EntranceAdapter()
         viewBinding.recyclerView.adapter = adapter
diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.kt b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.kt
index 747af54..26149e0 100644
--- a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.kt
@@ -20,10 +20,10 @@ class QrResultFragment : Fragment(R.layout.fragment_qr_result) {
     private val viewModel by viewModels<QrResultViewModel> { QrResultViewModel.Factory }
 
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         _viewBinding = FragmentQrResultBinding.bind(view)
         super.onViewCreated(view, savedInstanceState)
-
         parentFragmentManager.setFragmentResultListener(
             QrScanDestination.REQUEST_KEY, viewLifecycleOwner
         ) {
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 c3575f8..b753ef8 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
@@ -122,10 +122,13 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) {
             QrScanDestination.REQUEST_KEY,
             bundle
         )
-        findNavControllerOrNull()
-            ?.previousBackStackEntry
-            ?.savedStateHandle
-            ?.set(QrScanDestination.REQUEST_KEY, bundle)
+        if (!bundle.isEmpty) {
+            findNavController().navigate(R.id.action_fragment_qr_to_fragment_qr_result)
+        }
+//        findNavControllerOrNull()
+//            ?.previousBackStackEntry
+//            ?.savedStateHandle
+//            ?.set(QrScanDestination.REQUEST_KEY, bundle)
     }
 
     private fun findNavControllerOrNull(): NavController? {