[feat] #172 popup

core/designsystem/src/main/res/values/strings.xml

@@ -155,6 +155,11 @@
   <string name="home_user_clip">님의 클립</string>
   <string name="home_this_week_link">이주의 링크</string>
   <string name="home_this_week_recommend">이주의 추천 사이트</string>
+  <string name="home_survey_title">1분 설문조사 참여하고\n스타벅스 기프티콘 받기</string>
+  <string name="home_survey_subtitle">토스터 사용 피드백을 남겨주시면\n추첨을 통해 기프티콘을 드려요!</string>
+  <string name="home_survey_button">참여하기</string>
+  <string name="home_survey_skip"><u>일주일간 보지 않기</u></string>
+
 
   <!-- error -->
   <string name="error_clip_length">클립의 이름은 최대 15자까지 입력 가능해요</string>

core/model/src/main/java/org/sopt/model/home/PopupInfo.kt

@@ -0,0 +1,9 @@
+package org.sopt.model.home
+
+data class PopupInfo(
+  val popupId: Int,
+  val popupImage: String,
+  val popupActiveStartDate: String,
+  val popupActiveEndDate: String,
+  val popupLinkUrl: String,
+)

core/model/src/main/java/org/sopt/model/home/PopupInvisible.kt

@@ -0,0 +1,6 @@
+package org.sopt.model.home
+
+data class PopupInvisible(
+  val popupId: Int,
+  val popupHideUntil: String,
+)

data-remote/home/src/main/java/org/sopt/remote/home/api/PopupService.kt

@@ -0,0 +1,25 @@
+package org.sopt.remote.home.api
+
+import org.sopt.network.model.response.base.BaseResponse
+import org.sopt.remote.home.request.RequestPopupInvisibleDto
+import org.sopt.remote.home.response.ResponsePopupInfoDto
+import org.sopt.remote.home.response.ResponsePopupInvisibleDto
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+
+interface PopupService {
+  companion object {
+    const val API = "api"
+    const val V2 = "v2"
+    const val POPUP = "popup"
+  }
+
+  @PATCH("/$API/$V2/$POPUP")
+  suspend fun patchPopupInvisible(
+    @Body requestPopupInvisibleDto: RequestPopupInvisibleDto,
+  ): BaseResponse<ResponsePopupInvisibleDto>
+
+  @GET("/$API/$V2/$POPUP")
+  suspend fun getPopupInfo(): BaseResponse<ResponsePopupInfoDto>
+}

data-remote/home/src/main/java/org/sopt/remote/home/datasource/RemotePopupDatasourceImpl.kt

@@ -0,0 +1,19 @@
+package org.sopt.remote.home.datasource
+
+import org.sopt.home.datasource.RemotePopupDataSource
+import org.sopt.model.home.PopupInfo
+import org.sopt.model.home.PopupInvisible
+import org.sopt.remote.home.api.PopupService
+import org.sopt.remote.home.request.RequestPopupInvisibleDto
+import org.sopt.remote.home.response.toCoreModel
+import javax.inject.Inject
+
+class RemotePopupDatasourceImpl @Inject constructor(
+  private val popupService: PopupService,
+) : RemotePopupDataSource {
+  override suspend fun patchPopupInvisible(popupId: Long, hideDate: Long): PopupInvisible =
+    popupService.patchPopupInvisible(RequestPopupInvisibleDto(popupId, hideDate)).data!!.toCoreModel()
+
+  override suspend fun getPopupInfo(): List<PopupInfo> =
+    popupService.getPopupInfo().data!!.popupList.map { it.toCoreModel() }
+}

data-remote/home/src/main/java/org/sopt/remote/home/di/HomeDataSourceModule.kt

@@ -5,7 +5,9 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.sopt.home.datasource.RemoteHomeDataSource
+import org.sopt.home.datasource.RemotePopupDataSource
 import org.sopt.remote.home.datasource.RemoteHomeDataSourceImpl
+import org.sopt.remote.home.datasource.RemotePopupDatasourceImpl
 import javax.inject.Singleton
 
 @Module
@@ -16,4 +18,10 @@ abstract class HomeDataSourceModule {
   abstract fun bindRemoteHomeDatasource(
     remoteHomeDataSourceImpl: RemoteHomeDataSourceImpl,
   ): RemoteHomeDataSource
+
+  @Singleton
+  @Binds
+  abstract fun bindRemotePopupDataSource(
+    remotePopupDataSourceImpl: RemotePopupDatasourceImpl,
+  ): RemotePopupDataSource
 }

data-remote/home/src/main/java/org/sopt/remote/home/di/HomeServiceModule.kt

@@ -6,8 +6,10 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.sopt.network.di.AuthLinkMindRetrofit
 import org.sopt.remote.home.api.HomeService
+import org.sopt.remote.home.api.PopupService
 import retrofit2.Retrofit
 import javax.inject.Singleton
+
 @Module
 @InstallIn(SingletonComponent::class)
 object HomeServiceModule {
@@ -16,4 +18,9 @@ object HomeServiceModule {
   @Provides
   fun provideHomeService(@AuthLinkMindRetrofit retrofit: Retrofit): HomeService =
     retrofit.create(HomeService::class.java)
+
+  @Singleton
+  @Provides
+  fun providePopupService(@AuthLinkMindRetrofit retrofit: Retrofit): PopupService =
+    retrofit.create(PopupService::class.java)
 }

data-remote/home/src/main/java/org/sopt/remote/home/request/RequestPopupInvisibleDto.kt

@@ -0,0 +1,12 @@
+package org.sopt.remote.home.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestPopupInvisibleDto(
+  @SerialName("popupId")
+  val popupId: Long,
+  @SerialName("hideDate")
+  val hideDate: Long,
+)

data-remote/home/src/main/java/org/sopt/remote/home/response/ResponsePopupInfoDto.kt

@@ -0,0 +1,37 @@
+package org.sopt.remote.home.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.model.home.PopupInfo
+
+@Serializable
+data class ResponsePopupInfoDto(
+  @SerialName("popupList")
+  val popupList: List<ResponsePopupInfo>,
+)
+
+@Serializable
+data class ResponsePopupInfo(
+  @SerialName("id")
+  val id: Int,
+  @SerialName("image")
+  val image: String,
+  @SerialName("activeStartDate")
+  val activeStartDate: String,
+  @SerialName("activeEndDate")
+  val activeEndDate: String,
+  @SerialName("linkUrl")
+  val linkUrl: String,
+)
+
+internal fun ResponsePopupInfoDto.toCoreModel() = popupList.map {
+  it.toCoreModel()
+}
+
+internal fun ResponsePopupInfo.toCoreModel() = PopupInfo(
+  popupId = id,
+  popupImage = image,
+  popupActiveStartDate = activeStartDate,
+  popupActiveEndDate = activeEndDate,
+  popupLinkUrl = linkUrl,
+)

data-remote/home/src/main/java/org/sopt/remote/home/response/ResponsePopupInvisibleDto.kt

@@ -0,0 +1,18 @@
+package org.sopt.remote.home.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.model.home.PopupInvisible
+
+@Serializable
+data class ResponsePopupInvisibleDto(
+  @SerialName("popupId")
+  val popupId: Int,
+  @SerialName("hideUntil")
+  val hideUntil: String,
+)
+
+internal fun ResponsePopupInvisibleDto.toCoreModel() = PopupInvisible(
+  popupId = popupId,
+  popupHideUntil = hideUntil,
+)

data/home/src/main/java/org/sopt/home/datasource/RemotePopupDataSource.kt

@@ -0,0 +1,9 @@
+package org.sopt.home.datasource
+
+import org.sopt.model.home.PopupInfo
+import org.sopt.model.home.PopupInvisible
+
+interface RemotePopupDataSource {
+  suspend fun patchPopupInvisible(popupId: Long, hideDate: Long): PopupInvisible
+  suspend fun getPopupInfo(): List<PopupInfo>
+}

data/home/src/main/java/org/sopt/home/di/RepositoryModule.kt

@@ -6,6 +6,8 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import org.sopt.home.repository.HomeRepoImpl
 import org.sopt.home.repository.HomeRepository
+import org.sopt.home.repository.PopupRepoImpl
+import org.sopt.home.repository.PopupRepository
 import javax.inject.Singleton
 
 @Module
@@ -16,4 +18,10 @@ abstract class RepositoryModule {
   abstract fun bindHomeRepository(
     homeRepoImpl: HomeRepoImpl,
   ): HomeRepository
+
+  @Singleton
+  @Binds
+  abstract fun bindPopupRepository(
+    popupRepoImpl: PopupRepoImpl,
+  ): PopupRepository
 }

data/home/src/main/java/org/sopt/home/repository/PopupRepoImpl.kt

@@ -0,0 +1,16 @@
+package org.sopt.home.repository
+
+import org.sopt.home.datasource.RemotePopupDataSource
+import org.sopt.model.home.PopupInfo
+import org.sopt.model.home.PopupInvisible
+import javax.inject.Inject
+
+class PopupRepoImpl @Inject constructor(
+  private val remotePopupDataSource: RemotePopupDataSource,
+) : PopupRepository {
+  override suspend fun patchPopupInvisible(popupId: Long, hideDate: Long): Result<PopupInvisible> =
+    runCatching { remotePopupDataSource.patchPopupInvisible(popupId, hideDate) }
+
+  override suspend fun getPopupInfo(): Result<List<PopupInfo>> =
+    runCatching { remotePopupDataSource.getPopupInfo() }
+}

domain/home/src/main/java/org/sopt/home/repository/PopupRepository.kt

@@ -0,0 +1,9 @@
+package org.sopt.home.repository
+
+import org.sopt.model.home.PopupInfo
+import org.sopt.model.home.PopupInvisible
+
+interface PopupRepository {
+  suspend fun patchPopupInvisible(popupId: Long, hideDate: Long): Result<PopupInvisible>
+  suspend fun getPopupInfo(): Result<List<PopupInfo>>
+}

domain/home/src/main/java/org/sopt/home/usecase/GetPopupInfo.kt

@@ -0,0 +1,11 @@
+package org.sopt.home.usecase
+
+import org.sopt.home.repository.PopupRepository
+import org.sopt.model.home.PopupInfo
+import javax.inject.Inject
+
+class GetPopupInfo @Inject constructor(
+  private val popupRepository: PopupRepository,
+) {
+  suspend operator fun invoke(): Result<List<PopupInfo>> = popupRepository.getPopupInfo()
+}

domain/home/src/main/java/org/sopt/home/usecase/PatchPopupInvisible.kt

@@ -0,0 +1,12 @@
+package org.sopt.home.usecase
+
+import org.sopt.home.repository.PopupRepository
+import org.sopt.model.home.PopupInvisible
+import javax.inject.Inject
+
+class PatchPopupInvisible @Inject constructor(
+  private val popupRepository: PopupRepository,
+) {
+  suspend operator fun invoke(popupId: Long, hideDate: Long): Result<PopupInvisible> =
+    popupRepository.patchPopupInvisible(popupId, hideDate)
+}

feature/home/src/main/java/org/sopt/home/HomeContract.kt

@@ -1,6 +1,7 @@
 package org.sopt.home
 
 import org.sopt.model.category.Category
+import org.sopt.model.home.PopupInfo
 import org.sopt.model.home.RecommendLink
 import org.sopt.model.home.WeekBestLink
 
@@ -14,6 +15,7 @@ data class HomeState(
   val url: String = "",
   val categoryId: Long? = 0,
   val categoryName: String? = "전체 클립",
+  val popupList: List<PopupInfo> = emptyList(),
 ) {
   fun calculateProgress(): Int {
     if (readToastNum > allToastNum) return 0
@@ -31,4 +33,5 @@ sealed interface HomeSideEffect {
   data object NavigateClipLink : HomeSideEffect
   data object NavigateWebView : HomeSideEffect
   data object ShowBottomSheet : HomeSideEffect
+  data object ShowPopupInfo : HomeSideEffect
 }

feature/home/src/main/java/org/sopt/home/HomeFragment.kt

@@ -14,6 +14,7 @@ import org.sopt.home.adapter.HomeWeekLinkAdapter
 import org.sopt.home.adapter.HomeWeekRecommendLinkAdapter
 import org.sopt.home.adapter.ItemDecoration
 import org.sopt.home.databinding.FragmentHomeBinding
+import org.sopt.model.home.PopupInfo
 import org.sopt.ui.base.BindingFragment
 import org.sopt.ui.nav.DeepLinkUtil
 import org.sopt.ui.view.onThrottleClick
@@ -62,13 +63,16 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
       is HomeSideEffect.NavigateClipLink -> navigateToDestination(
         "featureSaveLink://ClipLinkFragment/${viewModel.container.stateFlow.value.categoryId}/${viewModel.container.stateFlow.value.categoryName}",
       )
+
       is HomeSideEffect.ShowBottomSheet -> showHomeBottomSheet()
       is HomeSideEffect.NavigateWebView -> {
         val encodedURL = URLEncoder.encode(viewModel.container.stateFlow.value.url, StandardCharsets.UTF_8.toString())
         navigateToDestination(
           "featureSaveLink://webViewFragment/${0}/${false}/${false}/$encodedURL",
         )
       }
+
+      is HomeSideEffect.ShowPopupInfo -> showPopupInfo(viewModel.container.stateFlow.value.popupList)
     }
   }
 
@@ -80,8 +84,10 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
       getMainPageUserClip()
       getRecommendSite()
       getWeekBestLink()
+      getPopupListInfo()
     }
   }
+
   private fun navigateToSetting() {
     binding.ivHomeSetting.onThrottleClick {
       viewModel.navigateSetting()
@@ -154,4 +160,18 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
       }
     }
   }
+
+  private fun showPopupInfo(popupList: List<PopupInfo>) {
+    popupList.forEach {
+      if (viewModel.checkPopupDate(it.popupActiveStartDate, it.popupActiveEndDate)
+      ) {
+        val surveyDialog = SurveyDialogFragment.newInstance(
+          it.popupImage,
+          { viewModel.navigateWebview(it.popupLinkUrl) },
+          { viewModel.patchPopupInvisible(it.popupId.toLong(), 7) },
+        )
+        surveyDialog.show(parentFragmentManager, this.tag)
+      }
+    }
+  }
 }