[feat/#23] 좌석 선택 뷰 repository 와 주입 정의

SOPT-all · Nov 28, 2024 · 43deceb · 43deceb
1 parent 47e0053
commit 43deceb
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 39 deletions.
diff --git a/...e/datasource/LeftSeatsRemoteDataSource.kt → ...emote/datasource/SeatsRemoteDataSource.kt b/...e/datasource/LeftSeatsRemoteDataSource.kt → ...emote/datasource/SeatsRemoteDataSource.kt
@@ -5,7 +5,7 @@ import com.sopt.korailtalk.data.remote.model.request.SeatSelectingRequestDto
 import com.sopt.korailtalk.data.remote.model.response.LeftSeatsResponseDto
 
 
-interface LeftSeatsRemoteDataSource {
+interface SeatsRemoteDataSource {
     suspend fun getLeftSeats(userId: Long, timetableId: Long): ApiResponse<LeftSeatsResponseDto>
     suspend fun selectSeat(seatSelectingRequestDto: SeatSelectingRequestDto): ApiResponse<Unit>
 }
diff --git a/...urceimpl/LeftSeatsRemoteDataSourceImpl.kt → ...tasourceimpl/SeatsRemoteDataSourceImpl.kt b/...urceimpl/LeftSeatsRemoteDataSourceImpl.kt → ...tasourceimpl/SeatsRemoteDataSourceImpl.kt
@@ -1,15 +1,13 @@
 package com.sopt.korailtalk.data.remote.datasourceimpl
 
-import com.sopt.korailtalk.data.remote.datasource.LeftSeatsRemoteDataSource
-import com.sopt.korailtalk.data.remote.model.base.ApiResponse
+import com.sopt.korailtalk.data.remote.datasource.SeatsRemoteDataSource
 import com.sopt.korailtalk.data.remote.model.request.SeatSelectingRequestDto
-import com.sopt.korailtalk.data.remote.model.response.LeftSeatsResponseDto
 import com.sopt.korailtalk.data.remote.service.SeatsService
 import javax.inject.Inject
 
-class LeftSeatsRemoteDataSourceImpl @Inject constructor(
+class SeatsRemoteDataSourceImpl @Inject constructor(
     private val seatsService: SeatsService
-) : LeftSeatsRemoteDataSource {
+) : SeatsRemoteDataSource {
     override suspend fun getLeftSeats(userId: Long, timetableId: Long) =
         seatsService.getSeats(userId, timetableId)
 

diff --git a/app/src/main/java/com/sopt/korailtalk/data/repositoryimpl/SeatsRepositoryImpl.kt b/app/src/main/java/com/sopt/korailtalk/data/repositoryimpl/SeatsRepositoryImpl.kt
@@ -0,0 +1,21 @@
+package com.sopt.korailtalk.data.repositoryimpl
+
+import com.sopt.korailtalk.data.remote.datasource.LeftSeatsRemoteDataSource
+import javax.inject.Inject
+
+class SeatsRepositoryImpl @Inject constructor(
+    private val seatsRemoteDataSource: LeftSeatsRemoteDataSource
+) : PaymentRepository {
+    override suspend fun getLpoint(userId: Long, pointPassword: Int): Result<LPoint> {
+        return runCatching {
+            paymentRemoteDataSource.getLpoint(userId = userId, pointPassword = pointPassword)
+                .handleApiResponse().getOrThrow().toDomain()
+        }
+    }
+
+    override suspend fun buyTicket(ticketBuying: TicketBuying): Result<Unit> {
+        return runCatching {
+            paymentRemoteDataSource.buyTicket(ticketBuyingRequestDto = ticketBuying.toData())
+        }
+    }
+}
diff --git a/app/src/main/java/com/sopt/korailtalk/di/DataSourceModule.kt b/app/src/main/java/com/sopt/korailtalk/di/DataSourceModule.kt
@@ -3,7 +3,9 @@ package com.sopt.korailtalk.di
 import com.sopt.korailtalk.data.local.datasource.ExampleLocalDataSource
 import com.sopt.korailtalk.data.local.datasourceimpl.ExampleLocalDataSourceImpl
 import com.sopt.korailtalk.data.remote.datasource.ExampleRemoteDataSource
+import com.sopt.korailtalk.data.remote.datasource.SeatsRemoteDataSource
 import com.sopt.korailtalk.data.remote.datasourceimpl.ExampleRemoteDataSourceImpl
+import com.sopt.korailtalk.data.remote.datasourceimpl.SeatsRemoteDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -24,4 +26,10 @@ abstract class DataSourceModule {
     abstract fun bindExampleRemoteDataSource(
         exampleRemoteDataSourceImpl: ExampleRemoteDataSourceImpl
     ): ExampleRemoteDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindSeatsRemoteDataSource(
+        seatsRemoteDataSourceImpl: SeatsRemoteDataSourceImpl
+    ): SeatsRemoteDataSource
 }
diff --git a/app/src/main/java/com/sopt/korailtalk/di/RepositoryModule.kt b/app/src/main/java/com/sopt/korailtalk/di/RepositoryModule.kt
@@ -1,7 +1,9 @@
 package com.sopt.korailtalk.di
 
 import com.sopt.korailtalk.data.repositoryimpl.ExampleRepositoryImpl
+import com.sopt.korailtalk.data.repositoryimpl.SeatsRepositoryImpl
 import com.sopt.korailtalk.domain.repository.ExampleRepository
+import com.sopt.korailtalk.domain.repository.SeatsRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -16,4 +18,10 @@ abstract class RepositoryModule {
     abstract fun bindExampleRepository(
         exampleRepositoryImpl: ExampleRepositoryImpl
     ): ExampleRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindSeatsRepository(
+        seatsRepositoryImpl: SeatsRepositoryImpl
+    ): SeatsRepository
 }
diff --git a/app/src/main/java/com/sopt/korailtalk/di/ServiceModule.kt b/app/src/main/java/com/sopt/korailtalk/di/ServiceModule.kt
@@ -1,6 +1,7 @@
 package com.sopt.korailtalk.di
 
 import com.sopt.korailtalk.data.remote.service.ExampleService
+import com.sopt.korailtalk.data.remote.service.SeatsService
 import com.sopt.korailtalk.di.qualifier.KorailTalk
 import dagger.Module
 import dagger.Provides
@@ -16,4 +17,9 @@ object ServiceModule {
     @Singleton
     fun provideExampleService(@KorailTalk retrofit: Retrofit): ExampleService =
         retrofit.create(ExampleService::class.java)
-}
+
+    @Provides
+    @Singleton
+    fun provideSeatsService(@KorailTalk retrofit: Retrofit): SeatsService =
+        retrofit.create(SeatsService::class.java)
+}
diff --git a/app/src/main/java/com/sopt/korailtalk/domain/model/SeatSelecting.kt b/app/src/main/java/com/sopt/korailtalk/domain/model/SeatSelecting.kt
@@ -1,6 +1,6 @@
 package com.sopt.korailtalk.domain.model
 
-data class SeatSelectingRequestDto(
+data class SeatSelecting(
     val isAuto: Boolean,
     val timetableId: Long,
     val coachId: Long,

diff --git a/app/src/main/java/com/sopt/korailtalk/domain/repository/SeatsRepository.kt b/app/src/main/java/com/sopt/korailtalk/domain/repository/SeatsRepository.kt
@@ -0,0 +1,9 @@
+package com.sopt.korailtalk.domain.repository
+
+import com.sopt.korailtalk.domain.model.LeftSeats
+import com.sopt.korailtalk.domain.model.SeatSelecting
+
+interface SeatsRepository {
+    suspend fun getLeftSeats(userId: Long, timetableId: Long): Result<LeftSeats>
+    suspend fun selectSeat(seatSelecting: SeatSelecting): Result<Unit>
+}
diff --git a/app/src/main/java/com/sopt/korailtalk/presentation/ui/main/MainActivity.kt b/app/src/main/java/com/sopt/korailtalk/presentation/ui/main/MainActivity.kt
@@ -14,6 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import com.sopt.korailtalk.presentation.ui.seatmap.SeatMapScreenPreview
+import com.sopt.korailtalk.presentation.ui.traincheck.TrainCheckScreenPreview
 import com.sopt.korailtalk.ui.theme.KorailTalkTheme
 import com.sopt.korailtalk.ui.theme.COLLAVORATIONANDROIDKORAILTALKTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -22,7 +24,6 @@ import dagger.hilt.android.AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
         setContent {
             COLLAVORATIONANDROIDKORAILTALKTheme {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
@@ -42,36 +43,7 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
         modifier = Modifier.fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
-        Column {
-            Text(
-                text = "$name!",
-                style = KorailTalkTheme.typography.head1.copy(
-                    color = KorailTalkTheme.colors.transparentBlue50
-                ),
-                modifier = modifier
-            )
-            Text(
-                text = "$name!",
-                style = KorailTalkTheme.typography.title1.copy(
-                    color = KorailTalkTheme.colors.blue01
-                ),
-                modifier = modifier
-            )
-            Text(
-                text = "$name!",
-                style = KorailTalkTheme.typography.body3.copy(
-                    color = KorailTalkTheme.colors.purple01
-                ),
-                modifier = modifier
-            )
-            Text(
-                text = "$name!",
-                style = KorailTalkTheme.typography.caption1.copy(
-                    color = KorailTalkTheme.colors.grey600
-                ),
-                modifier = modifier
-            )
-        }
+        TrainCheckScreenPreview()
 
     }
 }

diff --git a/app/src/main/java/com/sopt/korailtalk/presentation/ui/seatmap/LeftSeatsState.kt b/app/src/main/java/com/sopt/korailtalk/presentation/ui/seatmap/LeftSeatsState.kt
@@ -0,0 +1,10 @@
+package com.sopt.korailtalk.presentation.ui.seatmap
+
+import com.sopt.korailtalk.domain.model.LeftSeats
+
+sealed class LeftSeatsState {
+    data object Idle: LeftSeatsState()
+    data object Loading: LeftSeatsState()
+    data class Success(val data: LeftSeats): LeftSeatsState()
+    data class Failure(val message: String): LeftSeatsState()
+}