배경화면 커스텀

data/src/main/java/com/nextroom/nextroom/data/datasource/SettingDataSource.kt

@@ -105,6 +105,22 @@ class SettingDataSource @Inject constructor(
         data.first().userEmail
     }
 
+    fun setRecommendBackgroundCustomDialogHidden(time: Long) = runBlocking {
+        dataStore.updateData { it.copy(backgroundCustomDialogHideUntil = time) }
+    }
+
+    fun getRecommendBackgroundCustomDialogHiddenUntil() = runBlocking {
+        data.first().backgroundCustomDialogHideUntil
+    }
+
+    fun getBackgroundSettingsNoticeShown() = runBlocking {
+        data.first().backgroundSettingsNoticeShown
+    }
+
+    fun updateBackgroundSettingsShown() = runBlocking {
+        dataStore.updateData { it.copy(backgroundSettingsNoticeShown = true) }
+    }
+
     suspend fun saveAppPassword(password: String) {
         dataStore.updateData {
             it.copy(appPassword = password)

data/src/main/java/com/nextroom/nextroom/data/datasource/SubscriptionDataSource.kt

@@ -3,6 +3,7 @@ package com.nextroom.nextroom.data.datasource
 import com.nextroom.nextroom.data.network.ApiService
 import com.nextroom.nextroom.domain.model.Mypage
 import com.nextroom.nextroom.domain.model.Result
+import com.nextroom.nextroom.domain.model.SubscriptionPlan
 import com.nextroom.nextroom.domain.model.Ticket
 import com.nextroom.nextroom.domain.model.UserSubscribeStatus
 import com.nextroom.nextroom.domain.model.mapOnSuccess
@@ -24,4 +25,8 @@ class SubscriptionDataSource @Inject constructor(
     suspend fun getTicketInfo(): Result<Ticket> {
         return apiService.getSubscriptionTicketInfo().mapOnSuccess { it.data.toDomainModel() }
     }
+
+    suspend fun getSubscriptionPlan(): Result<SubscriptionPlan> {
+        return apiService.getSubscriptionPlan().mapOnSuccess { it.data.toDomainModel() }
+    }
 }

data/src/main/java/com/nextroom/nextroom/data/datasource/ThemeLocalDataSource.kt

@@ -41,6 +41,10 @@ class ThemeLocalDataSource @Inject constructor(
         }
     }
 
+    suspend fun isThemeExist(themeId: Int): Boolean {
+        return themeDao.isThemeExist(themeId)
+    }
+
     suspend fun getUpdatedInfo(themeId: Int): Long {
         return themeTimeDao.getTimeInfo(themeId)?.recentUpdated ?: 0L
     }

data/src/main/java/com/nextroom/nextroom/data/datasource/ThemeRemoteDataSource.kt

@@ -1,5 +1,6 @@
 package com.nextroom.nextroom.data.datasource
 
+import com.nextroom.nextroom.data.model.ThemeBackgroundActivationId
 import com.nextroom.nextroom.data.network.ApiService
 import com.nextroom.nextroom.data.network.response.toDomain
 import com.nextroom.nextroom.domain.model.Result
@@ -15,4 +16,8 @@ class ThemeRemoteDataSource @Inject constructor(
         return apiService.getThemes()
             .mapOnSuccess { it.data.toDomain() }
     }
+
+    suspend fun putActiveThemeBackgroundImage(themeBackgroundActivationId: ThemeBackgroundActivationId): Result<Unit> {
+        return apiService.putActiveThemeBackgroundImage(themeBackgroundActivationId)
+    }
 }

data/src/main/java/com/nextroom/nextroom/data/db/AppSettings.kt

@@ -14,6 +14,8 @@ data class AppSettings(
     val lastLaunchDate: Long = 0L,
     val emailSaveChecked: Boolean = false,
     val userEmail: String = "",
+    val backgroundCustomDialogHideUntil: Long = 0L,
+    val backgroundSettingsNoticeShown: Boolean = false,
     val networkDisconnectedCount: Int = 0,
     val appPassword: String = "",
 )

data/src/main/java/com/nextroom/nextroom/data/db/NextRoomDatabase.kt

@@ -12,7 +12,7 @@ import com.nextroom.nextroom.data.model.ThemeTimeEntity
 
 @Database(
     entities = [ThemeEntity::class, ThemeTimeEntity::class, HintEntity::class, GameStateEntity::class, GameStatsEntity::class, HintStatsEntity::class],
-    version = 5,
+    version = 7,
 )
 @TypeConverters(TypeConverter::class)
 abstract class NextRoomDatabase : RoomDatabase() {

data/src/main/java/com/nextroom/nextroom/data/db/ThemeDao.kt

@@ -17,6 +17,9 @@ interface ThemeDao {
     @Query("SELECT * FROM $THEME_TABLE_NAME WHERE themeId = :themeId LIMIT 1")
     fun getTheme(themeId: Int): Flow<ThemeEntity>
 
+    @Query("SELECT EXISTS(SELECT * FROM $THEME_TABLE_NAME WHERE themeId = :themeId)")
+    suspend fun isThemeExist(themeId : Int) : Boolean
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertThemes(vararg themes: ThemeEntity)
 

data/src/main/java/com/nextroom/nextroom/data/db/TypeConverter.kt

@@ -3,6 +3,7 @@ package com.nextroom.nextroom.data.db
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.nextroom.nextroom.domain.model.ThemeImageCustomInfo
 import java.lang.reflect.Type
 
 
@@ -27,4 +28,16 @@ class TypeConverter {
     fun listToJson(list: List<String?>?): String {
         return Gson().toJson(list)
     }
+
+    @TypeConverter
+    fun themeImageCustomInfoToJson(themeImageCustomInfo: ThemeImageCustomInfo?): String? {
+        if (themeImageCustomInfo == null) return null
+        return Gson().toJson(themeImageCustomInfo)
+    }
+
+    @TypeConverter
+    fun jsonToThemeImageCustomInfo(json: String?): ThemeImageCustomInfo? {
+        if (json == null) return null
+        return Gson().fromJson(json, ThemeImageCustomInfo::class.java)
+    }
 }

data/src/main/java/com/nextroom/nextroom/data/model/GameStateEntity.kt

@@ -5,6 +5,7 @@ import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.nextroom.nextroom.data.model.GameStateEntity.Companion.GAME_STATE_TABLE
 import com.nextroom.nextroom.domain.model.GameState
+import com.nextroom.nextroom.domain.model.ThemeImageCustomInfo
 
 @Entity(
     tableName = GAME_STATE_TABLE,
@@ -23,6 +24,8 @@ data class GameStateEntity(
     val hintLimit: Int,
     val usedHints: Set<Int>,
     val startTime: Long, // 게임을 시작한 시간
+    val themeImageUrl: String? = null,
+    val themeImageCustomInfo: ThemeImageCustomInfo? = null,
 ) {
     companion object {
         const val GAME_STATE_TABLE = "GameState"
@@ -38,5 +41,7 @@ fun GameStateEntity.toDomain(): GameState {
         hintLimit = hintLimit,
         usedHints = usedHints,
         startTime = startTime,
+        themeImageUrl = themeImageUrl,
+        themeImageCustomInfo = themeImageCustomInfo
     )
 }

data/src/main/java/com/nextroom/nextroom/data/model/ThemeBackgroundActivationId.kt

@@ -0,0 +1,10 @@
+package com.nextroom.nextroom.data.model
+
+import com.google.gson.annotations.SerializedName
+
+data class ThemeBackgroundActivationId(
+    @SerializedName("active")
+    val activate: List<Int>,
+    @SerializedName("deactive")
+    val deactivate: List<Int>
+)

data/src/main/java/com/nextroom/nextroom/data/model/ThemeEntity.kt

@@ -4,6 +4,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.nextroom.nextroom.data.model.ThemeEntity.Companion.THEME_TABLE_NAME
 import com.nextroom.nextroom.domain.model.Hint
+import com.nextroom.nextroom.domain.model.ThemeImageCustomInfo
 import com.nextroom.nextroom.domain.model.ThemeInfo
 
 @Entity(tableName = THEME_TABLE_NAME)
@@ -13,6 +14,9 @@ data class ThemeEntity(
     val title: String = "",
     val timeLimitInMinute: Int = 60,
     val hintLimit: Int = -1,
+    val useTimerUrl: Boolean = false,
+    val themeImageUrl: String? = null,
+    val themeImageCustomInfo: ThemeImageCustomInfo? = null
 ) {
     companion object {
         const val THEME_TABLE_NAME = "Theme"
@@ -26,6 +30,9 @@ fun ThemeEntity.toDomain(hints: List<Hint> = emptyList()): ThemeInfo {
         timeLimitInMinute = timeLimitInMinute,
         hintLimit = hintLimit,
         hints = hints,
+        useTimerUrl = useTimerUrl,
+        themeImageUrl = themeImageUrl,
+        themeImageCustomInfo = themeImageCustomInfo
     )
 }
 
@@ -40,6 +47,9 @@ fun ThemeInfo.toEntity(adminCode: String): ThemeEntity {
         title = title,
         timeLimitInMinute = timeLimitInMinute,
         hintLimit = hintLimit,
+        useTimerUrl = useTimerUrl,
+        themeImageUrl = themeImageUrl,
+        themeImageCustomInfo = themeImageCustomInfo
     )
 }
 

data/src/main/java/com/nextroom/nextroom/data/network/ApiService.kt

@@ -1,5 +1,7 @@
 package com.nextroom.nextroom.data.network
 
+import com.nextroom.nextroom.data.network.response.SubscriptionPlanDto
+import com.nextroom.nextroom.data.model.ThemeBackgroundActivationId
 import com.nextroom.nextroom.data.model.TokenDto
 import com.nextroom.nextroom.data.network.request.LoginRequest
 import com.nextroom.nextroom.data.network.request.PurchaseToken
@@ -19,6 +21,7 @@ import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Query
 
 interface ApiService {
@@ -55,4 +58,10 @@ interface ApiService {
 
     @GET("api/v1/banner")
     suspend fun getBanners(): Result<BaseListResponse<BannerDto>>
+
+    @PUT("api/v1/theme/timer/active")
+    suspend fun putActiveThemeBackgroundImage(@Body themeBackgroundActivationId: ThemeBackgroundActivationId): Result<Unit>
+
+    @GET("api/v1/subscription/plan")
+    suspend fun getSubscriptionPlan(): Result<BaseResponse<SubscriptionPlanDto>>
 }

data/src/main/java/com/nextroom/nextroom/data/network/response/BannerDto.kt

@@ -6,13 +6,16 @@ import com.nextroom.nextroom.domain.model.Banner
 data class BannerDto(
     @SerializedName("description")
     val description: String,
+    @SerializedName("imageUrl")
+    val imageUrl: String,
     @SerializedName("url")
-    val imageUrl: String
+    val linkUrl: String
 )
 
 fun BannerDto.toDomain() = Banner(
     description = description,
-    linkUrl = imageUrl
+    imageUrl = imageUrl,
+    linkUrl = linkUrl
 )
 
 fun List<BannerDto>.toDomain(): List<Banner> {

data/src/main/java/com/nextroom/nextroom/data/network/response/SubscriptionPlanDto.kt

@@ -0,0 +1,52 @@
+package com.nextroom.nextroom.data.network.response
+
+import com.google.gson.annotations.SerializedName
+import com.nextroom.nextroom.domain.model.SubscriptionPlan
+import java.math.BigDecimal
+
+data class SubscriptionPlanDto(
+    @SerializedName("url")
+    val url: String,
+    @SerializedName("plans")
+    val plans: List<PlanDto>
+) {
+
+    data class PlanDto(
+        @SerializedName("id")
+        val id: Int,
+        @SerializedName("subscriptionProductId")
+        val subscriptionProductId: String,
+        @SerializedName("planId")
+        val planId: String,
+        @SerializedName("productName")
+        val productName: String,
+        @SerializedName("description")
+        val description: String,
+        @SerializedName("subDescription")
+        val subDescription: String,
+        @SerializedName("originPrice")
+        val originPrice: BigDecimal,
+        @SerializedName("sellPrice")
+        val sellPrice: BigDecimal
+    ) {
+        fun toDomainModel(): SubscriptionPlan.Plan {
+            return SubscriptionPlan.Plan(
+                id = id,
+                subscriptionProductId = subscriptionProductId,
+                planId = planId,
+                productName = productName,
+                description = description,
+                subDescription = subDescription,
+                originPrice = originPrice,
+                sellPrice = sellPrice
+            )
+        }
+    }
+
+    fun toDomainModel(): SubscriptionPlan {
+        return SubscriptionPlan(
+            url = url,
+            plans = plans.map { it.toDomainModel() }
+        )
+    }
+}

data/src/main/java/com/nextroom/nextroom/data/network/response/ThemeDto.kt

@@ -17,6 +17,10 @@ data class ThemeDto(
     val createdAt: String,
     @SerializedName("modifiedAt")
     val modifiedAt: String,
+    @SerializedName("useTimerUrl")
+    val useTimerUrl: Boolean,
+    @SerializedName("themeImageUrl")
+    val themeImageUrl: String? = null
 )
 
 fun ThemeDto.toDomain(hints: List<Hint> = emptyList()): ThemeInfo {
@@ -26,6 +30,8 @@ fun ThemeDto.toDomain(hints: List<Hint> = emptyList()): ThemeInfo {
         timeLimitInMinute = timeLimit,
         hintLimit = hintLimit,
         hints = hints,
+        useTimerUrl = useTimerUrl,
+        themeImageUrl = themeImageUrl
     )
 }
 

data/src/main/java/com/nextroom/nextroom/data/repository/AdminRepositoryImpl.kt

@@ -8,6 +8,7 @@ import com.nextroom.nextroom.data.datasource.UserDataSource
 import com.nextroom.nextroom.domain.model.LoginInfo
 import com.nextroom.nextroom.domain.model.Mypage
 import com.nextroom.nextroom.domain.model.Result
+import com.nextroom.nextroom.domain.model.SubscriptionPlan
 import com.nextroom.nextroom.domain.model.UserSubscribeStatus
 import com.nextroom.nextroom.domain.model.onSuccess
 import com.nextroom.nextroom.domain.repository.AdminRepository
@@ -74,4 +75,8 @@ class AdminRepositoryImpl @Inject constructor(
     override suspend fun getAppPassword(): String {
         return settingDataSource.getAppPassword()
     }
+
+    override suspend fun getSubscriptionPlan(): Result<SubscriptionPlan> {
+        return subscriptionDataSource.getSubscriptionPlan()
+    }
 }

data/src/main/java/com/nextroom/nextroom/data/repository/DataStoreRepositoryImpl.kt

@@ -27,6 +27,22 @@ class DataStoreRepositoryImpl @Inject constructor(
             if (firstInit) settingDataSource.setLastLaunchDate()
         }
 
+    override fun setRecommendBackgroundCustomDialogHidden(time: Long) {
+        settingDataSource.setRecommendBackgroundCustomDialogHidden(time)
+    }
+
+    override fun getRecommendBackgroundCustomDialogHiddenUntil(): Long {
+        return settingDataSource.getRecommendBackgroundCustomDialogHiddenUntil()
+    }
+
+    override fun updateBackgroundSettingsShown() {
+        settingDataSource.updateBackgroundSettingsShown()
+    }
+
+    override fun getBackgroundSettingsNoticeShown(): Boolean {
+        return settingDataSource.getBackgroundSettingsNoticeShown()
+    }
+
     override suspend fun getNetworkDisconnectedCount(): Int {
         return settingDataSource.getNetworkDisconnectedCount()
     }

data/src/main/java/com/nextroom/nextroom/data/repository/GameStateRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.nextroom.nextroom.data.db.GameStateDao
 import com.nextroom.nextroom.data.model.GameStateEntity
 import com.nextroom.nextroom.data.model.toDomain
 import com.nextroom.nextroom.domain.model.GameState
+import com.nextroom.nextroom.domain.model.ThemeImageCustomInfo
 import com.nextroom.nextroom.domain.repository.GameStateRepository
 import com.nextroom.nextroom.domain.repository.TimerRepository
 import javax.inject.Inject
@@ -19,6 +20,8 @@ class GameStateRepositoryImpl @Inject constructor(
         hintLimit: Int,
         usedHints: Set<Int>,
         startTime: Long,
+        themeImageUrl: String?,
+        themeImageCustomInfo: ThemeImageCustomInfo?,
     ) {
         val themeId = settingDataSource.getLatestGameCode()
         gameStateDao.insertGameState(
@@ -28,6 +31,8 @@ class GameStateRepositoryImpl @Inject constructor(
                 hintLimit = hintLimit,
                 usedHints = usedHints,
                 startTime = startTime,
+                themeImageUrl = themeImageUrl,
+                themeImageCustomInfo = themeImageCustomInfo
             ),
         )
     }