fix : api 변경사항 적용

Nexters · Feb 2, 2025 · d18a20b · d18a20b
1 parent ce5b5a6
commit d18a20b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/data/src/main/java/com/nexters/boolti/data/datasource/PopupDataSource.kt b/data/src/main/java/com/nexters/boolti/data/datasource/PopupDataSource.kt
@@ -16,7 +16,7 @@ internal class PopupDataSource @Inject constructor(
 ) {
     private val dataStore = context.dataStore
 
-    suspend fun getPopup(): PopupResponse = service.getPopup()
+    suspend fun getPopup(view: String): PopupResponse = service.getPopup(view)
 
     fun shouldShowEvent(id: String): Flow<Boolean> = dataStore.data.map {
         LocalDate.now() > (it.dateHidingEvent?.get(id)?.toLocalDate() ?: LocalDate.MIN)

diff --git a/data/src/main/java/com/nexters/boolti/data/network/api/PopupService.kt b/data/src/main/java/com/nexters/boolti/data/network/api/PopupService.kt
@@ -2,8 +2,9 @@ package com.nexters.boolti.data.network.api
 
 import com.nexters.boolti.data.network.response.PopupResponse
 import retrofit2.http.GET
+import retrofit2.http.Path
 
 internal interface PopupService {
-    @GET("/app/papi/v1/popup")
-    suspend fun getPopup(): PopupResponse
+    @GET("/app/papi/v1/popup/{view}")
+    suspend fun getPopup(@Path("view") view: String): PopupResponse
 }
diff --git a/data/src/main/java/com/nexters/boolti/data/repository/PopupRepositoryImpl.kt b/data/src/main/java/com/nexters/boolti/data/repository/PopupRepositoryImpl.kt
@@ -16,7 +16,7 @@ internal class PopupRepositoryImpl @Inject constructor(
         dataSource.hideEventToday(id)
     }
 
-    override fun getPopup() = flow {
-        emit(dataSource.getPopup().toDomain())
+    override fun getPopup(view: String) = flow {
+        emit(dataSource.getPopup(view).toDomain())
     }
 }
diff --git a/domain/src/main/java/com/nexters/boolti/domain/repository/PopupRepository.kt b/domain/src/main/java/com/nexters/boolti/domain/repository/PopupRepository.kt
@@ -6,5 +6,5 @@ import kotlinx.coroutines.flow.Flow
 interface PopupRepository {
     fun shouldShowEvent(id: String): Flow<Boolean>
     fun hideEventToday(id: String): Flow<Unit>
-    fun getPopup(): Flow<Popup>
+    fun getPopup(view: String): Flow<Popup>
 }
diff --git a/domain/src/main/java/com/nexters/boolti/domain/usecase/GetPopupUseCase.kt b/domain/src/main/java/com/nexters/boolti/domain/usecase/GetPopupUseCase.kt
@@ -12,8 +12,8 @@ import javax.inject.Singleton
 class GetPopupUseCase @Inject constructor(
     private val popupRepository: PopupRepository,
 ) {
-    operator fun invoke(): Flow<Popup> = popupRepository
-        .getPopup()
+    operator fun invoke(view: String): Flow<Popup> = popupRepository
+        .getPopup(view)
         .filter { popup ->
             popup is Popup.Notice || popupRepository.shouldShowEvent(popup.id).first()
         }

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/show/ShowViewModel.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/show/ShowViewModel.kt
@@ -70,7 +70,7 @@ class ShowViewModel @Inject constructor(
     }
 
     private fun fetchPopup() {
-        getPopupUseCase()
+        getPopupUseCase("HOME")
             .onEach { popup -> sendEvent(ShowEvent.ShowPopup(popup)) }
             .launchIn(viewModelScope + recordExceptionHandler)
     }