Merge pull request #106 from Stack-Knowledge/feature/#66_implement_shop_page

🔀 :: (#66) Implementation Shop Page (Teacher, Student)

Author: Chaejongin12

app/src/main/java/com/stackknowledge/navigation/StackKnowledgeNavHost.kt

@@ -16,7 +16,9 @@ import com.stackknowledge.ranking.navigation.teacherRankingScreen
 import com.stackknowledge.score_mission.navigation.gradingAnswerScreen
 import com.stackknowledge.score_mission.navigation.navigateToGradingAnswer
 import com.stackknowledge.score_mission.navigation.solvedMissionScreen
+import com.stackknowledge.shop.navigation.shopRoute
 import com.stackknowledge.shop.navigation.shopScreen
+import com.stackknowledge.shop.navigation.teacherShopRoute
 import com.stackknowledge.shop.navigation.teacherShopScreen
 import com.stackknowledge.ui.StackKnowledgeAppState
 import com.stackkowledge.mission.navigation.createMissionRoute

core/data/src/main/kotlin/com/stackknowledge/repository/item/ItemRepository.kt

@@ -1,8 +1,9 @@
 package com.stackknowledge.repository.item
 
+import com.stackknowledge.dto.response.item.GetItemResponse
 import kotlinx.coroutines.flow.Flow
 import remote.response.item.GetItemResponseModel
 
 interface ItemRepository {
-    fun getItem(): Flow<GetItemResponseModel>
+    fun getItem(): Flow<List<GetItemResponseModel>>
 }

core/data/src/main/kotlin/com/stackknowledge/repository/item/ItemRepositoryImpl.kt

@@ -1,14 +1,16 @@
 package com.stackknowledge.repository.item
 
 import com.stackknowledge.datasource.item.ItemDataSource
+import com.stackknowledge.mapper.response.item.toModel
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import remote.response.item.GetItemResponseModel
 import javax.inject.Inject
 
 class ItemRepositoryImpl @Inject constructor(
     private val itemDataSource: ItemDataSource
 ): ItemRepository {
-    override fun getItem(): Flow<GetItemResponseModel> {
-        return itemDataSource.getItem()
+    override fun getItem(): Flow<List<GetItemResponseModel>> {
+        return itemDataSource.getItem().map { list -> list.map { it.toModel() } }
     }
 }

core/data/src/main/kotlin/com/stackknowledge/repository/order/OrderRepository.kt

@@ -6,9 +6,9 @@ import remote.request.order.OrderRequestModel
 import remote.response.order.ViewAllOrderResponseModel
 
 interface OrderRepository {
-    fun order(body: OrderRequestModel): Flow<Unit>
+    fun order(body: List<OrderRequestModel>): Flow<Unit>
 
-    fun viewAllOrder(): Flow<ViewAllOrderResponseModel>
+    fun viewAllOrder(): Flow<List<ViewAllOrderResponseModel>>
 
-    fun changeOrderStatus(body: ChangeOrderStatusRequestModel): Flow<Unit>
+    fun changeOrderStatus(body: List<ChangeOrderStatusRequestModel>): Flow<Unit>
 }

core/data/src/main/kotlin/com/stackknowledge/repository/order/OrderRepositoryImpl.kt

@@ -2,6 +2,7 @@ package com.stackknowledge.repository.order
 
 import com.stackknowledge.datasource.order.OrderDataSource
 import com.stackknowledge.mapper.request.order.toDto
+import com.stackknowledge.mapper.response.item.toModel
 import com.stackknowledge.mapper.response.order.toModel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -11,17 +12,17 @@ import remote.response.order.ViewAllOrderResponseModel
 import javax.inject.Inject
 
 class OrderRepositoryImpl @Inject constructor(
-    private val orderDataSource: OrderDataSource
-): OrderRepository {
-    override fun order(body: OrderRequestModel): Flow<Unit> {
-        return orderDataSource.order(body = body.toDto())
+    private val orderDataSource: OrderDataSource,
+) : OrderRepository {
+    override fun order(body: List<OrderRequestModel>): Flow<Unit> {
+        return orderDataSource.order(body = body.map { it.toDto() })
     }
 
-    override fun viewAllOrder(): Flow<ViewAllOrderResponseModel> {
-        return orderDataSource.viewAllOrder().map { it.toModel() }
+    override fun viewAllOrder(): Flow<List<ViewAllOrderResponseModel>> {
+        return orderDataSource.viewAllOrder().map { list -> list.map { it.toModel() } }
     }
 
-    override fun changeOrderStatus(body: ChangeOrderStatusRequestModel): Flow<Unit> {
-        return orderDataSource.changeOrderStatus(body = body.toDto())
+    override fun  changeOrderStatus(body: List<ChangeOrderStatusRequestModel>): Flow<Unit> {
+        return orderDataSource.changeOrderStatus(body = body.map { it.toDto() })
     }
 }

core/design-system/src/main/java/com/stackknowledge/design_system/component/bottomsheet/BottomSheetItem.kt

@@ -24,7 +24,7 @@ import com.stackknowledge.design_system.theme.StackKnowledgeAndroidTheme
 
 @Composable
 fun BottomSheetItem(
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->  
         Row(

core/design-system/src/main/java/com/stackknowledge/design_system/component/button/StackKnowledgeButton.kt

@@ -21,7 +21,7 @@ fun StackKnowledgeButton(
 ) {
     StackKnowledgeAndroidTheme { colors, typography ->
         Button(
-            onClick = onClick,
+            onClick = { onClick() },
             modifier = modifier
                 .fillMaxWidth()
                 .clip(shape = RoundedCornerShape(10.dp))

core/design-system/src/main/java/com/stackknowledge/design_system/component/dialog/StackKnowledgeDialog.kt

@@ -43,11 +43,9 @@ fun StackKnowledgeDialog(
     openDialog: Boolean,
     onStateChange: (Boolean) -> Unit,
 ) {
-    var openDialog by remember { mutableStateOf(openDialog) }
-
     if (openDialog) {
         StackKnowledgeAndroidTheme { colors, typography ->
-            Dialog(onDismissRequest = { openDialog = false }) {
+            Dialog(onDismissRequest = { onStateChange(false) } )  {
                 Column(
                     modifier = modifier
                         .width(280.dp)
@@ -110,9 +108,6 @@ fun StackKnowledgeDialog(
                 }
             }
         }
-
-    } else {
-        onStateChange(openDialog)
     }
 }
 

core/design-system/src/main/res/values/strings.xml

@@ -34,6 +34,7 @@
     <string name="student">학생</string>
     <string name="teacher">선생님</string>
     <string name="select_role_text">사용자가 학생인지\n 선생님인지 선택해주세요.</string>
+    <string name="order_dialog_text">해당 상품을 구매하시겠습니까?</string>
     <string name="select_create_mission">문제를 제출하시겠습니까?</string>
     <string name="cancel_select_create_mission">문제 제출을 취소하시겠습니까?\n 취소시 작성한 문제 내용들이 삭제됩니다.</string>
     <string name="success_create_mission">문제 출제가 완료되었습니다!</string>
@@ -43,4 +44,5 @@
     <string name="success_solve_mission">문제 제출이 완료되었습니다!</string>
     <string name="finish_score_mission">문제 채점이 끝나셨습니까?</string>
     <string name="success_score_mission">문제 채점이 완료되었습니다!</string>
+    <string name="discount_ordered_item">상품을 차감하시겠습니까?</string>
 </resources>

core/domain/src/main/kotlin/com/stackknowledge/usecase/item/GetItemUseCase.kt

@@ -8,6 +8,6 @@ import javax.inject.Inject
 class GetItemUseCase @Inject constructor(
     private val itemRepository: ItemRepository
 ) {
-    operator fun invoke(): Flow<GetItemResponseModel> =
+    operator fun invoke(): Flow<List<GetItemResponseModel>> =
         itemRepository.getItem()
 }