Compare commits

...

2 Commits

Author SHA1 Message Date
imglmd
fd8309521d yo 2025-12-01 16:53:39 +03:00
imglmd
0c5c97d2cd Auth 2025-11-30 22:40:44 +03:00
29 changed files with 407 additions and 202 deletions

View File

@@ -0,0 +1,14 @@
package ru.myitschool.work.data.dto
import kotlinx.serialization.Serializable
@Serializable
data class AvailableBookingResponse(
val dates: Map<String, List<AvailablePlace>> = emptyMap()
)
@Serializable
data class AvailablePlace(
val id: Int,
val place: String
)

View File

@@ -0,0 +1,9 @@
package ru.myitschool.work.data.dto
import kotlinx.serialization.Serializable
@Serializable
data class BookRequest(
val date: String,
val placeID: Int
)

View File

@@ -0,0 +1,16 @@
package ru.myitschool.work.data.dto
import kotlinx.serialization.Serializable
@Serializable
data class UserInfoResponse(
val name: String,
val photoUrl: String,
val booking: Map<String, BookingItem> = emptyMap()
)
@Serializable
data class BookingItem(
val id: Int,
val place: String
)

View File

@@ -1,16 +1,13 @@
package ru.myitschool.work.data.repo package ru.myitschool.work.data.repo
import ru.myitschool.work.data.source.NetworkDataSource import ru.myitschool.work.data.source.NetworkDataSource
import ru.myitschool.work.domain.MyResult
object AuthRepository { object AuthRepository {
private var codeCache: String? = null private var codeCache: String? = null
suspend fun checkAndSave(text: String): Result<Boolean> { suspend fun checkAndSave(code: String): MyResult<Boolean> {
return NetworkDataSource.checkAuth(text).onSuccess { success -> return NetworkDataSource.checkAuth(code)
if (success) {
codeCache = text
}
}
} }
} }

View File

@@ -1,16 +1,18 @@
package ru.myitschool.work.data.source package ru.myitschool.work.data.source
import io.ktor.client.HttpClient import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.engine.cio.CIO import io.ktor.client.engine.cio.CIO
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.request.get import io.ktor.client.request.get
import io.ktor.client.statement.bodyAsText
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
import io.ktor.serialization.kotlinx.json.json import io.ktor.serialization.kotlinx.json.json
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import ru.myitschool.work.core.Constants import ru.myitschool.work.core.Constants
import ru.myitschool.work.data.dto.UserInfoResponse
import ru.myitschool.work.domain.MyResult
object NetworkDataSource { object NetworkDataSource {
private val client by lazy { private val client by lazy {
@@ -28,15 +30,35 @@ object NetworkDataSource {
} }
} }
suspend fun checkAuth(code: String): Result<Boolean> = withContext(Dispatchers.IO) { suspend fun checkAuth(code: String): MyResult<Boolean> = withContext(Dispatchers.IO) {
return@withContext runCatching { try {
val response = client.get(getUrl(code, Constants.AUTH_URL)) val response = client.get(getUrl(code, Constants.AUTH_URL))
when (response.status) { when (response.status) {
HttpStatusCode.OK -> true HttpStatusCode.OK -> MyResult.Success(true)
else -> error(response.bodyAsText()) 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("Сетевая ошибка")
}
}
private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl" private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
} }

View File

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

View File

@@ -1,15 +1,25 @@
package ru.myitschool.work.domain.auth package ru.myitschool.work.domain.auth
import ru.myitschool.work.data.repo.AuthRepository import ru.myitschool.work.data.repo.AuthRepository
import ru.myitschool.work.domain.MyResult
import ru.myitschool.work.util.DataStoreManager
class CheckAndSaveAuthCodeUseCase( class CheckAndSaveAuthCodeUseCase(
private val repository: AuthRepository private val repository: AuthRepository,
) { ) {
suspend operator fun invoke( suspend operator fun invoke(code: String): MyResult<Unit> {
text: String return when (val repoResult = repository.checkAndSave(code)) {
): Result<Unit> { is MyResult.Success -> {
return repository.checkAndSave(text).mapCatching { success -> if (repoResult.data) {
if (!success) error("Code is incorrect") DataStoreManager.saveAuthCode(code)
MyResult.Success(Unit)
} else {
MyResult.Error("Неверный код")
}
}
is MyResult.Error -> {
MyResult.Error(repoResult.error)
}
} }
} }
} }

View File

@@ -0,0 +1,4 @@
package ru.myitschool.work.domain.user
class GetUserUseCase {
}

View File

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

View File

@@ -1,44 +1,57 @@
package ru.myitschool.work.ui.screen package ru.myitschool.work.ui
import androidx.compose.animation.EnterTransition import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition import androidx.compose.animation.ExitTransition
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable 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.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import ru.myitschool.work.ui.nav.AuthScreenDestination import ru.myitschool.work.ui.auth.AuthScreen
import ru.myitschool.work.ui.nav.BookScreenDestination import ru.myitschool.work.util.DataStoreManager
import ru.myitschool.work.ui.nav.MainScreenDestination
import ru.myitschool.work.ui.screen.auth.AuthScreen
@Composable @Composable
fun AppNavHost( fun AppNavHost(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
navController: NavHostController = rememberNavController() navController: NavHostController = rememberNavController()
) { ) {
var startDestination by remember { mutableStateOf<Screen>(Screen.Auth) }
LaunchedEffect(Unit) {
val isAuth = DataStoreManager.isAuthenticated()
startDestination = if (isAuth) {
Screen.Main
} else {
Screen.Auth
}
}
NavHost( NavHost(
modifier = modifier, modifier = modifier,
enterTransition = { EnterTransition.None }, enterTransition = { EnterTransition.None },
exitTransition = { ExitTransition.None }, exitTransition = { ExitTransition.None },
navController = navController, navController = navController,
startDestination = AuthScreenDestination, startDestination = startDestination,
) { ) {
composable<AuthScreenDestination> { composable<Screen.Auth> {
AuthScreen(navController = navController) AuthScreen(navController = navController)
} }
composable<MainScreenDestination> { composable<Screen.Main> {
Box( Box(
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Text(text = "Hello") Text(text = "Hello")
} }
} }
composable<BookScreenDestination> { composable<Screen.Book> {
Box( Box(
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {

View File

@@ -0,0 +1,12 @@
package ru.myitschool.work.ui
import kotlinx.serialization.Serializable
sealed interface Screen{
@Serializable
data object Auth: Screen
@Serializable
data object Book: Screen
@Serializable
data object Main: Screen
}

View File

@@ -0,0 +1,6 @@
package ru.myitschool.work.ui.auth
sealed interface AuthIntent {
data object Send: AuthIntent
data class TextInput(val text: String): AuthIntent
}

View File

@@ -0,0 +1,98 @@
package ru.myitschool.work.ui.auth
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
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
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import ru.myitschool.work.R
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.ui.Screen
@Composable
fun AuthScreen(
viewModel: AuthViewModel = viewModel(),
navController: NavController
) {
val state by viewModel.uiState.collectAsState()
LaunchedEffect(state.isAuthenticated) {
if (state.isAuthenticated) {
navController.navigate(Screen.Main) {
popUpTo(navController.graph.startDestinationId) { inclusive = true }
launchSingleTop = true
}
}
}
Column(
modifier = Modifier
.fillMaxSize()
.padding(24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
) {
if (state.isLoading){
CircularProgressIndicator(
modifier = Modifier.size(64.dp)
)
} else {
Text(
text = stringResource(R.string.auth_title),
style = MaterialTheme.typography.headlineSmall,
textAlign = TextAlign.Center
)
Spacer(Modifier.height(15.dp))
TextField(
modifier = Modifier.testTag(TestIds.Auth.CODE_INPUT).fillMaxWidth(),
value = state.code,
onValueChange = {
viewModel.onIntent(AuthIntent.TextInput(it))
},
label = { Text(stringResource(R.string.auth_label)) }
)
Text(
text = state.error?: "",
modifier = Modifier.testTag(TestIds.Auth.ERROR),
color = MaterialTheme.colorScheme.error)
Button(
modifier = Modifier.testTag(TestIds.Auth.SIGN_BUTTON).fillMaxWidth(),
onClick = {
viewModel.onIntent(AuthIntent.Send)
},
enabled = state.isButtonEnabled
) {
Text(stringResource(R.string.auth_sign_in))
}
}
}
}

View File

@@ -0,0 +1,9 @@
package ru.myitschool.work.ui.auth
data class AuthState(
val code: String = "",
val error: String? = null,
val isLoading: Boolean = false,
val isAuthenticated: Boolean = false,
val isButtonEnabled: Boolean = false
)

View File

@@ -0,0 +1,66 @@
package ru.myitschool.work.ui.auth
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.flow.MutableStateFlow
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
class AuthViewModel : ViewModel() {
private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }
private val _uiState = MutableStateFlow<AuthState>(AuthState())
val uiState: StateFlow<AuthState> = _uiState.asStateFlow()
fun onIntent(intent: AuthIntent) {
when (intent) {
AuthIntent.Send -> sendCode()
is AuthIntent.TextInput -> updateCode(intent.text)
}
}
private fun updateCode(newCode: String) {
val trimmed = newCode.trim()
val isValid = trimmed.length == 4 && trimmed.matches(Regex("^[a-zA-Z0-9]{4}$"))
_uiState.update {
it.copy(
code = trimmed,
isButtonEnabled = isValid,
error = null
)
}
}
private fun sendCode() {
val currentCode = _uiState.value.code
if (currentCode.length != 4 || !currentCode.matches(Regex("^[a-zA-Z0-9]{4}$"))) return
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true, error = null) }
when (val result = checkAndSaveAuthCodeUseCase(currentCode)){
is MyResult.Success<*> -> {
_uiState.update {
it.copy(isLoading = false, isAuthenticated = true)
}
}
is MyResult.Error -> {
_uiState.update {
it.copy(
isLoading = false,
error = result.error,
isAuthenticated = false
)
}
}
}
}
}
}

View File

@@ -0,0 +1,19 @@
package ru.myitschool.work.ui.booking
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
@Composable
fun BookingScreen(
viewModel: BookingViewModel = viewModel(),
navController: NavController
) {
Scaffold() { padding ->
Box(Modifier.padding(padding))
}
}

View File

@@ -0,0 +1,7 @@
package ru.myitschool.work.ui.booking
import androidx.lifecycle.ViewModel
class BookingViewModel: ViewModel() {
}

View File

@@ -0,0 +1,19 @@
package ru.myitschool.work.ui.main
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
@Composable
fun MainScreen(
viewModel: MainViewModel = viewModel(),
navController: NavController
) {
Scaffold() { padding ->
Box(Modifier.padding(padding))
}
}

View File

@@ -0,0 +1,7 @@
package ru.myitschool.work.ui.main
import androidx.lifecycle.ViewModel
class MainViewModel: ViewModel() {
}

View File

@@ -1,3 +0,0 @@
package ru.myitschool.work.ui.nav
sealed interface AppDestination

View File

@@ -1,6 +0,0 @@
package ru.myitschool.work.ui.nav
import kotlinx.serialization.Serializable
@Serializable
data object AuthScreenDestination: AppDestination

View File

@@ -1,6 +0,0 @@
package ru.myitschool.work.ui.nav
import kotlinx.serialization.Serializable
@Serializable
data object BookScreenDestination: AppDestination

View File

@@ -1,6 +0,0 @@
package ru.myitschool.work.ui.nav
import kotlinx.serialization.Serializable
@Serializable
data object MainScreenDestination: AppDestination

View File

@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import ru.myitschool.work.ui.screen.AppNavHost import ru.myitschool.work.ui.AppNavHost
import ru.myitschool.work.ui.theme.WorkTheme import ru.myitschool.work.ui.theme.WorkTheme
class RootActivity : ComponentActivity() { class RootActivity : ComponentActivity() {
@@ -17,9 +17,9 @@ class RootActivity : ComponentActivity() {
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
WorkTheme { WorkTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> Scaffold(modifier = Modifier.Companion.fillMaxSize()) { innerPadding ->
AppNavHost( AppNavHost(
modifier = Modifier modifier = Modifier.Companion
.fillMaxSize() .fillMaxSize()
.padding(innerPadding) .padding(innerPadding)
) )

View File

@@ -1,6 +0,0 @@
package ru.myitschool.work.ui.screen.auth
sealed interface AuthIntent {
data class Send(val text: String): AuthIntent
data class TextInput(val text: String): AuthIntent
}

View File

@@ -1,97 +0,0 @@
package ru.myitschool.work.ui.screen.auth
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
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.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
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.compose.ui.graphics.Color
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import ru.myitschool.work.R
import ru.myitschool.work.core.TestIds
import ru.myitschool.work.ui.nav.MainScreenDestination
@Composable
fun AuthScreen(
viewModel: AuthViewModel = viewModel(),
navController: NavController
) {
val state by viewModel.uiState.collectAsState()
LaunchedEffect(Unit) {
viewModel.actionFlow.collect {
navController.navigate(MainScreenDestination)
}
}
Column(
modifier = Modifier
.fillMaxSize()
.padding(all = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
text = stringResource(R.string.auth_title),
style = MaterialTheme.typography.headlineSmall,
textAlign = TextAlign.Center
)
when (val currentState = state) {
is AuthState.Data -> Content(viewModel, currentState)
is AuthState.Loading -> {
CircularProgressIndicator(
modifier = Modifier.size(64.dp)
)
}
}
}
}
@Composable
private fun Content(
viewModel: AuthViewModel,
state: AuthState.Data
) {
var inputText by remember { mutableStateOf("") }
Spacer(modifier = Modifier.size(16.dp))
TextField(
modifier = Modifier.testTag(TestIds.Auth.CODE_INPUT).fillMaxWidth(),
value = inputText,
onValueChange = {
inputText = it
viewModel.onIntent(AuthIntent.TextInput(it))
},
label = { Text(stringResource(R.string.auth_label)) }
)
Spacer(modifier = Modifier.size(16.dp))
Button(
modifier = Modifier.testTag(TestIds.Auth.SIGN_BUTTON).fillMaxWidth(),
onClick = {
viewModel.onIntent(AuthIntent.Send(inputText))
},
enabled = true
) {
Text(stringResource(R.string.auth_sign_in))
}
}

View File

@@ -1,6 +0,0 @@
package ru.myitschool.work.ui.screen.auth
sealed interface AuthState {
object Loading: AuthState
object Data: AuthState
}

View File

@@ -1,43 +0,0 @@
package ru.myitschool.work.ui.screen.auth
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
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.auth.CheckAndSaveAuthCodeUseCase
class AuthViewModel : ViewModel() {
private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }
private val _uiState = MutableStateFlow<AuthState>(AuthState.Data)
val uiState: StateFlow<AuthState> = _uiState.asStateFlow()
private val _actionFlow: MutableSharedFlow<Unit> = MutableSharedFlow()
val actionFlow: SharedFlow<Unit> = _actionFlow
fun onIntent(intent: AuthIntent) {
when (intent) {
is AuthIntent.Send -> {
viewModelScope.launch(Dispatchers.Default) {
_uiState.update { AuthState.Loading }
checkAndSaveAuthCodeUseCase.invoke("9999").fold(
onSuccess = {
_actionFlow.emit(Unit)
},
onFailure = { error ->
error.printStackTrace()
_actionFlow.emit(Unit)
}
)
}
}
is AuthIntent.TextInput -> Unit
}
}
}

View File

@@ -0,0 +1,38 @@
package ru.myitschool.work.util
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import ru.myitschool.work.App
private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "auth_prefs")
object DataStoreManager {
private val AUTH_CODE_KEY = stringPreferencesKey("auth_code")
suspend fun saveAuthCode(code: String){
App.context.dataStore.edit { prefs ->
prefs[AUTH_CODE_KEY] = code
}
}
suspend fun getAuthCode(): String? {
return App.context.dataStore.data
.map { it[AUTH_CODE_KEY] }
.first()
}
suspend fun clearAuthCode() {
App.context.dataStore.edit { prefs ->
prefs.remove(AUTH_CODE_KEY)
}
}
suspend fun isAuthenticated(): Boolean {
return getAuthCode() != null
}
}