Feat/440 선물 등록 시 사전 질문 작성

app/src/main/AndroidManifest.xml

@@ -39,7 +39,8 @@
             android:name=".presentation.screen.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.Boolti"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTop">
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />

data/src/main/java/com/nexters/boolti/data/network/response/GiftResponse.kt

@@ -1,6 +1,7 @@
 package com.nexters.boolti.data.network.response
 
 import com.nexters.boolti.data.util.toLocalDate
+import com.nexters.boolti.data.util.toLocalDateTime
 import com.nexters.boolti.domain.model.Gift
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -21,6 +22,12 @@ data class GiftResponse(
     val recipientPhoneNumber: String,
     val salesEndTime: String,
     val isDone: Boolean,
+    val showId: String,
+    val showName: String,
+    val showImg: String,
+    val showDate: String,
+    val salesTicketName: String,
+    val ticketCount: Int,
 ) {
     fun toDomain(): Gift {
         return Gift(
@@ -38,6 +45,12 @@ data class GiftResponse(
             recipientPhoneNumber = recipientPhoneNumber,
             salesEndTime = salesEndTime.toLocalDate(),
             isDone = isDone,
+            showId = showId,
+            showName = showName,
+            showImage = showImg,
+            showDate = showDate.toLocalDateTime(),
+            salesTicketName = salesTicketName,
+            ticketCount = ticketCount,
         )
     }
 }

data/src/main/java/com/nexters/boolti/data/repository/GiftRepositoryImpl.kt

@@ -15,11 +15,16 @@ import com.nexters.boolti.domain.request.GiftApproveRequest
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 
 internal class GiftRepositoryImpl @Inject constructor(
     private val dataSource: GiftDataSource,
 ) : GiftRepository {
+    private data class CacheEntry<T>(val value: T, val cachedAt: Long)
+
+    private val giftCache = ConcurrentHashMap<String, CacheEntry<Gift>>()
+    private val cacheTtlMs = 60_000L
     override fun receiveGift(giftUuid: String): Flow<Boolean> = flow {
         emit(dataSource.receiveGift(GiftReceiveRequest(giftUuid)))
     }
@@ -33,7 +38,14 @@ internal class GiftRepositoryImpl @Inject constructor(
     }
 
     override fun getGift(giftUuid: String): Flow<Gift> = flow {
-        emit(dataSource.getGift(giftUuid).toDomain())
+        val cached = giftCache[giftUuid]
+        if (cached != null && System.currentTimeMillis() - cached.cachedAt < cacheTtlMs) {
+            emit(cached.value)
+            return@flow
+        }
+        val gift = dataSource.getGift(giftUuid).toDomain()
+        giftCache[giftUuid] = CacheEntry(gift, System.currentTimeMillis())
+        emit(gift)
     }
 
     override fun getGiftImages(): Flow<List<ImagePair>> = flow {

data/src/main/java/com/nexters/boolti/data/repository/TicketingRepositoryImpl.kt

@@ -23,12 +23,17 @@ import com.nexters.boolti.domain.request.TicketingRequest
 import com.nexters.boolti.domain.request.SubmitPreQuestionAnswersRequest
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 
 internal class TicketingRepositoryImpl @Inject constructor(
     private val dataSource: TicketingDataSource,
     private val reservationDataSource: ReservationDataSource,
 ) : TicketingRepository {
+    private data class CacheEntry<T>(val value: T, val cachedAt: Long)
+
+    private val preQuestionsCache = ConcurrentHashMap<String, CacheEntry<List<PreQuestion>>>()
+    private val cacheTtlMs = 60_000L
     override fun getSalesTickets(request: SalesTicketRequest): Flow<List<TicketWithQuantity>> = flow {
         emit(dataSource.getSalesTickets(request))
     }
@@ -88,7 +93,14 @@ internal class TicketingRepositoryImpl @Inject constructor(
     }
 
     override fun getPreQuestions(showId: String): Flow<List<PreQuestion>> = flow {
-        emit(dataSource.getPreQuestions(showId))
+        val cached = preQuestionsCache[showId]
+        if (cached != null && System.currentTimeMillis() - cached.cachedAt < cacheTtlMs) {
+            emit(cached.value)
+            return@flow
+        }
+        val preQuestions = dataSource.getPreQuestions(showId)
+        preQuestionsCache[showId] = CacheEntry(preQuestions, System.currentTimeMillis())
+        emit(preQuestions)
     }
 
     override fun submitPreQuestionAnswers(request: SubmitPreQuestionAnswersRequest): Flow<Unit> = flow {

domain/src/main/java/com/nexters/boolti/domain/model/Gift.kt

@@ -1,6 +1,7 @@
 package com.nexters.boolti.domain.model
 
 import java.time.LocalDate
+import java.time.LocalDateTime
 
 data class Gift(
     val id: String,
@@ -17,4 +18,10 @@ data class Gift(
     val recipientPhoneNumber: String,
     val salesEndTime: LocalDate,
     val isDone: Boolean,
+    val showId: String,
+    val showName: String,
+    val showImage: String,
+    val showDate: LocalDateTime,
+    val salesTicketName: String,
+    val ticketCount: Int,
 )

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 minSdk = "28"
 targetSdk = "36"
-versionCode = "48"
-versionName = "1.13.0"
+versionCode = "50"
+versionName = "1.14.0"
 packageName = "com.nexters.boolti"
 compileSdk = "36"
 targetJvm = "17"

presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt

@@ -30,6 +30,7 @@ import com.nexters.boolti.presentation.component.ToastSnackbarHost
 import com.nexters.boolti.presentation.screen.accountsetting.accountSettingScreen
 import com.nexters.boolti.presentation.screen.business.businessScreen
 import com.nexters.boolti.presentation.screen.gift.giftScreen
+import com.nexters.boolti.presentation.screen.giftprequestion.giftPreQuestionScreen
 import com.nexters.boolti.presentation.screen.giftcomplete.giftCompleteScreen
 import com.nexters.boolti.presentation.screen.home.homeScreen
 import com.nexters.boolti.presentation.screen.link.linkListScreen
@@ -185,6 +186,7 @@ fun MainNavigation(
         }
 
         giftScreen()
+        giftPreQuestionScreen()
 
         hostedShowScreen(
             onClickShow = onClickQrScan,

presentation/src/main/java/com/nexters/boolti/presentation/screen/giftprequestion/GiftPreQuestionEvent.kt

@@ -0,0 +1,6 @@
+package com.nexters.boolti.presentation.screen.giftprequestion
+
+sealed interface GiftPreQuestionEvent {
+    data object GiftRegistered : GiftPreQuestionEvent
+    data object GiftRegistrationFailed : GiftPreQuestionEvent
+}

presentation/src/main/java/com/nexters/boolti/presentation/screen/giftprequestion/GiftPreQuestionNavigation.kt

@@ -0,0 +1,17 @@
+package com.nexters.boolti.presentation.screen.giftprequestion
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import androidx.navigation.toRoute
+import com.nexters.boolti.presentation.screen.LocalNavController
+import com.nexters.boolti.presentation.screen.navigation.MainRoute
+
+fun NavGraphBuilder.giftPreQuestionScreen() {
+    composable<MainRoute.GiftPreQuestion> { backStackEntry ->
+        val navController = LocalNavController.current
+
+        GiftPreQuestionScreen(
+            onBackPressed = navController::navigateUp,
+        )
+    }
+}