47 changed files with 71319 additions and 239661 deletions
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="KFRSEQ6DTWWWQOE6" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-12-17T14:14:18.887820Z" />
+  </component>
+</project>
--- a/app/src/main/java/com/example/myapplication/MainComposeActivity.kt
+++ b/app/src/main/java/com/example/myapplication/MainComposeActivity.kt
@ -1,6 +1,5 @@
 package com.example.myapplication

-import android.content.Context
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@ -21,7 +20,6 @@ class MainComposeActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        application.deleteDatabase("pmy-db")
-        appContext = applicationContext
        setContent {
            PmudemoTheme(darkTheme = isDarkTheme.value) {
                LaunchedEffect(key1 = true) {
@ -42,7 +40,4 @@ class MainComposeActivity : ComponentActivity() {
            }
        }
    }
-    companion object {
-        lateinit var appContext: Context
-    }
 }
--- a/app/src/main/java/com/example/myapplication/api/MyServerService.kt
+++ b/app/src/main/java/com/example/myapplication/api/MyServerService.kt
@ -90,11 +90,6 @@ interface MyServerService {
        @Query("userId") userId: Int,
    ): List<UserSessionWithSessionRemote>

-    @GET("userssessions")
-    suspend fun getUserSessions(
-        @Query("userId") userId: Int,
-    ): List<UserSessionRemote>
-
    @GET("userssessions?_expand=session")
    suspend fun getUsersSessions(): List<UserSessionWithSessionRemote>

--- a/app/src/main/java/com/example/myapplication/api/cinema/CinemaRemoteMediator.kt
+++ b/app/src/main/java/com/example/myapplication/api/cinema/CinemaRemoteMediator.kt
@ -55,7 +55,7 @@ class CinemaRemoteMediator(

        try {
            val cinemas = service.getCinemas(page, state.config.pageSize).map { it.toCinema() }
-            val sessionsFromCinemas = cinemas.flatMap { cinema ->
+            val sessionsFromCinemas = cinemas.map { cinema ->
                service.getCinemaWithSessions(cinema.uid).toSessions()
            }
            val endOfPaginationReached = cinemas.isEmpty()
@ -77,7 +77,13 @@ class CinemaRemoteMediator(
                }
                dbRemoteKeyRepository.createRemoteKeys(keys)
                dbCinemaRepository.insertCinemas(cinemas)
-                dbSessionRepository.insertSessions(sessionsFromCinemas)
+                sessionsFromCinemas.forEach {
+                    try {
+                        dbSessionRepository.insertSessions(it)
+                    } catch (_: Exception) {
+
+                    }
+                }
            }
            return MediatorResult.Success(endOfPaginationReached = endOfPaginationReached)
        } catch (exception: IOException) {
--- a/app/src/main/java/com/example/myapplication/api/cinema/RestCinemaRepository.kt
+++ b/app/src/main/java/com/example/myapplication/api/cinema/RestCinemaRepository.kt
@ -48,18 +48,18 @@ class RestCinemaRepository(

    override suspend fun getCinema(uid: Int): CinemaWithSessions {
        val cinemaWithSessions = service.getCinemaWithSessions(uid)
-        val orders = service.getOrders()
+
        val sessions = cinemaWithSessions.sessions.map { sessionFromCinemaRemote ->
            SessionFromCinema(
                sessionFromCinemaRemote.id,
                sessionFromCinemaRemote.dateTime,
                sessionFromCinemaRemote.price,
-                sessionFromCinemaRemote.maxCount - orders.flatMap
+                sessionFromCinemaRemote.maxCount - service.getOrders().flatMap
                { order ->
                    order.sessions.filter { session ->
                        session.id == sessionFromCinemaRemote.id &&
                                session.cinemaId == sessionFromCinemaRemote.cinemaId &&
-                                session.dateTime == sessionFromCinemaRemote.dateTime
+                                session.cinema.name == cinemaWithSessions.name
                    }
                }.sumOf { session -> session.count },
                uid
--- a/app/src/main/java/com/example/myapplication/api/order/OrderRemoteMediator.kt
+++ b/app/src/main/java/com/example/myapplication/api/order/OrderRemoteMediator.kt
@ -53,8 +53,8 @@ class OrderRemoteMediator(

        try {
            val orders = service.getOrders(
-                userId = LiveStore.user.value?.uid ?: 0,
-                page = page, limit = state.config.pageSize
+                LiveStore.user.value?.uid ?: 0,
+                page, state.config.pageSize
            ).map { it.toOrder() }
            val endOfPaginationReached = orders.isEmpty()
            database.withTransaction {
--- a/app/src/main/java/com/example/myapplication/api/order/RestOrderRepository.kt
+++ b/app/src/main/java/com/example/myapplication/api/order/RestOrderRepository.kt
@ -24,8 +24,9 @@ class RestOrderRepository(
    private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
    private val database: AppDatabase
 ) : OrderRepository {
-    override fun getAllOrders(): Flow<PagingData<Order>> {
-        val pagingSourceFactory = { dbOrderRepository.getAllOrdersPagingSource() }
+    override fun getAllOrders(userId: Int): Flow<PagingData<Order>> {
+        val pagingSourceFactory = { dbOrderRepository.getAllOrdersPagingSource(userId) }
+
        @OptIn(ExperimentalPagingApi::class)
        return Pager(
            config = PagingConfig(
--- a/app/src/main/java/com/example/myapplication/api/ordersession/RestOrderSessionRepository.kt
+++ b/app/src/main/java/com/example/myapplication/api/ordersession/RestOrderSessionRepository.kt
@ -11,7 +11,7 @@ class RestOrderSessionRepository(
    private val dbOrderSessionRepository: OfflineOrderSessionRepository
 ) : OrderSessionRepository {
    override suspend fun insertOrderSession(orderSessionCrossRef: OrderSessionCrossRef) {
-        val orderRemote = service.getOrder(orderSessionCrossRef.orderId)
+        var orderRemote = service.getOrder(orderSessionCrossRef.orderId)
        val session = service.getSession(orderSessionCrossRef.sessionId)

        val sessionFromOrder = SessionFromOrderRemote(
@ -23,9 +23,10 @@ class RestOrderSessionRepository(
            session.cinema
        )

-        orderRemote.sessions = orderRemote.sessions.toMutableList().apply {
-            add(sessionFromOrder)
-        }
+        val updatedSessions = orderRemote.sessions.toMutableList()
+        updatedSessions.add(sessionFromOrder)
+
+        orderRemote = orderRemote.copy(sessions = updatedSessions)
        service.updateOrder(orderSessionCrossRef.orderId, orderRemote)
        dbOrderSessionRepository.insertOrderSession(orderSessionCrossRef)
    }
--- a/app/src/main/java/com/example/myapplication/api/user/RestUserRepository.kt
+++ b/app/src/main/java/com/example/myapplication/api/user/RestUserRepository.kt
@ -37,27 +37,14 @@ class RestUserRepository(
                )
            )
        }
-        val orders = service.getOrders()
-        val sessions = cart.map { sessionFromCartRemote ->
-            SessionFromCart(
-                uid = sessionFromCartRemote.sessionId,
-                dateTime = sessionFromCartRemote.session.dateTime,
-                price = sessionFromCartRemote.session.price,
-                availableCount = sessionFromCartRemote.session.maxCount - orders
-                    .flatMap
-                    { order ->
-                        order.sessions.filter { session ->
-                            session.id == sessionFromCartRemote.sessionId &&
-                                    session.cinemaId == sessionFromCartRemote.session.cinemaId &&
-                                    session.dateTime == sessionFromCartRemote.session.dateTime
-                        }
-                    }.sumOf { session -> session.count },
-                count = sessionFromCartRemote.count,
-                cinemaId = sessionFromCartRemote.session.cinemaId,
-                cinema = service.getCinema(sessionFromCartRemote.session.cinemaId).toCinema()
+        return cart.map {
+            val cinema = service.getCinema(it.session.cinemaId)
+            it.toSessionFromCart(
+                it.session.maxCount - service.getOrders().flatMap { order ->
+                    order.sessions.filter { session -> session.id == it.id }
+                }.sumOf { session -> session.count }, cinema.toCinema()
            )
        }
-        return sessions
    }

    override suspend fun insertUser(user: User) {
--- a/app/src/main/java/com/example/myapplication/api/user/UserSessionWithSessionRemote.kt
+++ b/app/src/main/java/com/example/myapplication/api/user/UserSessionWithSessionRemote.kt
@ -1,6 +1,8 @@
 package com.example.myapplication.api.user

 import com.example.myapplication.api.session.SessionRemote
+import com.example.myapplication.database.entities.model.Cinema
+import com.example.myapplication.database.entities.model.SessionFromCart
 import kotlinx.serialization.Serializable

@Serializable
@ -11,3 +13,16 @@ data class UserSessionWithSessionRemote(
    val count: Int = 0,
    val session: SessionRemote,
 )
+
+fun UserSessionWithSessionRemote.toSessionFromCart(
+    availableCount: Int = 0,
+    cinema: Cinema
+): SessionFromCart = SessionFromCart(
+    sessionId,
+    session.dateTime,
+    session.price,
+    availableCount,
+    count,
+    session.cinemaId,
+    cinema
+)
--- a/app/src/main/java/com/example/myapplication/api/usersession/RestUserSessionRepository.kt
+++ b/app/src/main/java/com/example/myapplication/api/usersession/RestUserSessionRepository.kt
@ -46,20 +46,16 @@ class RestUserSessionRepository(
        val userSessionRemote = service.getUserSession(
            userSessionCrossRef.userId,
            userSessionCrossRef.sessionId
-        ).firstOrNull() ?: return
+        ).first()
        service.deleteUserSession(userSessionRemote.id)
        dbUserSessionRepository.deleteUserSession(userSessionCrossRef)
    }

    override suspend fun deleteUserSessions(userId: Int) {
-        val cart = service.getUserSessions(userId)
+        val cart = service.getUserCart(userId)
        cart.forEach {
            service.deleteUserSession(it.id)
        }
        dbUserSessionRepository.deleteUserSessions(userId)
    }
-
-    override suspend fun deleteUserSessions(userSessionCrossRefs: List<UserSessionCrossRef>) {
-        userSessionCrossRefs.forEach { deleteUserSession(it) }
-    }
 }
--- a/app/src/main/java/com/example/myapplication/composeui/Authenticator.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/Authenticator.kt
@ -15,9 +15,8 @@ fun Authenticator(
    viewModel: AuthenticatorViewModel = viewModel(factory = AppViewModelProvider.Factory)
 ) {
    val scope = rememberCoroutineScope()
-    val login = dataStoreManager.getLogin().collectAsState(initial = "").value

-    LiveStore.user.value = viewModel.authUiState.user
+    val login = dataStoreManager.getLogin().collectAsState(initial = "").value

    fun synchronize() {
        scope.launch {
@ -25,7 +24,12 @@ fun Authenticator(
                LiveStore.user.value = null
                return@launch
            }
-            viewModel.findUserByLogin(login)
+            val overlap = viewModel.findUserByLogin(login)
+            if (overlap == null) {
+                dataStoreManager.setLogin("")
+                return@launch
+            }
+            LiveStore.user.value = overlap
        }
    }

--- a/app/src/main/java/com/example/myapplication/composeui/AuthenticatorViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/AuthenticatorViewModel.kt
@ -1,27 +1,18 @@
 package com.example.myapplication.composeui

-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import com.example.myapplication.database.entities.model.User
 import com.example.myapplication.database.entities.repository.UserRepository

 class AuthenticatorViewModel(
    private val userRepository: UserRepository
 ) : MyViewModel() {
-    var authUiState by mutableStateOf(AuthenticatorUiState())
-        private set
-
-    suspend fun findUserByLogin(login: String) {
+    suspend fun findUserByLogin(login: String): User? {
+        var user: User? = null
        runInScope(
            actionSuccess = {
-                authUiState = AuthenticatorUiState(userRepository.getUser(login))
-            },
-            actionError = {
-                authUiState = AuthenticatorUiState()
+                user = userRepository.getUser(login)
            }
        )
+        return user
    }
 }
-
-data class AuthenticatorUiState(val user: User? = null)
--- a/app/src/main/java/com/example/myapplication/composeui/Cart.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/Cart.kt
@ -1,5 +1,6 @@
 package com.example.myapplication.composeui

+import android.content.res.Configuration
 import android.graphics.BitmapFactory
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@ -9,7 +10,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 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.foundation.lazy.LazyColumn
@ -17,12 +17,16 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.Button
+import androidx.compose.material3.DismissDirection
+import androidx.compose.material3.DismissState
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.livedata.observeAsState
@ -33,23 +37,21 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
 import com.example.myapplication.LiveStore
 import com.example.myapplication.R
-import com.example.myapplication.api.ApiStatus
-import com.example.myapplication.composeui.navigation.Screen
 import com.example.myapplication.database.entities.composeui.AppViewModelProvider
 import com.example.myapplication.database.entities.model.Session
 import com.example.myapplication.database.entities.model.SessionFromCart
 import com.example.myapplication.database.entities.model.UserRole
+import com.example.myapplication.ui.theme.PmudemoTheme
 import kotlinx.coroutines.launch
 import org.threeten.bp.format.DateTimeFormatter

@Composable
 fun Cart(
-    navController: NavController,
    viewModel: CartViewModel = viewModel(factory = AppViewModelProvider.Factory)
 ) {
    val coroutineScope = rememberCoroutineScope()
@ -58,12 +60,24 @@ fun Cart(
    LaunchedEffect(Unit) {
        viewModel.refreshState()
    }
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
+
    Cart(
        cartUiState = cartUiState,
        modifier = Modifier
            .padding(all = 10.dp),
+        onSwipe = { session: SessionFromCart ->
+            coroutineScope.launch {
+                viewModel.removeFromCart(
+                    session = Session(
+                        uid = session.uid,
+                        dateTime = session.dateTime,
+                        price = session.price,
+                        maxCount = 0,
+                        cinemaId = session.cinemaId
+                    )
+                )
+            }
+        },
        onChangeCount = { session: SessionFromCart, count: Int ->
            coroutineScope.launch {
                viewModel.updateFromCart(
@ -81,43 +95,30 @@ fun Cart(
            coroutineScope.launch {
                viewModel.addToOrder(sessions = sessions)
            }
-                },
-                onDelete = { session: SessionFromCart ->
-                    coroutineScope.launch {
-                        viewModel.removeFromCart(
-                            session = Session(
-                                uid = session.uid,
-                                dateTime = session.dateTime,
-                                price = session.price,
-                                maxCount = 0,
-                                cinemaId = session.cinemaId
-                            )
-                        )
-                    }
        }
    )
-        }
-
-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.navigate(Screen.Report.route) }
-        )
-    }
 }

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 private fun Cart(
    cartUiState: CartUiState,
    modifier: Modifier,
+    onSwipe: (SessionFromCart) -> Unit,
    onChangeCount: (SessionFromCart, Int) -> Unit,
-    onAddToOrder: (List<SessionFromCart>) -> Unit,
-    onDelete: (SessionFromCart) -> Unit
+    onAddToOrder: (List<SessionFromCart>) -> Unit
 ) {
    LazyColumn(
        modifier = modifier
    ) {
        items(cartUiState.sessionList, key = { it.uid.toString() }) { session ->
+            val dismissState: DismissState = rememberDismissState(
+                positionalThreshold = { 200.dp.toPx() }
+            )
+
+            if (dismissState.isDismissed(direction = DismissDirection.EndToStart)) {
+                onSwipe(session)
+            }
            SessionListItem(
                session = session,
                modifier = Modifier
@ -125,13 +126,9 @@ private fun Cart(
                    .padding(10.dp)
                    .clip(RoundedCornerShape(16.dp))
                    .background(MaterialTheme.colorScheme.secondary),
-                onChangeCount = onChangeCount,
-                onDelete = onDelete,
+                onChangeCount = onChangeCount
            )
        }
-        item {
-            Spacer(modifier = Modifier.height(48.dp))
-        }
    }
    val user = LiveStore.user.observeAsState()
    if (user.value?.role == UserRole.USER) {
@ -141,7 +138,7 @@ private fun Cart(
            Button(
                onClick = { onAddToOrder(cartUiState.sessionList) },
                modifier = Modifier
-                    .padding(6.dp)
+                    .padding(16.dp)
                    .fillMaxWidth()
            ) { Text("Купить") }
        }
@ -153,26 +150,27 @@ private fun SessionListItem(
    session: SessionFromCart,
    modifier: Modifier = Modifier,
    onChangeCount: (SessionFromCart, Int) -> Unit,
-    onDelete: (SessionFromCart) -> Unit
 ) {
+    //var currentCount by remember { mutableIntStateOf(session.count) }
+
    val dateFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
    val formattedDate = dateFormatter.format(session.dateTime)
+    Column {
        Text(
            text = formattedDate,
            color = MaterialTheme.colorScheme.onBackground,
        )
-    Column(modifier = modifier.fillMaxWidth()) {
        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(8.dp)
+            modifier = modifier
        ) {
            Row(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(8.dp),
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.SpaceBetween
            ) {
-                if (session.cinema.image != null) {
+                if (session.cinema.image != null)
                    Image(
                        bitmap = BitmapFactory.decodeByteArray(
                            session.cinema.image,
@ -184,7 +182,6 @@ private fun SessionListItem(
                            .size(90.dp)
                            .padding(4.dp)
                    )
-                }

                Column(
                    modifier = Modifier.weight(1f),
@ -193,51 +190,38 @@ private fun SessionListItem(
                    Text(
                        text = "${session.cinema.name}, ${session.cinema.year}\n" +
                                "Цена: ${session.price}\n" +
-                                if (session.availableCount == 0) "Недоступно" else "${session.count}/${session.availableCount}",
+                                "${session.count}/${session.availableCount}",
                        color = MaterialTheme.colorScheme.onSecondary
                    )
                }
-            }
-        }

-        Row(
+                Box(
                    modifier = Modifier
-                .background(color = MaterialTheme.colorScheme.primary)
-                .fillMaxWidth(),
-            horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        .background(
+                            color = MaterialTheme.colorScheme.background,
+                            shape = RoundedCornerShape(10.dp)
+                        ) // Задаем фон для кнопок
+                ) {
+                    Row(
                        verticalAlignment = Alignment.CenterVertically
                    ) {
                        IconButton(
-                onClick = { onDelete(session) }
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Delete,
-                    contentDescription = "Удалить",
-                    tint = MaterialTheme.colorScheme.onPrimary
-                )
-            }
-
-            Spacer(modifier = Modifier.weight(1F))
-
-            if (session.availableCount != 0) {
-                IconButton(
-                    enabled = session.count != 1,
                            onClick = { onChangeCount(session, session.count - 1) }
                        ) {
                            Icon(
                                imageVector = ImageVector.vectorResource(id = R.drawable.minus),
                                contentDescription = "Уменьшить",
-                        tint = MaterialTheme.colorScheme.onPrimary
+                                tint = MaterialTheme.colorScheme.onBackground,
+                                modifier = Modifier.size(10.dp)
                            )
                        }

                        Text(
                            text = "${session.count}",
-                    color = MaterialTheme.colorScheme.onPrimary
+                            color = MaterialTheme.colorScheme.onBackground
                        )

                        IconButton(
-                    enabled = session.count != session.availableCount,
                            onClick = {
                                onChangeCount(
                                    session,
@ -248,11 +232,26 @@ private fun SessionListItem(
                            Icon(
                                imageVector = Icons.Default.Add,
                                contentDescription = "Увеличить",
-                        tint = MaterialTheme.colorScheme.onPrimary
+                                tint = MaterialTheme.colorScheme.onBackground,
+                                modifier = Modifier.size(10.dp)
                            )
                        }
-
+                    }
+                }
            }
        }
    }
 }
+
+@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun CartPreview() {
+    PmudemoTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            Cart()
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/composeui/CartViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/CartViewModel.kt
@ -3,7 +3,7 @@ package com.example.myapplication.composeui
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.room.Transaction
+import androidx.lifecycle.ViewModel
 import com.example.myapplication.LiveStore
 import com.example.myapplication.database.entities.model.Order
 import com.example.myapplication.database.entities.model.OrderSessionCrossRef
@ -21,37 +21,26 @@ class CartViewModel(
    private val orderRepository: OrderRepository,
    private val orderSessionRepository: OrderSessionRepository,
    private val userRepository: UserRepository,
-) : MyViewModel() {
+) : ViewModel() {
    private var isLoading: Boolean = false
    var cartUiState by mutableStateOf(CartUiState())
        private set

-    suspend fun refreshState(needLoadingScreen: Boolean = true) {
-        val userId: Int = LiveStore.user.value?.uid ?: return
-        runInScope(
-            actionSuccess = {
-                cartUiState = CartUiState(userRepository.getCartByUser(userId))
-            }, actionError = {
-                cartUiState = CartUiState()
-            },
-            needLoadingScreen = needLoadingScreen
-        )
+    suspend fun refreshState() {
+        val userId: Int = LiveStore.user.value?.uid ?: 0
+        val cart = userRepository.getCartByUser(userId)
+        cartUiState = CartUiState(cart)
    }

-    @Transaction
    suspend fun addToOrder(sessions: List<SessionFromCart>) {
        if (isLoading)
            return
        isLoading = true
        val userId: Int = LiveStore.user.value?.uid ?: return
-        val cart = sessions.filter { it.availableCount != 0 }
-        if (cart.isEmpty())
+        if (sessions.isEmpty())
            return
-        runInScope(
-            actionSuccess = {
        val orderId = orderRepository.insertOrder(Order(0, userId, LocalDateTime.now()))
-                cart.forEach { session ->
-                    if (session.availableCount != 0) {
+        sessions.forEach { session ->
            orderSessionRepository.insertOrderSession(
                OrderSessionCrossRef(
                    orderId.toInt(),
@ -61,53 +50,27 @@ class CartViewModel(
                )
            )
        }
-                }
-                userSessionRepository.deleteUserSessions(cart.map {
-                    UserSessionCrossRef(userId, it.uid, it.count)
-                })
+        userSessionRepository.deleteUserSessions(userId)
        refreshState()
    }
-        )
-    }

    suspend fun removeFromCart(session: Session, count: Int = 0) {
        val userId: Int = LiveStore.user.value?.uid ?: return
-        runInScope(
-            actionSuccess = {
-                userSessionRepository.deleteUserSession(
-                    UserSessionCrossRef(
-                        userId,
-                        session.uid,
-                        count
-                    )
-                )
+        userSessionRepository.deleteUserSession(UserSessionCrossRef(userId, session.uid, count))
        refreshState()
    }
-        )
-    }

-    suspend fun updateFromCart(session: Session, count: Int, availableCount: Int) {
-        val userId: Int = LiveStore.user.value?.uid ?: return
+    suspend fun updateFromCart(session: Session, count: Int, availableCount: Int): Boolean {
+        val userId: Int = LiveStore.user.value?.uid ?: return false
        if (count == 0) {
            removeFromCart(session, count)
-            return
+            return false
        }
        if (count > availableCount)
-            return
-        runInScope(
-            actionSuccess = {
-                userSessionRepository.updateUserSession(
-                    UserSessionCrossRef(
-                        userId,
-                        session.uid,
-                        count
-                    )
-                )
+            return false
+        userSessionRepository.updateUserSession(UserSessionCrossRef(userId, session.uid, count))
        refreshState()
-            },
-            actionError = { },
-            needLoadingScreen = false
-        )
+        return true
    }
 }

--- a/app/src/main/java/com/example/myapplication/composeui/MyViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/MyViewModel.kt
@ -19,11 +19,9 @@ open class MyViewModel : ViewModel() {

    fun runInScope(
        actionSuccess: suspend () -> Unit,
-        actionError: suspend () -> Unit,
-        needLoadingScreen: Boolean = true,
+        actionError: suspend () -> Unit
    ) {
        viewModelScope.launch {
-            if (needLoadingScreen)
            apiStatus = ApiStatus.LOADING
            runCatching {
                actionSuccess()
--- a/app/src/main/java/com/example/myapplication/composeui/NetworkUi.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/NetworkUi.kt
@ -1,5 +1,6 @@
 package com.example.myapplication.composeui

+import android.content.res.Configuration
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@ -7,6 +8,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@ -14,10 +17,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
 import com.example.myapplication.R
+import com.example.myapplication.ui.theme.PmudemoTheme


@Composable
@ -63,3 +68,29 @@ fun LoadingPlaceholder() {
        )
    }
 }
+
+@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun ErrorPlaceholderPreview() {
+    PmudemoTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            ErrorPlaceholder("Error", onBack = {})
+        }
+    }
+}
+
+@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun LoadingPlaceholderPreview() {
+    PmudemoTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            LoadingPlaceholder()
+        }
+    }
+}
--- a/app/src/main/java/com/example/myapplication/composeui/Report.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/Report.kt
@ -25,10 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
-import com.example.myapplication.api.ApiStatus
 import com.example.myapplication.api.session.ReportRemote
-import com.example.myapplication.composeui.navigation.Screen
 import com.example.myapplication.database.entities.composeui.AppViewModelProvider
 import kotlinx.coroutines.launch
 import org.threeten.bp.format.DateTimeFormatter
@ -37,15 +34,11 @@ import java.util.Date
@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun Report(
-    navController: NavController,
    viewModel: ReportViewModel = viewModel(factory = AppViewModelProvider.Factory)
 ) {
    val dateStateStart = rememberDatePickerState(initialDisplayMode = DisplayMode.Input)
    val dateStateEnd = rememberDatePickerState(initialDisplayMode = DisplayMode.Input)
    val coroutineScope = rememberCoroutineScope()
-
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
    Column(
        modifier = Modifier
            .verticalScroll(rememberScrollState())
@ -90,6 +83,7 @@ fun Report(
        Button(
            onClick = { coroutineScope.launch { viewModel.getReport() } },
            enabled = viewModel.reportUiState.isEntryValid,
+            shape = MaterialTheme.shapes.small,
            modifier = Modifier.fillMaxWidth()
        ) {
            Text(text = "Получить отчет")
@ -97,14 +91,6 @@ fun Report(
        Spacer(modifier = Modifier.height(16.dp))
        CardScreen(reportData = viewModel.reportResultUiState.report)
    }
-        }
-
-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.navigate(Screen.Report.route) }
-        )
-    }
 }

@Composable
--- a/app/src/main/java/com/example/myapplication/composeui/ReportViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/ReportViewModel.kt
@ -3,11 +3,12 @@ package com.example.myapplication.composeui
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
 import com.example.myapplication.api.session.ReportRemote
 import com.example.myapplication.api.session.RestSessionRepository
 import java.util.Date

-class ReportViewModel(private val serialRepository: RestSessionRepository) : MyViewModel() {
+class ReportViewModel(private val serialRepository: RestSessionRepository) : ViewModel() {
    var reportUiState by mutableStateOf(ReportUiState())
        private set

@ -31,17 +32,11 @@ class ReportViewModel(private val serialRepository: RestSessionRepository) : MyV

    suspend fun getReport() {
        if (validateInput()) {
-            runInScope(
-                actionSuccess = {
            val temp = serialRepository.getReport(
                reportUiState.reportDetails.startDate,
                reportUiState.reportDetails.endDate
            )
            reportResultUiState = ReportResultUiState(temp)
-                }, actionError = {
-                    reportResultUiState = ReportResultUiState()
-                }
-            )
        }
    }
 }
--- a/app/src/main/java/com/example/myapplication/composeui/navigation/MainNavbar.kt
+++ b/app/src/main/java/com/example/myapplication/composeui/navigation/MainNavbar.kt
@ -93,10 +93,10 @@ fun Topbar(

            Spacer(modifier = Modifier.width(16.dp))

+            if (currentScreen?.route == Screen.CinemaList.route) {
                Search(
                    initValue = LiveStore.searchRequest.value ?: "",
                    onDone = {
-                    navController.navigate(Screen.CinemaList.route)
                        LiveStore.searchRequest.value = it
                    },
                    modifier = Modifier
@ -110,6 +110,7 @@ fun Topbar(
                )
            }
        }
+    }
 }

@Composable
@ -162,8 +163,8 @@ fun Navhost(
    ) {
        composable(Screen.CinemaList.route) { CinemaList(navController) }
        composable(Screen.OrderList.route) { OrderList(navController) }
-        composable(Screen.Cart.route) { Cart(navController) }
-        composable(Screen.UserProfile.route) { UserProfile(isDarkTheme, dataStore) }
+        composable(Screen.Cart.route) { Cart() }
+        composable(Screen.UserProfile.route) { UserProfile(isDarkTheme, dataStore, navController) }
        composable(
            Screen.CinemaEdit.route,
            arguments = listOf(navArgument("id") { type = NavType.IntType })
@ -187,9 +188,9 @@ fun Navhost(
            Screen.OrderView.route,
            arguments = listOf(navArgument("id") { type = NavType.IntType })
        ) { backStackEntry ->
-            backStackEntry.arguments?.let { OrderView(navController) }
+            backStackEntry.arguments?.let { OrderView(it.getInt("id")) }
        }
-        composable(Screen.Report.route) { Report(navController) }
+        composable(Screen.Report.route) { Report() }
    }
 }

--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaList.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaList.kt
@ -56,6 +56,7 @@ fun CinemaList(
    LaunchedEffect(searchPattern.value) {
        viewModel.refresh()
    }
+
    Scaffold(
        topBar = {},
        floatingActionButton = {
@ -98,7 +99,6 @@ fun CinemaList(
    }
 }

-
@Composable
 private fun CinemaList(
    modifier: Modifier = Modifier,
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaListViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaListViewModel.kt
@ -21,16 +21,12 @@ class CinemaListViewModel(

    fun refresh() {
        val name = "%${LiveStore.searchRequest.value}%"
-        runInScope(actionSuccess = {
        val pagingSource = cinemaRepository.getAllCinemas(name)
        cinemaPagingFlow = CinemaPagingFlowState(pagingSource.cachedIn(viewModelScope))
-        })
    }

    suspend fun deleteCinema(cinema: Cinema) {
-        runInScope(actionSuccess = {
        cinemaRepository.deleteCinema(cinema)
-        })
    }
 }

--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaView.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaView.kt
@ -31,9 +31,6 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.example.myapplication.LiveStore
-import com.example.myapplication.api.ApiStatus
-import com.example.myapplication.composeui.ErrorPlaceholder
-import com.example.myapplication.composeui.LoadingPlaceholder
 import com.example.myapplication.composeui.navigation.Screen
 import com.example.myapplication.database.entities.model.Cinema
 import com.example.myapplication.database.entities.model.UserRole
@ -45,11 +42,11 @@ fun CinemaView(
 ) {
    val cinemaUiState = viewModel.cinemaUiState
    val user = LiveStore.user.observeAsState()
+
    LaunchedEffect(Unit) {
        viewModel.refreshState()
    }
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
+
    Column(
        modifier = Modifier
            .padding(16.dp)
@ -145,12 +142,4 @@ fun CinemaView(
            SessionList(viewModel, navController)
        }
    }
-        }
-
-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.popBackStack() }
-        )
-    }
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/CinemaViewModel.kt
@ -4,13 +4,13 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.SavedStateHandle
-import com.example.myapplication.composeui.MyViewModel
+import androidx.lifecycle.ViewModel
 import com.example.myapplication.database.entities.model.CinemaWithSessions
 import com.example.myapplication.database.entities.repository.CinemaRepository

 class CinemaViewModel(
    savedStateHandle: SavedStateHandle, private val cinemaRepository: CinemaRepository
-) : MyViewModel() {
+) : ViewModel() {
    private val cinemaUid: Int = checkNotNull(savedStateHandle["id"])

    var cinemaUiState by mutableStateOf(CinemaUiState())
@ -18,11 +18,7 @@ class CinemaViewModel(

    suspend fun refreshState() {
        if (cinemaUid > 0) {
-            runInScope(actionSuccess = {
            cinemaUiState = CinemaUiState(cinemaRepository.getCinema(cinemaUid))
-            }, actionError = {
-                cinemaUiState = CinemaUiState()
-            })
        }
    }
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderList.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderList.kt
@ -15,6 +15,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@ -24,6 +26,7 @@ import androidx.navigation.NavController
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
+import com.example.myapplication.LiveStore
 import com.example.myapplication.composeui.navigation.Screen
 import com.example.myapplication.ui.theme.PmudemoTheme
 import org.threeten.bp.format.DateTimeFormatter
@ -33,8 +36,11 @@ fun OrderList(
    navController: NavController?,
    viewModel: OrderListViewModel = viewModel(factory = AppViewModelProvider.Factory)
 ) {
+    val user = LiveStore.user.observeAsState()
    val ordersUiState = viewModel.orderListUiState.collectAsLazyPagingItems()
-    
+    LaunchedEffect(user.value?.uid) {
+        viewModel.refreshState(user.value?.uid ?: 0)
+    }
    LazyColumn(
        modifier = Modifier
            .fillMaxSize()
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderListViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderListViewModel.kt
@ -1,13 +1,18 @@
 package com.example.myapplication.database.entities.composeui

+import androidx.lifecycle.ViewModel
 import androidx.paging.PagingData
-import com.example.myapplication.composeui.MyViewModel
 import com.example.myapplication.database.entities.model.Order
 import com.example.myapplication.database.entities.repository.OrderRepository
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow

 class OrderListViewModel(
-    orderRepository: OrderRepository
-) : MyViewModel() {
-    var orderListUiState: Flow<PagingData<Order>> = orderRepository.getAllOrders()
+    private val orderRepository: OrderRepository
+) : ViewModel() {
+    var orderListUiState: Flow<PagingData<Order>> = emptyFlow()
+
+    fun refreshState(userId: Int = 0) {
+        orderListUiState = orderRepository.getAllOrders(userId)
+    }
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderView.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderView.kt
@ -1,5 +1,6 @@
 package com.example.myapplication.database.entities.composeui

+import android.content.res.Configuration
 import android.graphics.BitmapFactory
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@ -14,41 +15,37 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavController
-import com.example.myapplication.api.ApiStatus
-import com.example.myapplication.composeui.ErrorPlaceholder
-import com.example.myapplication.composeui.LoadingPlaceholder
+import com.example.myapplication.ui.theme.PmudemoTheme
 import org.threeten.bp.format.DateTimeFormatter

@Composable
 fun OrderView(
-    navController: NavController,
+    id: Int,
    viewModel: OrderViewModel = viewModel(factory = AppViewModelProvider.Factory)
 ) {
-    val orderUiState = viewModel.orderUiState
-
-    LaunchedEffect(Unit) {
-        viewModel.refreshState()
-    }
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
+    val coroutineScope = rememberCoroutineScope()
+    val orderUiState by viewModel.orderUiState.collectAsState()
    LazyColumn(
        modifier = Modifier
            .padding(10.dp)
    ) {
        items(orderUiState.sessionList) { session ->
-                    val count = remember { mutableIntStateOf(session.count) }
+            val count = remember { mutableStateOf(session.count) }
            val dateFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
            val formattedDate = dateFormatter.format(session.dateTime)

@ -92,7 +89,7 @@ fun OrderView(
                        Text(
                            text = "${session.cinema.name}, ${session.cinema.year}\n" +
                                    "Цена: ${session.frozenPrice}\n" +
-                                            "Количество: ${count.intValue}",
+                                    "Количество: ${count.value}",
                            color = MaterialTheme.colorScheme.onSecondary
                        )
                    }
@ -100,12 +97,18 @@ fun OrderView(
            }
        }
    }
-        }
+}

-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.popBackStack() }
-        )
+
+@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun OrderViewPreview() {
+    PmudemoTheme {
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            OrderView(id = 1)
+        }
    }
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/OrderViewModel.kt
@ -1,29 +1,31 @@
 package com.example.myapplication.database.entities.composeui

-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
 import androidx.lifecycle.SavedStateHandle
-import com.example.myapplication.composeui.MyViewModel
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.myapplication.database.AppContainer
 import com.example.myapplication.database.entities.model.SessionFromOrder
 import com.example.myapplication.database.entities.repository.OrderRepository
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn

 class OrderViewModel(
    savedStateHandle: SavedStateHandle,
    private val orderRepository: OrderRepository
-) : MyViewModel() {
+) : ViewModel() {
    private val orderUid: Int = checkNotNull(savedStateHandle["id"])

-    var orderUiState by mutableStateOf(OrderUiState())
-        private set
-
-    suspend fun refreshState() {
-        runInScope(actionSuccess = {
-            orderUiState = OrderUiState(orderRepository.getOrder(orderUid))
-        }, actionError = {
-            orderUiState = OrderUiState()
-        })
-    }
+    val orderUiState: StateFlow<OrderUiState> =
+        flow { emit(orderRepository.getOrder(orderUid)) }.map {
+            OrderUiState(it)
+        }.stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(stopTimeoutMillis = AppContainer.TIMEOUT),
+            initialValue = OrderUiState()
+        )
 }

 data class OrderUiState(val sessionList: List<SessionFromOrder> = listOf())
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/SessionList.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/SessionList.kt
@ -113,6 +113,7 @@ fun SessionList(
                                IconButton(
                                    onClick = {
                                        coroutineScope.launch {
+                                            if (session.availableCount != 0)
                                                viewModel.addSessionInCart(sessionId = session.uid)
                                        }
                                    },
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/SessionListViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/SessionListViewModel.kt
@ -1,7 +1,7 @@
 package com.example.myapplication.database.entities.composeui

+import androidx.lifecycle.ViewModel
 import com.example.myapplication.LiveStore
-import com.example.myapplication.composeui.MyViewModel
 import com.example.myapplication.database.entities.model.Session
 import com.example.myapplication.database.entities.model.SessionFromCinema
 import com.example.myapplication.database.entities.model.UserSessionCrossRef
@ -11,9 +11,8 @@ import com.example.myapplication.database.entities.repository.UserSessionReposit
 class SessionListViewModel(
    private val sessionRepository: SessionRepository,
    private val userSessionRepository: UserSessionRepository
-) : MyViewModel() {
+) : ViewModel() {
    suspend fun deleteSession(session: SessionFromCinema) {
-        runInScope(actionSuccess = {
        sessionRepository.deleteSession(
            Session(
                uid = session.uid,
@ -23,19 +22,14 @@ class SessionListViewModel(
                cinemaId = 0
            )
        )
-        })
    }

    suspend fun addSessionInCart(sessionId: Int, count: Int = 1) {
+        try {
            val userId: Int = LiveStore.user.value?.uid ?: return
-        runInScope(actionSuccess = {
-            userSessionRepository.insertUserSession(
-                UserSessionCrossRef(
-                    userId,
-                    sessionId,
-                    count
-                )
-            )
-        })
+            userSessionRepository.insertUserSession(UserSessionCrossRef(userId, sessionId, count))
+        } catch (_: Exception) {
+
+        }
    }
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfile.kt
@ -18,7 +18,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@ -33,6 +32,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
 import com.example.myapplication.LiveStore
 import com.example.myapplication.datastore.DataStoreManager
 import kotlinx.coroutines.launch
@ -41,21 +41,15 @@ import kotlinx.coroutines.launch
 fun UserProfile(
    isDarkTheme: MutableState<Boolean>,
    dataStoreManager: DataStoreManager,
+    navController: NavController,
    viewModel: UserProfileViewModel = viewModel(factory = AppViewModelProvider.Factory),
 ) {
    var isRegistration by remember { mutableStateOf(false) }
    val coroutine = rememberCoroutineScope()
    val errorStringId: Int? = viewModel.userUiState.errorId
-    val errorMessage =
-        if (errorStringId == null || errorStringId == 0) "" else stringResource(errorStringId)
+    val errorMessage = if (errorStringId == null) "" else stringResource(errorStringId)
    val user = LiveStore.user.observeAsState()

-    LaunchedEffect(errorStringId) {
-        if (errorStringId == 0) {
-            isRegistration = false
-        }
-    }
-
    LazyColumn {
        item {
            if (user.value != null) {
@ -76,7 +70,7 @@ fun UserProfile(
                        },
                        modifier = Modifier
                            .fillMaxWidth()
-                            .padding(start = 2.dp, top = 10.dp)
+                            .padding(8.dp)
                    ) { Text("Выход") }
                }
            } else {
@ -157,10 +151,10 @@ fun UserProfile(

                    if (isRegistration) {
                        Button(
-                            onClick = { coroutine.launch { viewModel.signUp() } },
+                            onClick = { coroutine.launch { isRegistration = !viewModel.signUp() } },
                            modifier = Modifier
                                .fillMaxWidth()
-                                .padding(start = 2.dp, top = 8.dp)
+                                .padding(8.dp)
                        ) {
                            Text("Регистрация")
                        }
@ -177,12 +171,14 @@ fun UserProfile(
                        Button(
                            onClick = {
                                coroutine.launch {
-                                    viewModel.signIn(dataStoreManager)
+                                    if (viewModel.signIn(dataStoreManager)) {
+                                        navController.popBackStack()
+                                    }
                                }
                            },
                            modifier = Modifier
                                .fillMaxWidth()
-                                .padding(start = 2.dp, top = 8.dp)
+                                .padding(8.dp)
                        ) {
                            Text("Вход")
                        }
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfileViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/UserProfileViewModel.kt
@ -1,20 +1,17 @@
 package com.example.myapplication.database.entities.composeui

-import android.util.Log
-import android.widget.Toast
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import com.example.myapplication.MainComposeActivity
+import androidx.lifecycle.ViewModel
 import com.example.myapplication.R
-import com.example.myapplication.composeui.MyViewModel
 import com.example.myapplication.database.entities.model.User
 import com.example.myapplication.database.entities.repository.UserRepository
 import com.example.myapplication.datastore.DataStoreManager

 class UserProfileViewModel(
    private val userRepository: UserRepository
-) : MyViewModel() {
+) : ViewModel() {
    var userUiState by mutableStateOf(UserUiState())
        private set

@ -25,63 +22,43 @@ class UserProfileViewModel(
        )
    }

-    suspend fun signIn(dataStoreManager: DataStoreManager) {
+    suspend fun signIn(dataStoreManager: DataStoreManager): Boolean {
        userUiState.details.passwordConfirm = userUiState.details.password
        var errorId: Int? = validateInput(userUiState.details)
-        runInScope(
-            actionSuccess = {
        if (errorId == null) {
-                    val overlap: User? = userRepository.getUser(userUiState.details.login)
+            val overlap = userRepository.getUser(userUiState.details.login)
            if (overlap == null || userUiState.details.password != overlap.password) {
                errorId = R.string.err_04
-                    } else {
+            }
+        }
+        userUiState = UserUiState(
+            details = userUiState.details,
+            errorId = errorId
+        )
+        if (errorId == null) {
            dataStoreManager.setLogin(userUiState.details.login)
-                        Log.d("UserProfileViewModel", "sign in success")
+            return true
        }
-                }
-                userUiState = UserUiState(
-                    details = userUiState.details,
-                    errorId = errorId
-                )
-            }, actionError = {
-                errorId = R.string.err_06
-                userUiState = UserUiState(
-                    details = userUiState.details,
-                    errorId = errorId
-                )
-            })
+        return false
    }

-    suspend fun signUp() {
+    suspend fun signUp(): Boolean {
        var errorId: Int? = validateInput(userUiState.details)
-        runInScope(actionSuccess = {
        if (errorId == null) {
            val overlap = userRepository.getUser(userUiState.details.login)
            if (overlap != null) {
                errorId = R.string.err_03
            }
        }
+        userUiState = UserUiState(
+            details = userUiState.details,
+            errorId = errorId
+        )
        if (errorId == null) {
            userRepository.insertUser(userUiState.details.toUser())
-                val toast = Toast.makeText(
-                    MainComposeActivity.appContext,
-                    "Вы зарегистрированы",
-                    Toast.LENGTH_SHORT
-                )
-                toast.show()
-                errorId = 0
+            return true
        }
-            userUiState = UserUiState(
-                details = userUiState.details,
-                errorId = errorId
-            )
-        }, actionError = {
-            errorId = R.string.err_06
-            userUiState = UserUiState(
-                details = userUiState.details,
-                errorId = errorId
-            )
-        })
+        return false
    }

    private fun validateInput(details: UserDetails = userUiState.details): Int? {
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/edit/CinemaEdit.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/edit/CinemaEdit.kt
@ -22,9 +22,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.example.myapplication.R
-import com.example.myapplication.api.ApiStatus
-import com.example.myapplication.composeui.ErrorPlaceholder
-import com.example.myapplication.composeui.LoadingPlaceholder
 import com.example.myapplication.database.entities.composeui.AppViewModelProvider
 import com.example.myapplication.ui.theme.PmudemoTheme
 import kotlinx.coroutines.launch
@ -35,8 +32,7 @@ fun CinemaEdit(
    viewModel: CinemaEditViewModel = viewModel(factory = AppViewModelProvider.Factory),
 ) {
    val coroutineScope = rememberCoroutineScope()
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
+
    CinemaEdit(
        cinemaUiState = viewModel.cinemaUiState,
        onClick = {
@ -47,13 +43,6 @@ fun CinemaEdit(
        },
        onUpdate = viewModel::updateUiState,
    )
-        }
-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.popBackStack() }
-        )
-    }
 }

@Composable
@ -111,6 +100,7 @@ private fun CinemaEdit(
        Button(
            onClick = onClick,
            enabled = cinemaUiState.isEntryValid,
+            shape = MaterialTheme.shapes.small,
            modifier = Modifier.fillMaxWidth()
        ) {
            Text(text = stringResource(R.string.Save_button))
--- a/app/src/main/java/com/example/myapplication/database/entities/composeui/edit/SessionEdit.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/composeui/edit/SessionEdit.kt
@ -9,6 +9,7 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.DatePicker
 import androidx.compose.material3.DisplayMode
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TimePicker
@ -23,9 +24,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.example.myapplication.R
-import com.example.myapplication.api.ApiStatus
-import com.example.myapplication.composeui.ErrorPlaceholder
-import com.example.myapplication.composeui.LoadingPlaceholder
 import com.example.myapplication.database.entities.composeui.AppViewModelProvider
 import kotlinx.coroutines.launch
 import org.threeten.bp.Instant
@ -41,8 +39,6 @@ fun SessionEdit(
    viewModel: SessionEditViewModel = viewModel(factory = AppViewModelProvider.Factory),
 ) {
    val coroutineScope = rememberCoroutineScope()
-    when (viewModel.apiStatus) {
-        ApiStatus.DONE -> {
    SessionEdit(
        sessionUiState = viewModel.sessionUiState,
        onClick = {
@ -53,14 +49,6 @@ fun SessionEdit(
        },
        onUpdate = viewModel::updateUiState
    )
-        }
-
-        ApiStatus.LOADING -> LoadingPlaceholder()
-        else -> ErrorPlaceholder(
-            message = viewModel.apiError,
-            onBack = { navController.popBackStack() }
-        )
-    }
 }

 fun Long.toLocalDate(): org.threeten.bp.LocalDate {
@ -152,6 +140,7 @@ private fun SessionEdit(
            Button(
                onClick = onClick,
                enabled = sessionUiState.isEntryValid,
+                shape = MaterialTheme.shapes.small,
                modifier = Modifier.fillMaxWidth()
            ) {
                Text(text = stringResource(R.string.Save_button))
--- a/app/src/main/java/com/example/myapplication/database/entities/dao/CinemaDao.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/dao/CinemaDao.kt
@ -4,7 +4,6 @@ import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.example.myapplication.database.entities.model.Cinema
@ -15,7 +14,6 @@ import kotlinx.coroutines.flow.Flow
 interface CinemaDao {
    @Query("select * from cinemas order by name")
    fun getAll(): PagingSource<Int, Cinema>
-
    @Query("select * from cinemas where cinemas.name like :name order by name collate nocase asc")
    fun getAll(name: String): PagingSource<Int, Cinema>

@ -29,7 +27,7 @@ interface CinemaDao {
    )
    fun getByUid(cinemaId: Int?): Flow<Map<Cinema, List<SessionFromCinema>>>

-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
    suspend fun insert(vararg cinema: Cinema)

    @Update
--- a/app/src/main/java/com/example/myapplication/database/entities/dao/OrderDao.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/dao/OrderDao.kt
@ -4,7 +4,6 @@ import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.example.myapplication.database.entities.model.Order
@ -24,7 +23,7 @@ interface OrderDao {
    )
    fun getByUid(orderId: Int?): List<SessionFromOrder>

-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
    suspend fun insert(vararg order: Order): List<Long>

    @Update
--- a/app/src/main/java/com/example/myapplication/database/entities/dao/SessionDao.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/dao/SessionDao.kt
@ -3,7 +3,6 @@ package com.example.myapplication.database.entities.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.example.myapplication.database.entities.model.Session
@ -13,7 +12,7 @@ interface SessionDao {
    @Query("select * from sessions where sessions.uid = :uid")
    suspend fun getByUid(uid: Int): Session

-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
    suspend fun insert(vararg session: Session)

    @Update
--- a/app/src/main/java/com/example/myapplication/database/entities/dao/UserDao.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/dao/UserDao.kt
@ -3,7 +3,6 @@ package com.example.myapplication.database.entities.dao
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
-import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
 import com.example.myapplication.database.entities.model.SessionFromCart
@ -28,7 +27,7 @@ interface UserDao {
    )
    suspend fun getCartByUid(userId: Int): List<SessionFromCart>

-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert
    suspend fun insert(vararg user: User)

    @Update
--- a/app/src/main/java/com/example/myapplication/database/entities/dao/UserSessionCrossRefDao.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/dao/UserSessionCrossRefDao.kt
@ -17,7 +17,7 @@ interface UserSessionCrossRefDao {
    suspend fun update(userSessionCrossRef: UserSessionCrossRef)

    @Delete
-    suspend fun delete(vararg userSessionCrossRef: UserSessionCrossRef)
+    suspend fun delete(userSessionCrossRef: UserSessionCrossRef)

    @Query("DELETE FROM users_sessions where users_sessions.user_id = :userId")
    suspend fun deleteByUserUid(userId: Int)
--- a/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineCinemaRepository.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineCinemaRepository.kt
@ -18,7 +18,7 @@ class OfflineCinemaRepository(private val cinemaDao: CinemaDao) : CinemaReposito
            pageSize = AppContainer.LIMIT,
            enablePlaceholders = false
        ),
-        pagingSourceFactory = { cinemaDao.getAll(name) }
+        pagingSourceFactory = cinemaDao::getAll
    ).flow


--- a/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineOrderRepository.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineOrderRepository.kt
@ -4,7 +4,6 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.PagingSource
-import com.example.myapplication.LiveStore
 import com.example.myapplication.database.AppContainer
 import com.example.myapplication.database.entities.dao.OrderDao
 import com.example.myapplication.database.entities.model.Order
@ -12,21 +11,19 @@ import com.example.myapplication.database.entities.model.SessionFromOrder
 import kotlinx.coroutines.flow.Flow

 class OfflineOrderRepository(private val orderDao: OrderDao) : OrderRepository {
-    override fun getAllOrders(): Flow<PagingData<Order>> = Pager(
+    override fun getAllOrders(userId: Int): Flow<PagingData<Order>> = Pager(
        config = PagingConfig(
            pageSize = AppContainer.LIMIT,
            enablePlaceholders = false
        ),
-        pagingSourceFactory = { orderDao.getAll(LiveStore.user.value?.uid ?: 0) }
+        pagingSourceFactory = { orderDao.getAll(userId) }
    ).flow

    override suspend fun getOrder(uid: Int): List<SessionFromOrder> = orderDao.getByUid(uid)

    override suspend fun insertOrder(order: Order): Long = orderDao.insert(order).first()

-    fun getAllOrdersPagingSource(): PagingSource<Int, Order> {
-        return orderDao.getAll(LiveStore.user.value?.uid ?: 0)
-    }
+    fun getAllOrdersPagingSource(userId: Int?): PagingSource<Int, Order> = orderDao.getAll(userId)

    suspend fun clearOrders() = orderDao.deleteAll()

--- a/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineUserSessionRepository.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/repository/OfflineUserSessionRepository.kt
@ -16,8 +16,5 @@ class OfflineUserSessionRepository(private val userSessionDao: UserSessionCrossR

    override suspend fun deleteUserSessions(userId: Int) = userSessionDao.deleteByUserUid(userId)

-    override suspend fun deleteUserSessions(userSessionCrossRefs: List<UserSessionCrossRef>) =
-        userSessionDao.delete(*userSessionCrossRefs.toTypedArray())
-
    suspend fun deleteSessionsByUid(sessionId: Int) = userSessionDao.deleteBySessionUid(sessionId)
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/repository/OrderRepository.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/repository/OrderRepository.kt
@ -6,7 +6,7 @@ import com.example.myapplication.database.entities.model.SessionFromOrder
 import kotlinx.coroutines.flow.Flow

 interface OrderRepository {
-    fun getAllOrders(): Flow<PagingData<Order>>
+    fun getAllOrders(userId: Int): Flow<PagingData<Order>>
    suspend fun getOrder(uid: Int): List<SessionFromOrder>
    suspend fun insertOrder(order: Order): Long
 }
--- a/app/src/main/java/com/example/myapplication/database/entities/repository/UserSessionRepository.kt
+++ b/app/src/main/java/com/example/myapplication/database/entities/repository/UserSessionRepository.kt
@ -7,5 +7,4 @@ interface UserSessionRepository {
    suspend fun updateUserSession(userSessionCrossRef: UserSessionCrossRef)
    suspend fun deleteUserSession(userSessionCrossRef: UserSessionCrossRef)
    suspend fun deleteUserSessions(userId: Int)
-    suspend fun deleteUserSessions(userSessionCrossRefs: List<UserSessionCrossRef>)
 }
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -25,7 +25,6 @@
    <string name="err_03">Логин занят</string>
    <string name="err_04">Неверный логин или пароль</string>
    <string name="err_05">Не совпадают пароли</string>
-    <string name="err_06">Ошибка сети</string>
    <string name="back">Назад</string>
    <string name="loading">Загрузка…</string>
 </resources>
--- a/server/data.json
+++ b/server/data.json
--- a/server/reportRouter.js
+++ b/server/reportRouter.js
@ -8,7 +8,7 @@ module.exports = (req, res, next) => {

  try {
    const { startDate, endDate } = req.query;
-    const { cinemas, sessions, orders } = require('./data.json');
+    const { sessions, orders } = require('./data.json');

    const start = new Date(startDate);
    const end = new Date(endDate);
@ -42,9 +42,8 @@ module.exports = (req, res, next) => {
        };
      }, { totalTicketsSold: 0, revenue: 0 });

-      const cinema = cinemas.find(cinema => cinema.id === session.cinemaId)
      return {
-        cinema_name: cinema ? cinema.name : "Неизвестно",
+        cinema_name: relevantOrders[0].sessions[0].cinema.name,
        current_ticket_date_time: session.dateTime,
        current_ticket_price: session.price,
        max_ticket_quantity: session.maxCount,