Коммит 29c75771 создал по автору Radch-enko's avatar Radch-enko
Просмотр файлов

Refactor: modularize fast booking feature and relocate DeleteBookingUseCase 

- Moved `DeleteBookingUseCase` to `core/domain` module for better reuse across features.
- Extracted `FastEvent` logic into a new `fastBooking` module with dedicated DI setup and updated dependencies.
- Renamed `FastEventComponent` to `FastBookingComponent` for improved clarity and consistency.
- Updated references and file paths for `FastEvent` to align with the new `fastBooking` module.
- Adjusted Gradle and DI configurations to support the modularized `fastBooking` feature.
владелец 4f99cc15
Скрыть пробелы
Построчно Рядом
clients/tablet/composeApp/build.gradle.kts
Просмотр файла @ 29c75771
......@@ -47,6 +47,7 @@ kotlin {
implementation(project(":clients:tablet:feature:main"))
implementation(project(":clients:tablet:feature:settings"))
implementation(project(":clients:tablet:feature:bookingEditor"))
implementation(project(":clients:tablet:feature:fastBooking"))
implementation(project(":clients:tablet:core:data"))
implementation(project(":clients:tablet:core:domain"))
......
clients/tablet/core/domain/src/commonMain/kotlin/band/effective/office/tablet/core/domain/di/domainModule.kt
Просмотр файла @ 29c75771
......@@ -3,6 +3,7 @@ package band.effective.office.tablet.core.domain.di
import band.effective.office.tablet.core.domain.useCase.CheckBookingUseCase
import band.effective.office.tablet.core.domain.useCase.CheckSettingsUseCase
import band.effective.office.tablet.core.domain.useCase.CreateBookingUseCase
import band.effective.office.tablet.core.domain.useCase.DeleteBookingUseCase
import band.effective.office.tablet.core.domain.useCase.OrganizersInfoUseCase
import band.effective.office.tablet.core.domain.useCase.RoomInfoUseCase
import band.effective.office.tablet.core.domain.useCase.SelectRoomUseCase
......@@ -27,4 +28,5 @@ val domainModule = module {
single { CreateBookingUseCase(get()) }
single { UpdateBookingUseCase(get()) }
single { DeleteBookingUseCase(get()) }
}
\ Нет новой строки в конце файла
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/domain/DeleteBookingUseCase.kt → clients/tablet/core/domain/src/commonMain/kotlin/band/effective/office/tablet/core/domain/useCase/DeleteBookingUseCase.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.domain
package band.effective.office.tablet.core.domain.useCase
import band.effective.office.tablet.core.domain.model.EventInfo
import band.effective.office.tablet.core.domain.repository.EventManagerRepository
......
clients/tablet/feature/fastbooking/build.gradle.kts 0 → 100644
Просмотр файла @ 29c75771
plugins {
id("band.effective.office.client.kmp.feature")
}
compose.resources {
publicResClass = false
packageOfResClass = "band.effective.office.tablet.feature.fastBooking"
generateResClass = auto
}
\ Нет новой строки в конце файла
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/fastevent/FastEventView.kt → clients/tablet/feature/fastbooking/src/commonMain/kotlin/band/effective/office/tablet/feature/fastBooking/presentation/FastBooking.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.presentation.fastevent
package band.effective.office.tablet.feature.fastBooking.presentation
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
......@@ -34,7 +34,7 @@ import band.effective.office.tablet.core.ui.common.SuccessFastSelectRoomView
import com.arkivanov.decompose.extensions.compose.stack.Children
@Composable
fun FastEventView(component: FastEventComponent) {
fun FastBooking(component: FastBookingComponent) {
val state by component.state.collectAsState()
val timeFormat = remember { timeFormatter }
......@@ -42,7 +42,7 @@ fun FastEventView(component: FastEventComponent) {
Dialog(
onDismissRequest = { component.sendIntent(Intent.OnCloseWindowRequest) },
properties = DialogProperties(
usePlatformDefaultWidth = modal.instance != FastEventComponent.ModalConfig.LoadingModal
usePlatformDefaultWidth = modal.instance != FastBookingComponent.ModalConfig.LoadingModal
)
) {
Column(
......@@ -61,17 +61,17 @@ fun FastEventView(component: FastEventComponent) {
verticalAlignment = Alignment.CenterVertically
) {
when (val modalInstance = modal.instance) {
FastEventComponent.ModalConfig.LoadingModal -> FastEventView(
FastBookingComponent.ModalConfig.LoadingModal -> FastBooking(
onDismissRequest = { component.sendIntent(Intent.OnCloseWindowRequest) }
)
is FastEventComponent.ModalConfig.FailureModal -> FailureFastSelectRoomView(
is FastBookingComponent.ModalConfig.FailureModal -> FailureFastSelectRoomView(
onDismissRequest = { component.sendIntent(Intent.OnCloseWindowRequest) },
minutes = state.minutesLeft,
room = modalInstance.room
)
is FastEventComponent.ModalConfig.SuccessModal -> SuccessFastSelectRoomView(
is FastBookingComponent.ModalConfig.SuccessModal -> SuccessFastSelectRoomView(
roomName = modalInstance.room,
finishTime = modalInstance.eventInfo.finishTime,
close = { component.sendIntent(Intent.OnCloseWindowRequest) },
......@@ -86,7 +86,7 @@ fun FastEventView(component: FastEventComponent) {
}
@Composable
private fun FastEventView(
private fun FastBooking(
onDismissRequest: () -> Unit
) {
Box(contentAlignment = Alignment.Center) {
......
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/fastevent/FastEventComponent.kt → clients/tablet/feature/fastbooking/src/commonMain/kotlin/band/effective/office/tablet/feature/fastBooking/presentation/FastBookingComponent.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.presentation.fastevent
package band.effective.office.tablet.feature.fastBooking.presentation
import band.effective.office.tablet.core.domain.Either
import band.effective.office.tablet.core.domain.model.EventInfo
import band.effective.office.tablet.core.domain.model.RoomInfo
import band.effective.office.tablet.core.domain.useCase.CreateBookingUseCase
import band.effective.office.tablet.core.domain.useCase.DeleteBookingUseCase
import band.effective.office.tablet.core.domain.useCase.SelectRoomUseCase
import band.effective.office.tablet.core.domain.useCase.TimerUseCase
import band.effective.office.tablet.core.domain.util.BootstrapperTimer
......@@ -12,8 +14,6 @@ import band.effective.office.tablet.core.domain.util.currentInstant
import band.effective.office.tablet.core.domain.util.currentLocalDateTime
import band.effective.office.tablet.core.ui.common.ModalWindow
import band.effective.office.tablet.core.ui.utils.componentCoroutineScope
import band.effective.office.tablet.core.domain.useCase.CreateBookingUseCase
import band.effective.office.tablet.feature.main.domain.DeleteBookingUseCase
import com.arkivanov.decompose.ComponentContext
import com.arkivanov.decompose.router.stack.StackNavigation
import com.arkivanov.decompose.router.stack.childStack
......@@ -29,7 +29,7 @@ import kotlinx.serialization.Serializable
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
class FastEventComponent(
class FastBookingComponent(
private val componentContext: ComponentContext,
val minEventDuration: Int,
val selectedRoom: RoomInfo,
......
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/fastevent/Intent.kt → clients/tablet/feature/fastbooking/src/commonMain/kotlin/band/effective/office/tablet/feature/fastBooking/presentation/Intent.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.presentation.fastevent
package band.effective.office.tablet.feature.fastBooking.presentation
sealed interface Intent {
data class OnFreeSelectRequest(val room: String) : Intent
......
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/fastevent/State.kt → clients/tablet/feature/fastbooking/src/commonMain/kotlin/band/effective/office/tablet/feature/fastBooking/presentation/State.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.presentation.fastevent
package band.effective.office.tablet.feature.fastBooking.presentation
import band.effective.office.tablet.core.domain.model.EventInfo
import band.effective.office.tablet.core.domain.util.currentLocalDateTime
......
clients/tablet/feature/main/build.gradle.kts
Просмотр файла @ 29c75771
......@@ -6,6 +6,7 @@ kotlin {
sourceSets {
commonMain.dependencies {
implementation(project(":clients:tablet:feature:bookingEditor"))
implementation(project(":clients:tablet:feature:fastBooking"))
}
}
}
......
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/di/MainScreenModule.kt
Просмотр файла @ 29c75771
package band.effective.office.tablet.feature.main.di
import band.effective.office.tablet.feature.main.domain.DeleteBookingUseCase
import band.effective.office.tablet.core.domain.useCase.DeleteBookingUseCase
import band.effective.office.tablet.feature.main.domain.FreeUpRoomUseCase
import band.effective.office.tablet.feature.main.domain.GetRoomIndexUseCase
import band.effective.office.tablet.feature.main.domain.GetSlotsByRoomUseCase
......@@ -13,6 +13,5 @@ val mainScreenModule = module {
single { GetTimeToNextEventUseCase() }
single { GetSlotsByRoomUseCase(get()) }
single { FreeUpRoomUseCase(get()) }
single { DeleteBookingUseCase(get()) }
single { SlotUiMapper() }
}
\ Нет новой строки в конце файла
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/main/MainComponent.kt
Просмотр файла @ 29c75771
......@@ -14,16 +14,16 @@ import band.effective.office.tablet.core.domain.util.minus
import band.effective.office.tablet.core.domain.util.plus
import band.effective.office.tablet.core.ui.common.ModalWindow
import band.effective.office.tablet.core.ui.utils.componentCoroutineScope
import band.effective.office.tablet.feature.main.domain.DeleteBookingUseCase
import band.effective.office.tablet.core.domain.useCase.DeleteBookingUseCase
import band.effective.office.tablet.feature.main.domain.FreeUpRoomUseCase
import band.effective.office.tablet.feature.main.domain.GetRoomIndexUseCase
import band.effective.office.tablet.feature.main.domain.GetTimeToNextEventUseCase
import band.effective.office.tablet.feature.main.presentation.fastevent.FastEventComponent
import band.effective.office.tablet.feature.main.presentation.freeuproom.FreeSelectRoomComponent
import band.effective.office.tablet.feature.main.presentation.main.navigation.ModalWindowsConfig
import band.effective.office.tablet.feature.main.presentation.slot.SlotComponent
import band.effective.office.tablet.feature.main.presentation.slot.SlotIntent
import band.effective.office.tablet.feature.bookingEditor.presentation.BookingEditorComponent
import band.effective.office.tablet.feature.fastBooking.presentation.FastBookingComponent
import com.arkivanov.decompose.ComponentContext
import com.arkivanov.decompose.router.slot.SlotNavigation
import com.arkivanov.decompose.router.slot.activate
......@@ -230,7 +230,7 @@ class MainComponent(
onCloseRequest = navigation::dismiss,
)
is ModalWindowsConfig.FastEvent -> FastEventComponent(
is ModalWindowsConfig.FastEvent -> FastBookingComponent(
componentContext = componentContext,
minEventDuration = modalWindows.minEventDuration,
selectedRoom = modalWindows.selectedRoom,
......
clients/tablet/feature/main/src/commonMain/kotlin/band/effective/office/tablet/feature/main/presentation/main/MainScreen.kt
Просмотр файла @ 29c75771
......@@ -14,12 +14,12 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import band.effective.office.tablet.core.ui.LoadMainScreen
import band.effective.office.tablet.core.ui.common.ErrorMainScreen
import band.effective.office.tablet.feature.main.presentation.fastevent.FastEventComponent
import band.effective.office.tablet.feature.main.presentation.fastevent.FastEventView
import band.effective.office.tablet.feature.bookingEditor.presentation.BookingEditor
import band.effective.office.tablet.feature.bookingEditor.presentation.BookingEditorComponent
import band.effective.office.tablet.feature.fastBooking.presentation.FastBooking
import band.effective.office.tablet.feature.fastBooking.presentation.FastBookingComponent
import band.effective.office.tablet.feature.main.presentation.freeuproom.FreeSelectRoomComponent
import band.effective.office.tablet.feature.main.presentation.freeuproom.FreeSelectRoomView
import band.effective.office.tablet.feature.bookingEditor.presentation.BookingEditorComponent
import band.effective.office.tablet.feature.bookingEditor.presentation.BookingEditor
import com.arkivanov.decompose.extensions.compose.subscribeAsState
import kotlin.time.ExperimentalTime
......@@ -73,7 +73,7 @@ fun MainScreen(component: MainComponent) {
when (val activeComponent = activeWindowSlot.child?.instance) {
is FreeSelectRoomComponent -> FreeSelectRoomView(freeSelectRoomComponent = activeComponent)
is BookingEditorComponent -> BookingEditor(component = activeComponent)
is FastEventComponent -> FastEventView(component = activeComponent)
is FastBookingComponent -> FastBooking(component = activeComponent)
}
}
}
settings.gradle.kts
Просмотр файла @ 29c75771
......@@ -47,4 +47,5 @@ include(
"clients:tablet:feature:main",
"clients:tablet:feature:settings",
"clients:tablet:feature:bookingEditor",
"clients:tablet:feature:fastBooking",
)
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать