From 536f9eb83a0a2b5a00e9c459582ea743168482b8 Mon Sep 17 00:00:00 2001 From: Niktia Date: Thu, 20 Feb 2025 11:05:24 +0300 Subject: [PATCH] Long value to String + Api debug --- .../ru/myitschool/work/data/user/UserNetworkDataSource.kt | 4 ++-- .../main/java/ru/myitschool/work/data/user/UserRepoImpl.kt | 2 +- .../main/java/ru/myitschool/work/domain/user/EnterUseCase.kt | 2 +- app/src/main/java/ru/myitschool/work/domain/user/UserRepo.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 4087e65..406e669 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 @@ -36,7 +36,7 @@ class UserNetworkDataSource { suspend fun getEntrancesList(login : String) : Result> = withContext(Dispatchers.IO){ runCatching { - val result = client.get("http://$SERVER_ADDRESS/api/$login/entrances") { + val result = client.get("$SERVER_ADDRESS/api/$login/entrances") { header(HttpHeaders.Authorization, token) } Log.d("serverCode", "${result.status}") @@ -47,7 +47,7 @@ class UserNetworkDataSource { } } - suspend fun enter(value : Long, login : String): Result = withContext(Dispatchers.IO) { + suspend fun enter(value : String, login : String): Result = withContext(Dispatchers.IO) { runCatching { val result = client.patch("$SERVER_ADDRESS/api/open") { header(HttpHeaders.Authorization, token) diff --git a/app/src/main/java/ru/myitschool/work/data/user/UserRepoImpl.kt b/app/src/main/java/ru/myitschool/work/data/user/UserRepoImpl.kt index 2fcb8f1..62e1e08 100644 --- a/app/src/main/java/ru/myitschool/work/data/user/UserRepoImpl.kt +++ b/app/src/main/java/ru/myitschool/work/data/user/UserRepoImpl.kt @@ -30,7 +30,7 @@ class UserRepoImpl ( } } - override suspend fun enter(value: Long, login : String): Result { + override suspend fun enter(value: String, login : String): Result { return userNetworkDataSource.enter(value, login); } diff --git a/app/src/main/java/ru/myitschool/work/domain/user/EnterUseCase.kt b/app/src/main/java/ru/myitschool/work/domain/user/EnterUseCase.kt index 3a75ebc..5637f4f 100644 --- a/app/src/main/java/ru/myitschool/work/domain/user/EnterUseCase.kt +++ b/app/src/main/java/ru/myitschool/work/domain/user/EnterUseCase.kt @@ -10,5 +10,5 @@ class EnterUseCase ( private fun getUserFromStorage() : UserDto? { return authStorageDataSource.userInfo } - suspend operator fun invoke(value : Long) = repo.enter(value, getUserFromStorage()?.login!!) + suspend operator fun invoke(value : String) = repo.enter(value, getUserFromStorage()?.login!!) } \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/work/domain/user/UserRepo.kt b/app/src/main/java/ru/myitschool/work/domain/user/UserRepo.kt index db54029..744a980 100644 --- a/app/src/main/java/ru/myitschool/work/domain/user/UserRepo.kt +++ b/app/src/main/java/ru/myitschool/work/domain/user/UserRepo.kt @@ -4,5 +4,5 @@ package ru.myitschool.work.domain.user interface UserRepo { suspend fun getUser(login: String) : Result suspend fun getEntrancesList(login : String) : Result> - suspend fun enter(value : Long, login : String) : Result + suspend fun enter(value : String, login : String) : Result } \ No newline at end of file