student-25326/NTO-2025-Android-TeamTask
1
0
Fork 1
forked from Olympic/NTO-2025-Android-TeamTask
Code Pull Requests Activity

Arch

Browse Source
This commit is contained in:
imglmd
2025-12-03 14:48:06 +03:00
parent 3e97a07e76
commit 2ddf6ec534
28 changed files with 170 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/ru/myitschool/work/data/repo/AuthRepository.kt → app/src/main/java/ru/myitschool/work/auth/data/AuthRepository.kt
View File

@@ -1,13 +1,13 @@
package ru.myitschool.work.data.repo
package ru.myitschool.work.auth.data
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.core.MyResult
import ru.myitschool.work.core.NetworkDataSource
import ru.myitschool.work.util.DataStoreManager
object AuthRepository {
suspend fun checkAndSaveCode(code: String): MyResult<Unit> {
/*return when (val result = NetworkDataSource.checkAuth(code)) {
return when (val result = NetworkDataSource.checkAuth(code)) {
is MyResult.Success -> {
if (result.data) {
DataStoreManager.saveAuthCode(code)
@@ -17,9 +17,9 @@ object AuthRepository {
}
}
is MyResult.Error -> result
}*/
DataStoreManager.saveAuthCode(code)
return MyResult.Success(Unit)
}
/*DataStoreManager.saveAuthCode(code)
return MyResult.Success(Unit)*/
}
suspend fun logOut(): MyResult<Unit> {
return try {

7
app/src/main/java/ru/myitschool/work/domain/auth/CheckAndSaveAuthCodeUseCase.kt → app/src/main/java/ru/myitschool/work/auth/domain/CheckAndSaveAuthCodeUseCase.kt
View File

@@ -1,8 +1,7 @@
package ru.myitschool.work.domain.auth
package ru.myitschool.work.auth.domain
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.util.DataStoreManager
import ru.myitschool.work.auth.data.AuthRepository
import ru.myitschool.work.core.MyResult
class CheckAndSaveAuthCodeUseCase(
private val repository: AuthRepository,

6
app/src/main/java/ru/myitschool/work/domain/auth/LogOutUseCase.kt → app/src/main/java/ru/myitschool/work/auth/domain/LogOutUseCase.kt
View File

@@ -1,7 +1,7 @@
package ru.myitschool.work.domain.auth
package ru.myitschool.work.auth.domain
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.auth.data.AuthRepository
import ru.myitschool.work.core.MyResult
class LogOutUseCase(private val repository: AuthRepository) {
suspend operator fun invoke(): MyResult<Unit>{

2
app/src/main/java/ru/myitschool/work/ui/auth/AuthIntent.kt → app/src/main/java/ru/myitschool/work/auth/presentation/AuthIntent.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.auth
package ru.myitschool.work.auth.presentation
sealed interface AuthIntent {
data object Send: AuthIntent

3
app/src/main/java/ru/myitschool/work/ui/auth/AuthScreen.kt → app/src/main/java/ru/myitschool/work/auth/presentation/AuthScreen.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.auth
package ru.myitschool.work.auth.presentation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable

2
app/src/main/java/ru/myitschool/work/ui/auth/AuthState.kt → app/src/main/java/ru/myitschool/work/auth/presentation/AuthState.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.auth
package ru.myitschool.work.auth.presentation
data class AuthState(
val code: String = "",

8
app/src/main/java/ru/myitschool/work/ui/auth/AuthViewModel.kt → app/src/main/java/ru/myitschool/work/auth/presentation/AuthViewModel.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.auth
package ru.myitschool.work.auth.presentation
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
@@ -7,9 +7,9 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.domain.auth.CheckAndSaveAuthCodeUseCase
import ru.myitschool.work.auth.data.AuthRepository
import ru.myitschool.work.core.MyResult
import ru.myitschool.work.auth.domain.CheckAndSaveAuthCodeUseCase
class AuthViewModel : ViewModel() {
private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }

2
app/src/main/java/ru/myitschool/work/data/dto/AvailableBookingResponse.kt → app/src/main/java/ru/myitschool/work/booking/data/AvailableBookingResponse.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.data.dto
package ru.myitschool.work.booking.data
import kotlinx.serialization.Serializable

2
app/src/main/java/ru/myitschool/work/data/dto/BookRequest.kt → app/src/main/java/ru/myitschool/work/booking/data/BookRequest.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.data.dto
package ru.myitschool.work.booking.data
import kotlinx.serialization.Serializable

8
app/src/main/java/ru/myitschool/work/data/repo/BookingRepository.kt → app/src/main/java/ru/myitschool/work/booking/data/BookingRepository.kt
View File

@@ -1,8 +1,8 @@
package ru.myitschool.work.data.repo
package ru.myitschool.work.booking.data
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.domain.booking.BookingData
import ru.myitschool.work.booking.domain.BookingData
import ru.myitschool.work.core.MyResult
import ru.myitschool.work.core.NetworkDataSource
object BookingRepository {
suspend fun getAvailableForBooking(code: String): MyResult<BookingData> {

4
app/src/main/java/ru/myitschool/work/domain/booking/BookingData.kt → app/src/main/java/ru/myitschool/work/booking/domain/BookingData.kt
View File

@@ -1,6 +1,6 @@
package ru.myitschool.work.domain.booking
package ru.myitschool.work.booking.domain
import ru.myitschool.work.data.dto.AvailablePlace
import ru.myitschool.work.booking.data.AvailablePlace
data class BookingData(
val dateToPlaces: Map<String, List<AvailablePlace>>

6
app/src/main/java/ru/myitschool/work/domain/booking/CreateBookingUseCase.kt → app/src/main/java/ru/myitschool/work/booking/domain/CreateBookingUseCase.kt
View File

@@ -1,7 +1,7 @@
package ru.myitschool.work.domain.booking
package ru.myitschool.work.booking.domain
import ru.myitschool.work.data.repo.BookingRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.booking.data.BookingRepository
import ru.myitschool.work.core.MyResult
class CreateBookingUseCase(
private val repository: BookingRepository

6
app/src/main/java/ru/myitschool/work/domain/booking/GetAvailableUseCase.kt → app/src/main/java/ru/myitschool/work/booking/domain/GetAvailableUseCase.kt
View File

@@ -1,7 +1,7 @@
package ru.myitschool.work.domain.booking
package ru.myitschool.work.booking.domain
import ru.myitschool.work.data.repo.BookingRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.booking.data.BookingRepository
import ru.myitschool.work.core.MyResult
class GetAvailableUseCase(
private val repository: BookingRepository

2
app/src/main/java/ru/myitschool/work/ui/booking/BookingScreen.kt → app/src/main/java/ru/myitschool/work/booking/presentation/BookingScreen.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.booking
package ru.myitschool.work.booking.presentation
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding

2
app/src/main/java/ru/myitschool/work/ui/booking/BookingViewModel.kt → app/src/main/java/ru/myitschool/work/booking/presentation/BookingViewModel.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.booking
package ru.myitschool.work.booking.presentation
import androidx.lifecycle.ViewModel

4
app/src/main/java/ru/myitschool/work/domain/MyResult.kt → app/src/main/java/ru/myitschool/work/core/MyResult.kt
View File

@@ -1,6 +1,6 @@
package ru.myitschool.work.domain
package ru.myitschool.work.core
sealed class MyResult<out T> {
data class Success<T>(val data: T): MyResult<T>()
data class Error(val error: String): MyResult<Nothing>()
}
}

109
app/src/main/java/ru/myitschool/work/core/NetworkDataSource.kt Normal file
View File

@@ -0,0 +1,109 @@
package ru.myitschool.work.core
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.request.get
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import io.ktor.http.ContentType
import io.ktor.http.HttpStatusCode
import io.ktor.http.contentType
import io.ktor.serialization.kotlinx.json.json
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json
import ru.myitschool.work.booking.data.AvailableBookingResponse
import ru.myitschool.work.booking.data.BookRequest
import ru.myitschool.work.user.data.UserInfoResponse
object NetworkDataSource {
private val client by lazy {
HttpClient(CIO) {
install(ContentNegotiation) {
json(
Json {
isLenient = true
ignoreUnknownKeys = true
explicitNulls = true
encodeDefaults = true
}
)
}
}
}
suspend fun checkAuth(code: String): MyResult<Boolean> = withContext(Dispatchers.IO) {
try {
val response = client.get(getUrl(code, Constants.AUTH_URL))
when (response.status) {
HttpStatusCode.OK -> MyResult.Success(true)
else -> {
MyResult.Error("Неверный код или ошибка сервера")
}
}
} catch (e: Exception) {
MyResult.Error("Сетевая ошибка")
}
}
suspend fun getUserInfo(code: String): MyResult<UserInfoResponse> =
withContext(Dispatchers.IO) {
try {
val response = client.get(getUrl(code, Constants.INFO_URL))
when (response.status) {
HttpStatusCode.OK -> {
val userInfo: UserInfoResponse = response.body()
MyResult.Success(userInfo)
}
else -> {
MyResult.Error("Ошибка получения данных пользователя")
}
}
} catch (e: Exception) {
MyResult.Error("Сетевая ошибка")
}
}
suspend fun getAvailableForBooking(code: String): MyResult<AvailableBookingResponse> =
withContext(Dispatchers.IO) {
try {
val response = client.get(getUrl(code, Constants.BOOKING_URL))
when (response.status) {
HttpStatusCode.OK -> {
MyResult.Success(response.body())
}
else -> {
MyResult.Error("Ошибка получения доступных мест")
}
}
} catch (e: Exception) {
MyResult.Error("Сетевая ошибка")
}
}
suspend fun createBooking(code: String, date: String, placeId: Int): MyResult<Unit> =
withContext(Dispatchers.IO) {
try {
val response = client.post(getUrl(code, Constants.BOOK_URL)) {
contentType(ContentType.Application.Json)
setBody(BookRequest(date = date, placeID = placeId))
}
when (response.status) {
HttpStatusCode.OK -> {
MyResult.Success(Unit)
}
else -> {
MyResult.Error("Ошибка бронирования")
}
}
} catch (e: Exception) {
MyResult.Error("Сетевая ошибка")
}
}
private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
}

105
app/src/main/java/ru/myitschool/work/data/source/NetworkDataSource.kt
View File

@@ -1,105 +0,0 @@
package ru.myitschool.work.data.source
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.request.get
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import io.ktor.http.ContentType
import io.ktor.http.HttpStatusCode
import io.ktor.http.contentType
import io.ktor.serialization.kotlinx.json.json
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json
import ru.myitschool.work.core.Constants
import ru.myitschool.work.data.dto.AvailableBookingResponse
import ru.myitschool.work.data.dto.BookRequest
import ru.myitschool.work.data.dto.UserInfoResponse
import ru.myitschool.work.domain.MyResult
object NetworkDataSource {
private val client by lazy {
HttpClient(CIO) {
install(ContentNegotiation) {
json(
Json {
isLenient = true
ignoreUnknownKeys = true
explicitNulls = true
encodeDefaults = true
}
)
}
}
}
suspend fun checkAuth(code: String): MyResult<Boolean> = withContext(Dispatchers.IO) {
try {
val response = client.get(getUrl(code, Constants.AUTH_URL))
when (response.status) {
HttpStatusCode.OK -> MyResult.Success(true)
else -> {
MyResult.Error("Неверный код или ошибка сервера")
}
}
} catch (e: Exception) {
MyResult.Error("Сетевая ошибка")
}
}
suspend fun getUserInfo(code: String): MyResult<UserInfoResponse> = withContext(Dispatchers.IO){
try {
val response = client.get(getUrl(code, Constants.INFO_URL))
when (response.status) {
HttpStatusCode.OK -> {
val userInfo: UserInfoResponse = response.body()
MyResult.Success(userInfo)
}
else -> {
MyResult.Error("Ошибка получения данных пользователя")
}
}
} catch (e: Exception){
MyResult.Error("Сетевая ошибка")
}
}
suspend fun getAvailableForBooking(code: String): MyResult<AvailableBookingResponse> = withContext(Dispatchers.IO) {
try {
val response = client.get(getUrl(code, Constants.BOOKING_URL))
when (response.status) {
HttpStatusCode.OK -> {
MyResult.Success(response.body())
}
else -> {
MyResult.Error("Ошибка получения доступных мест")
}
}
} catch (e: Exception){
MyResult.Error("Сетевая ошибка")
}
}
suspend fun createBooking(code: String, date: String, placeId: Int): MyResult<Unit> = withContext(Dispatchers.IO){
try {
val response = client.post(getUrl(code, Constants.BOOK_URL)) {
contentType(ContentType.Application.Json)
setBody(BookRequest(date = date, placeID = placeId))
}
when (response.status) {
HttpStatusCode.OK -> {
MyResult.Success(Unit)
}
else -> {
MyResult.Error("Ошибка бронирования")
}
}
} catch (e: Exception){
MyResult.Error("Сетевая ошибка")
}
}
private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
}

9
app/src/main/java/ru/myitschool/work/ui/NavigationGraph.kt
View File

@@ -2,23 +2,20 @@ package ru.myitschool.work.ui
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.compose.foundation.layout.Box
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import ru.myitschool.work.ui.auth.AuthScreen
import ru.myitschool.work.ui.booking.BookingScreen
import ru.myitschool.work.ui.main.MainScreen
import ru.myitschool.work.auth.presentation.AuthScreen
import ru.myitschool.work.booking.presentation.BookingScreen
import ru.myitschool.work.user.presentation.MainScreen
import ru.myitschool.work.util.DataStoreManager
@Composable

2
app/src/main/java/ru/myitschool/work/data/dto/UserInfoResponse.kt → app/src/main/java/ru/myitschool/work/user/data/UserInfoResponse.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.data.dto
package ru.myitschool.work.user.data
import kotlinx.serialization.Serializable

9
app/src/main/java/ru/myitschool/work/data/repo/UserRepository.kt → app/src/main/java/ru/myitschool/work/user/data/UserRepository.kt
View File

@@ -1,9 +1,8 @@
package ru.myitschool.work.data.repo
package ru.myitschool.work.user.data
import ru.myitschool.work.data.dto.UserInfoResponse
import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.domain.user.User
import ru.myitschool.work.core.MyResult
import ru.myitschool.work.core.NetworkDataSource
import ru.myitschool.work.user.domain.User
object UserRepository {

6
app/src/main/java/ru/myitschool/work/domain/user/GetUserUseCase.kt → app/src/main/java/ru/myitschool/work/user/domain/GetUserUseCase.kt
View File

@@ -1,7 +1,7 @@
package ru.myitschool.work.domain.user
package ru.myitschool.work.user.domain
import ru.myitschool.work.data.repo.UserRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.user.data.UserRepository
import ru.myitschool.work.core.MyResult
class GetUserUseCase(
private val repository: UserRepository

2
app/src/main/java/ru/myitschool/work/domain/user/User.kt → app/src/main/java/ru/myitschool/work/user/domain/User.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.domain.user
package ru.myitschool.work.user.domain
data class User(
val name: String,

2
app/src/main/java/ru/myitschool/work/ui/main/BookingItem.kt → app/src/main/java/ru/myitschool/work/user/presentation/BookingItem.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.main
package ru.myitschool.work.user.presentation
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer

2
app/src/main/java/ru/myitschool/work/ui/main/MainIntent.kt → app/src/main/java/ru/myitschool/work/user/presentation/MainIntent.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.main
package ru.myitschool.work.user.presentation
sealed interface MainIntent {
data object LogOut: MainIntent

3
app/src/main/java/ru/myitschool/work/ui/main/MainScreen.kt → app/src/main/java/ru/myitschool/work/user/presentation/MainScreen.kt
View File

@@ -1,4 +1,4 @@
package ru.myitschool.work.ui.main
package ru.myitschool.work.user.presentation
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -32,7 +32,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import coil3.compose.AsyncImage
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.data.dto.BookingItem
import ru.myitschool.work.ui.Screen
@Composable

4
app/src/main/java/ru/myitschool/work/ui/main/MainState.kt → app/src/main/java/ru/myitschool/work/user/presentation/MainState.kt
View File

@@ -1,6 +1,6 @@
package ru.myitschool.work.ui.main
package ru.myitschool.work.user.presentation
import ru.myitschool.work.domain.user.User
import ru.myitschool.work.user.domain.User
data class MainState(
val user: User? = null,

13
app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt → app/src/main/java/ru/myitschool/work/user/presentation/MainViewModel.kt
View File

@@ -1,6 +1,5 @@
package ru.myitschool.work.ui.main
package ru.myitschool.work.user.presentation
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.flow.MutableSharedFlow
@@ -10,11 +9,11 @@ import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.data.repo.UserRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.domain.auth.LogOutUseCase
import ru.myitschool.work.domain.user.GetUserUseCase
import ru.myitschool.work.auth.data.AuthRepository
import ru.myitschool.work.user.data.UserRepository
import ru.myitschool.work.core.MyResult
import ru.myitschool.work.auth.domain.LogOutUseCase
import ru.myitschool.work.user.domain.GetUserUseCase
import ru.myitschool.work.util.DataStoreManager
import java.text.SimpleDateFormat
import java.util.Locale