fix

app/src/main/java/ru/myitschool/work/auth/data/AuthRepository.kt

@@ -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.core.MyResult
-import ru.myitschool.work.domain.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)
+        /*DataStoreManager.saveAuthCode(code)
-        return MyResult.Success(Unit)
+        return MyResult.Success(Unit)*/
     }
     suspend fun logOut(): MyResult<Unit> {
         return try {

app/src/main/java/ru/myitschool/work/auth/domain/CheckAndSaveAuthCodeUseCase.kt

@@ -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.auth.data.AuthRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
-import ru.myitschool.work.util.DataStoreManager
 
 class CheckAndSaveAuthCodeUseCase(
     private val repository: AuthRepository,

app/src/main/java/ru/myitschool/work/auth/domain/LogOutUseCase.kt

@@ -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.auth.data.AuthRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
 
 class LogOutUseCase(private val repository: AuthRepository) {
     suspend operator fun invoke(): MyResult<Unit>{

app/src/main/java/ru/myitschool/work/auth/presentation/AuthIntent.kt

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

app/src/main/java/ru/myitschool/work/auth/presentation/AuthScreen.kt

@@ -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

app/src/main/java/ru/myitschool/work/auth/presentation/AuthState.kt

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

app/src/main/java/ru/myitschool/work/auth/presentation/AuthViewModel.kt

@@ -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.auth.data.AuthRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
-import ru.myitschool.work.domain.auth.CheckAndSaveAuthCodeUseCase
+import ru.myitschool.work.auth.domain.CheckAndSaveAuthCodeUseCase
 
 class AuthViewModel : ViewModel() {
     private val checkAndSaveAuthCodeUseCase by lazy { CheckAndSaveAuthCodeUseCase(AuthRepository) }

app/src/main/java/ru/myitschool/work/booking/data/AvailableBookingResponse.kt

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

app/src/main/java/ru/myitschool/work/booking/data/BookRequest.kt

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

app/src/main/java/ru/myitschool/work/booking/data/BookingRepository.kt

@@ -1,15 +1,15 @@
-package ru.myitschool.work.data.repo
+package ru.myitschool.work.booking.data
 
-import ru.myitschool.work.data.source.NetworkDataSource
+import ru.myitschool.work.booking.domain.BookingData
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
-import ru.myitschool.work.domain.booking.BookingData
+import ru.myitschool.work.core.NetworkDataSource
 
 object BookingRepository {
     suspend fun getAvailableForBooking(code: String): MyResult<BookingData> {
         return when (val result = NetworkDataSource.getAvailableForBooking(code)) {
             is MyResult.Success -> {
                 val bookingData = BookingData(
-                    dateToPlaces = result.data.dates
+                    dateToPlaces = result.data
                 )
                 MyResult.Success(bookingData)
             }

app/src/main/java/ru/myitschool/work/booking/domain/BookingData.kt

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

app/src/main/java/ru/myitschool/work/booking/domain/CreateBookingUseCase.kt

@@ -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.booking.data.BookingRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
 
 class CreateBookingUseCase(
     private val repository: BookingRepository

app/src/main/java/ru/myitschool/work/booking/domain/GetAvailableUseCase.kt

@@ -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.booking.data.BookingRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
 
 class GetAvailableUseCase(
     private val repository: BookingRepository

app/src/main/java/ru/myitschool/work/booking/presentation/BookingIntent.kt

@@ -0,0 +1,9 @@
+package ru.myitschool.work.booking.presentation
+
+sealed interface BookingIntent {
+    object LoadData: BookingIntent
+    data class SelectDate(val date: String): BookingIntent
+    data class SelectPlace(val placeId: Int): BookingIntent
+    object Book: BookingIntent
+    object Refresh: BookingIntent
+}

app/src/main/java/ru/myitschool/work/booking/presentation/BookingScreen.kt

@@ -0,0 +1,213 @@
+package ru.myitschool.work.booking.presentation
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import ru.myitschool.work.core.TestIds
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BookingScreen(
+    onNavigateBack: () -> Unit,
+    onBookingSuccess: () -> Unit,
+    viewModel: BookingViewModel = viewModel()
+) {
+    val state by viewModel.state.collectAsState()
+
+    LaunchedEffect(state.bookingSuccess) {
+        if (state.bookingSuccess) {
+            onBookingSuccess()
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text("Бронирование") },
+                navigationIcon = {
+                    IconButton(
+                        onClick = onNavigateBack,
+                        modifier = Modifier.testTag(TestIds.Book.BACK_BUTTON)
+                    ) {
+                        Text("<")
+                    }
+                }
+            )
+        }
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+        ) {
+            when {
+                state.isLoading -> {
+                    CircularProgressIndicator(
+                        modifier = Modifier.align(Alignment.Center)
+                    )
+                }
+                state.error != null -> {
+                    ErrorContent(
+                        error = state.error!!,
+                        onRefresh = { viewModel.onIntent(BookingIntent.Refresh) }
+                    )
+                }
+                state.dates.isEmpty() -> {
+                    EmptyContent(onNavigateBack = onNavigateBack)
+                }
+                else -> {
+                    BookingContent(
+                        state = state,
+                        onIntent = { viewModel.onIntent(it) }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ErrorContent(
+    error: String,
+    onRefresh: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text(
+            text = error,
+            modifier = Modifier.testTag(TestIds.Book.ERROR)
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        Button(
+            onClick = onRefresh,
+            modifier = Modifier.testTag(TestIds.Book.REFRESH_BUTTON)
+        ) {
+            Text("Обновить")
+        }
+    }
+}
+
+@Composable
+private fun EmptyContent(onNavigateBack: () -> Unit) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center
+    ) {
+        Text(
+            text = "Всё забронировано",
+            modifier = Modifier.testTag(TestIds.Book.EMPTY)
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        Button(
+            onClick = onNavigateBack,
+            modifier = Modifier.testTag(TestIds.Book.BACK_BUTTON)
+        ) {
+            Text("Назад")
+        }
+    }
+}
+
+@Composable
+private fun BookingContent(
+    state: BookingState,
+    onIntent: (BookingIntent) -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        TabRow(
+            selectedTabIndex = state.dates.indexOf(state.selectedDate),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            state.dates.forEachIndexed { index, date ->
+                Tab(
+                    selected = date == state.selectedDate,
+                    onClick = { onIntent(BookingIntent.SelectDate(date)) },
+                    modifier = Modifier.testTag(TestIds.Book.getIdDateItemByPosition(index))
+                ) {
+                    Text(
+                        text = formatDateForDisplay(date),
+                        modifier = Modifier
+                            .testTag(TestIds.Book.ITEM_DATE)
+                            .padding(16.dp)
+                    )
+                }
+            }
+        }
+
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .verticalScroll(rememberScrollState())
+                .padding(16.dp)
+        ) {
+            state.availablePlaces.forEachIndexed { index, place ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .testTag(TestIds.Book.getIdPlaceItemByPosition(index))
+                        .selectable(
+                            selected = place.id == state.selectedPlaceId,
+                            onClick = { onIntent(BookingIntent.SelectPlace(place.id)) }
+                        )
+                        .padding(vertical = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    RadioButton(
+                        selected = place.id == state.selectedPlaceId,
+                        onClick = { onIntent(BookingIntent.SelectPlace(place.id)) },
+                        modifier = Modifier.testTag(TestIds.Book.ITEM_PLACE_SELECTOR)
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(
+                        text = place.place,
+                        modifier = Modifier.testTag(TestIds.Book.ITEM_PLACE_TEXT)
+                    )
+                }
+            }
+        }
+
+        Button(
+            onClick = { onIntent(BookingIntent.Book) },
+            enabled = state.selectedPlaceId != null && !state.isBookingInProgress,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+                .testTag(TestIds.Book.BOOK_BUTTON)
+        ) {
+            Text(
+                text = if (state.isBookingInProgress) "Бронирование..." else "Забронировать"
+            )
+        }
+    }
+}
+
+private fun formatDateForDisplay(isoDate: String): String {
+    return try {
+        val inputFormat = SimpleDateFormat("yyyy-MM-dd")
+        val outputFormat = SimpleDateFormat("dd.MM")
+        val date = inputFormat.parse(isoDate)
+        date?.let { outputFormat.format(it) } ?: isoDate
+    } catch (e: Exception) {
+        isoDate
+    }
+}

app/src/main/java/ru/myitschool/work/booking/presentation/BookingState.kt

@@ -0,0 +1,15 @@
+package ru.myitschool.work.booking.presentation
+
+import ru.myitschool.work.booking.data.AvailablePlace
+
+data class BookingState(
+    val isLoading: Boolean = true,
+    val error: String? = null,
+    val dates: List<String> = emptyList(),
+    val dateToPlacesMap: Map<String, List<AvailablePlace>> = emptyMap(),
+    val selectedDate: String? = null,
+    val availablePlaces: List<AvailablePlace> = emptyList(),
+    val selectedPlaceId: Int? = null,
+    val isBookingInProgress: Boolean = false,
+    val bookingSuccess: Boolean = false
+)

app/src/main/java/ru/myitschool/work/booking/presentation/BookingViewModel.kt

@@ -0,0 +1,142 @@
+package ru.myitschool.work.booking.presentation
+
+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.launch
+import ru.myitschool.work.booking.data.BookingRepository
+import ru.myitschool.work.core.MyResult
+import ru.myitschool.work.util.DataStoreManager
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class BookingViewModel : ViewModel() {
+    private val _state = MutableStateFlow(BookingState())
+    val state: StateFlow<BookingState> = _state.asStateFlow()
+
+    init {
+        onIntent(BookingIntent.LoadData)
+    }
+
+    fun onIntent(intent: BookingIntent) {
+        when (intent) {
+            is BookingIntent.LoadData -> loadData()
+            is BookingIntent.SelectDate -> selectDate(intent.date)
+            is BookingIntent.SelectPlace -> selectPlace(intent.placeId)
+            is BookingIntent.Book -> book()
+            is BookingIntent.Refresh -> refresh()
+        }
+    }
+
+    private fun loadData() {
+        viewModelScope.launch {
+            _state.value = _state.value.copy(isLoading = true, error = null)
+
+            val code = DataStoreManager.getAuthCode()
+            if (code == null) {
+                _state.value = _state.value.copy(
+                    isLoading = false,
+                    error = "Код авторизации не найден"
+                )
+                return@launch
+            }
+
+            when (val result = BookingRepository.getAvailableForBooking(code)) {
+                is MyResult.Success -> {
+                    val dateToPlacesMap = result.data.dateToPlaces
+
+                    val sortedDates = dateToPlacesMap.keys
+                        .filter { date ->
+                            val places = dateToPlacesMap[date]
+                            places != null && places.isNotEmpty()
+                        }
+                        .sortedBy { parseDate(it) }
+
+                    val firstDate = sortedDates.firstOrNull()
+                    val places = firstDate?.let { dateToPlacesMap[it] } ?: emptyList()
+
+                    _state.value = BookingState(
+                        isLoading = false,
+                        dates = sortedDates,
+                        dateToPlacesMap = dateToPlacesMap,
+                        selectedDate = firstDate,
+                        availablePlaces = places,
+                        selectedPlaceId = null
+                    )
+                }
+                is MyResult.Error -> {
+                    _state.value = _state.value.copy(
+                        isLoading = false,
+                        error = result.error
+                    )
+                }
+            }
+        }
+    }
+
+    private fun selectDate(date: String) {
+        val currentState = _state.value
+        val places = currentState.dateToPlacesMap[date] ?: emptyList()
+
+        _state.value = _state.value.copy(
+            selectedDate = date,
+            availablePlaces = places,
+            selectedPlaceId = null
+        )
+    }
+
+    private fun selectPlace(placeId: Int) {
+        _state.value = _state.value.copy(selectedPlaceId = placeId)
+    }
+
+    private fun book() {
+        val currentState = _state.value
+        val date = currentState.selectedDate
+        val placeId = currentState.selectedPlaceId
+
+        if (date == null || placeId == null) return
+
+        viewModelScope.launch {
+            _state.value = _state.value.copy(isBookingInProgress = true, error = null)
+
+            val code = DataStoreManager.getAuthCode()
+            if (code == null) {
+                _state.value = _state.value.copy(
+                    isBookingInProgress = false,
+                    error = "Код авторизации не найден"
+                )
+                return@launch
+            }
+
+            when (val result = BookingRepository.createBooking(code, date, placeId)) {
+                is MyResult.Success -> {
+                    _state.value = _state.value.copy(
+                        isBookingInProgress = false,
+                        bookingSuccess = true
+                    )
+                }
+                is MyResult.Error -> {
+                    _state.value = _state.value.copy(
+                        isBookingInProgress = false,
+                        error = result.error
+                    )
+                }
+            }
+        }
+    }
+
+    private fun refresh() {
+        loadData()
+    }
+
+    private fun parseDate(dateString: String): Long {
+        return try {
+            val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
+            dateFormat.parse(dateString)?.time ?: 0L
+        } catch (e: Exception) {
+            0L
+        }
+    }
+}

app/src/main/java/ru/myitschool/work/core/MyResult.kt

@@ -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>()
-}
+}

app/src/main/java/ru/myitschool/work/core/NetworkDataSource.kt

@@ -0,0 +1,113 @@
+package ru.myitschool.work.core
+
+import android.util.Log
+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.client.statement.bodyAsText
+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.AvailablePlace
+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 -> {
+                        val bookingResponse: Map<String, List<AvailablePlace>> = response.body()
+                        MyResult.Success(bookingResponse)
+                    }
+
+                    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, HttpStatusCode.Created -> {
+                        MyResult.Success(Unit)
+                    }
+
+                    else -> {
+                        MyResult.Error("Ошибка бронирования")
+                    }
+                }
+            } catch (e: Exception) {
+                MyResult.Error("Сетевая ошибка")
+            }
+        }
+    private fun getUrl(code: String, targetUrl: String) = "${Constants.HOST}/api/$code$targetUrl"
+}

app/src/main/java/ru/myitschool/work/data/dto/AvailableBookingResponse.kt

@@ -1,14 +0,0 @@
-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
-)

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

@@ -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"
-}

app/src/main/java/ru/myitschool/work/domain/booking/BookingData.kt

@@ -1,22 +0,0 @@
-package ru.myitschool.work.domain.booking
-
-import ru.myitschool.work.data.dto.AvailablePlace
-
-data class BookingData(
-    val dateToPlaces: Map<String, List<AvailablePlace>>
-){
-    fun getSortedDatesWithPlaces(): List<String> {
-        return dateToPlaces.keys
-            .filter { dateToPlaces[it]?.isNotEmpty() == true }
-            .sorted()
-    }
-
-    fun getPlacesForDate(date: String): List<AvailablePlace> {
-        return dateToPlaces[date] ?: emptyList()
-    }
-
-    fun hasAvailableDates(): Boolean {
-        return dateToPlaces.any { it.value.isNotEmpty() }
-    }
-}
-

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

@@ -2,23 +2,22 @@ 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.lifecycle.viewmodel.compose.viewModel
 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.auth.presentation.AuthScreen
-import ru.myitschool.work.ui.booking.BookingScreen
+import ru.myitschool.work.booking.presentation.BookingScreen
-import ru.myitschool.work.ui.main.MainScreen
+import ru.myitschool.work.user.presentation.MainScreen
+import ru.myitschool.work.user.presentation.MainViewModel
 import ru.myitschool.work.util.DataStoreManager
 
 @Composable
@@ -36,6 +35,7 @@ fun AppNavHost(
             Screen.Auth
         }
     }
+
     NavHost(
         modifier = modifier,
         enterTransition = { EnterTransition.None },
@@ -46,11 +46,42 @@ fun AppNavHost(
         composable<Screen.Auth> {
             AuthScreen(navController = navController)
         }
-        composable<Screen.Main> {
+
-            MainScreen(navController = navController)
+        composable<Screen.Main> { backStackEntry ->
+            val mainViewModel: MainViewModel = viewModel()
+
+            LaunchedEffect(navController.currentBackStackEntry) {
+                navController.currentBackStackEntry
+                    ?.savedStateHandle
+                    ?.getStateFlow<Boolean>("booking_success", false)
+                    ?.collect { bookingSuccess ->
+                        if (bookingSuccess) {
+                            mainViewModel.refreshAfterBooking()
+                            navController.currentBackStackEntry
+                                ?.savedStateHandle
+                                ?.set("booking_success", false)
+                        }
+                    }
+            }
+
+            MainScreen(
+                viewModel = mainViewModel,
+                navController = navController
+            )
         }
+
         composable<Screen.Book> {
-            BookingScreen(navController = navController)
+            BookingScreen(
+                onNavigateBack = {
+                    navController.popBackStack()
+                },
+                onBookingSuccess = {
+                    navController.previousBackStackEntry
+                        ?.savedStateHandle
+                        ?.set("booking_success", true)
+                    navController.popBackStack()
+                }
+            )
         }
     }
 }

app/src/main/java/ru/myitschool/work/ui/booking/BookingScreen.kt

@@ -1,19 +0,0 @@
-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))
-    }
-}

app/src/main/java/ru/myitschool/work/ui/booking/BookingViewModel.kt

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

app/src/main/java/ru/myitschool/work/user/data/UserInfoResponse.kt

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

app/src/main/java/ru/myitschool/work/user/data/UserRepository.kt

@@ -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.core.MyResult
-import ru.myitschool.work.data.source.NetworkDataSource
+import ru.myitschool.work.core.NetworkDataSource
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.user.domain.User
-import ru.myitschool.work.domain.user.User
 
 object UserRepository {
 

app/src/main/java/ru/myitschool/work/user/domain/GetUserUseCase.kt

@@ -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.user.data.UserRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
 
 class GetUserUseCase(
     private val repository: UserRepository

app/src/main/java/ru/myitschool/work/user/domain/User.kt

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

app/src/main/java/ru/myitschool/work/user/presentation/BookingItem.kt

@@ -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

app/src/main/java/ru/myitschool/work/user/presentation/MainIntent.kt

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

app/src/main/java/ru/myitschool/work/user/presentation/MainScreen.kt

@@ -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

app/src/main/java/ru/myitschool/work/user/presentation/MainState.kt

@@ -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,

app/src/main/java/ru/myitschool/work/user/presentation/MainViewModel.kt

@@ -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.auth.data.AuthRepository
-import ru.myitschool.work.data.repo.UserRepository
+import ru.myitschool.work.user.data.UserRepository
-import ru.myitschool.work.domain.MyResult
+import ru.myitschool.work.core.MyResult
-import ru.myitschool.work.domain.auth.LogOutUseCase
+import ru.myitschool.work.auth.domain.LogOutUseCase
-import ru.myitschool.work.domain.user.GetUserUseCase
+import ru.myitschool.work.user.domain.GetUserUseCase
 import ru.myitschool.work.util.DataStoreManager
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -46,6 +45,10 @@ class MainViewModel : ViewModel() {
         }
     }
 
+    fun refreshAfterBooking() {
+        loadUser()
+    }
+
     private fun loadUser() {
         viewModelScope.launch {
             _mainState.update { it.copy(isLoading = true, error = null) }
@@ -85,20 +88,24 @@ class MainViewModel : ViewModel() {
 
 
     private fun convertBookingsToDisplayItems(bookings: Map<String, String>): List<BookingDisplayItem> {
-        val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
+        val serverFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+        val displayFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
+
+        return bookings.map { (serverDate, place) ->
+            val displayDate = try {
+                val parsed = serverFormat.parse(serverDate)
+                displayFormat.format(parsed!!)
+            } catch (e: Exception) {
+                serverDate
+            }
 
-        return bookings.map { (date, place) ->
             BookingDisplayItem(
-                date = date,
+                date = displayDate,
                 place = place,
-                originalDate = date
+                originalDate = serverDate
             )
         }.sortedBy { item ->
-            try {
+            item.originalDate
-                dateFormat.parse(item.originalDate)?.time ?: 0L
-            } catch (e: Exception) {
-                0L
-            }
         }
     }