[feat] 이용예정/완료 API 연동

app/src/main/AndroidManifest.xml

@@ -36,7 +36,6 @@
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
-
         <activity
             android:name=".presentation.waiting.WaitingDetailActivity"
             android:exported="false"

app/src/main/java/org/sopt/tabling/data/ApiFactory.kt

@@ -6,10 +6,11 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.sopt.tabling.BuildConfig
+import org.sopt.tabling.data.service.ApplyCodeService
 import org.sopt.tabling.data.service.PopularStoreService
+import org.sopt.tabling.data.service.ReservationListService
 import org.sopt.tabling.data.service.ReserveService
 import org.sopt.tabling.data.service.ShopDetailService
-import org.sopt.tabling.data.service.ShopDetailService
 import org.sopt.tabling.data.service.WaitingDetailService
 import retrofit2.Retrofit
 
@@ -19,7 +20,7 @@ object ApiFactory {
             HttpLoggingInterceptor().apply {
                 level =
                     if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY else HttpLoggingInterceptor.Level.NONE
-            }
+            },
         ).build()
     }
     val retrofit: Retrofit by lazy {
@@ -32,6 +33,8 @@ object ApiFactory {
 }
 
 object ServicePool {
+    val reservationListService = ApiFactory.create<ReservationListService>()
+    val applyCodeService = ApiFactory.create<ApplyCodeService>()
     val waitingDetailService = ApiFactory.create<WaitingDetailService>()
     val shopDetailService = ApiFactory.create<ShopDetailService>()
     val popularStoreService = ApiFactory.create<PopularStoreService>()

app/src/main/java/org/sopt/tabling/data/model/request/RequestApplyCodeDto.kt

@@ -0,0 +1,10 @@
+package org.sopt.tabling.data.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestApplyCodeDto(
+    @SerialName("order_id")
+    val orderId: Int
+)

app/src/main/java/org/sopt/tabling/data/model/response/ResponseApplyCodeDto.kt

@@ -0,0 +1,30 @@
+package org.sopt.tabling.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseApplyCodeDto(
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: Data,
+) {
+    @Serializable
+    data class Data(
+        @SerialName("order_id")
+        val orderId: Int,
+        @SerialName("waiting_number")
+        val waitingNumber: Int,
+        @SerialName("before_count")
+        val beforeCount: Int,
+        @SerialName("shop_name")
+        val shopName: String,
+        @SerialName("person_count")
+        val personCount: Int,
+        @SerialName("order_status")
+        val orderStatus: String,
+    )
+}

app/src/main/java/org/sopt/tabling/data/model/response/ResponseReservationDto.kt

@@ -0,0 +1,36 @@
+package org.sopt.tabling.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseReservationDto(
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val reservationList: List<Reservation>,
+) {
+    @Serializable
+    data class Reservation(
+        @SerialName("order_id")
+        val orderId: Int,
+        @SerialName("order_status")
+        val orderStatus: String,
+        @SerialName("shop_id")
+        val shopId: Long,
+        @SerialName("shop_name")
+        val shopName: String,
+        @SerialName("order_date")
+        val orderDate: String,
+        @SerialName("person_count")
+        val personCount: Int,
+        @SerialName("waiting_number")
+        val waitingNumber: Int,
+        @SerialName("before_count")
+        val beforeCount: Int,
+        @SerialName("remaining_review_period")
+        val remainingReviewPeriod: Int,
+    )
+}

app/src/main/java/org/sopt/tabling/data/service/ApplyCodeService.kt

@@ -0,0 +1,14 @@
+package org.sopt.tabling.data.service
+
+import org.sopt.tabling.data.model.request.RequestApplyCodeDto
+import org.sopt.tabling.data.model.response.ResponseApplyCodeDto
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.PATCH
+
+interface ApplyCodeService {
+    @PATCH("/orders/complete")
+    fun applyCode(
+        @Body request: RequestApplyCodeDto,
+    ): Call<ResponseApplyCodeDto>
+}

app/src/main/java/org/sopt/tabling/data/service/ReservationListService.kt

@@ -0,0 +1,10 @@
+package org.sopt.tabling.data.service
+
+import org.sopt.tabling.data.model.response.ResponseReservationDto
+import retrofit2.Call
+import retrofit2.http.GET
+
+interface ReservationListService {
+    @GET("/orders")
+    fun getReservationList(): Call<ResponseReservationDto>
+}

app/src/main/java/org/sopt/tabling/presentation/queue/QueueReservationFragment.kt

@@ -5,15 +5,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
+import org.sopt.tabling.data.ServicePool
+import org.sopt.tabling.data.model.request.RequestApplyCodeDto
+import org.sopt.tabling.data.model.response.ResponseApplyCodeDto
+import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.FragmentQueueReservationBinding
-import org.sopt.tabling.presentation.common.ReservationViewModel
+import org.sopt.tabling.util.extension.showToast
+import retrofit2.Call
+import retrofit2.Response
 
 class QueueReservationFragment : Fragment() {
     private var _binding: FragmentQueueReservationBinding? = null
     private val binding: FragmentQueueReservationBinding
         get() = requireNotNull(_binding) { "바인딩 객체가 생성되지 않았습니다." }
-    private val viewModel by viewModels<ReservationViewModel>()
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -27,13 +31,67 @@ class QueueReservationFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val reservationAdapter = ReservationAdapter(requireContext())
-        binding.rvReservationItems.adapter = reservationAdapter
-        reservationAdapter.setReservationList(viewModel.mockReservationList)
+        setReservationList()
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
+
+    private fun setReservationList() {
+        ServicePool.reservationListService.getReservationList()
+            .enqueue(object : retrofit2.Callback<ResponseReservationDto> {
+                override fun onResponse(
+                    call: Call<ResponseReservationDto>,
+                    response: Response<ResponseReservationDto>,
+                ) {
+                    if (response.isSuccessful) {
+                        val data: ResponseReservationDto = response.body()!!
+                        setReservationAdapter(data.reservationList)
+                        if (response.code() == 500) {
+                            context!!.showToast("서버 에러 발생")
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseReservationDto>, t: Throwable) {
+                    context!!.showToast("네트워크 에러 발생")
+                }
+            })
+    }
+
+    private fun setReservationAdapter(reserveList: List<ResponseReservationDto.Reservation>) {
+        val reservationAdapter = ReservationAdapter(requireContext(), ::patchApplyCode)
+        reservationAdapter.setReservationList(reserveList)
+        binding.rvReservationItems.adapter = reservationAdapter
+    }
+
+    private fun patchApplyCode(orderId: Int) {
+        ServicePool.applyCodeService.applyCode(RequestApplyCodeDto(orderId))
+            .enqueue(object : retrofit2.Callback<ResponseApplyCodeDto> {
+                override fun onResponse(
+                    call: Call<ResponseApplyCodeDto>,
+                    response: Response<ResponseApplyCodeDto>,
+                ) {
+                    if (response.isSuccessful) {
+                        val data: ResponseApplyCodeDto = response.body()!!
+                        if (response.code() == 400) {
+                            context!!.showToast("이미 이용 완료된 주문입니다.")
+                        } else if (response.code() == 404) {
+                            context!!.showToast("일치하는 주문 내역 정보가 없습니다.")
+                        } else if (response.code() == 500) {
+                            context!!.showToast("서버 에러 발생")
+                        } else {
+                            context!!.showToast("변경이 완료되었습니다.")
+                            setReservationList()
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseApplyCodeDto>, t: Throwable) {
+                    context!!.showToast("네트워크 에러 발생")
+                }
+            })
+    }
 }

app/src/main/java/org/sopt/tabling/presentation/queue/ReservationAdapter.kt

@@ -4,46 +4,63 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.ItemDoneReservationBinding
+import org.sopt.tabling.databinding.ItemNoneReservationBinding
 import org.sopt.tabling.databinding.ItemReservationBinding
-import org.sopt.tabling.domain.model.ReservationItem
 
-class ReservationAdapter(context: Context) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class ReservationAdapter(
+    context: Context,
+    private val patchOnClick: (Int) -> Unit,
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     private val inflater by lazy { LayoutInflater.from(context) }
 
-    private var reservationList: List<ReservationItem> = emptyList()
+    private var reservationList: List<ResponseReservationDto.Reservation> = emptyList()
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
             1 -> ReservationViewHolder(
                 ItemReservationBinding.inflate(inflater, parent, false),
+                patchOnClick,
             )
 
             2 -> ReservationDoneViewHolder(
                 ItemDoneReservationBinding.inflate(inflater, parent, false),
             )
 
+            3 -> ReservationNoneViewHolder(
+                ItemNoneReservationBinding.inflate(inflater, parent, false),
+            )
+
             else -> throw RuntimeException()
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is ReservationViewHolder -> holder.onBind(reservationList[position] as ReservationItem.ReservationView)
-            is ReservationDoneViewHolder -> holder.onBind(reservationList[position] as ReservationItem.ReservationDoneView)
+            is ReservationViewHolder -> holder.onBind(reservationList[position])
+            is ReservationDoneViewHolder -> holder.onBind(reservationList[position])
+            is ReservationNoneViewHolder -> holder.onBind(reservationList[position])
         }
     }
 
     override fun getItemViewType(position: Int): Int {
-        return when (reservationList[position]) {
-            is ReservationItem.ReservationView -> 1
-            is ReservationItem.ReservationDoneView -> 2
+        if (reservationList[position].orderStatus == "이용 예정") {
+            return 1
+        } else if (reservationList[position].orderStatus == "이용 완료") {
+            if (reservationList[position].remainingReviewPeriod <= 0) {
+                return 3
+            }
+            return 2
+        } else {
+            return 1
         }
     }
 
     override fun getItemCount(): Int = reservationList.size
 
-    fun setReservationList(mockReservationList: List<ReservationItem>) {
-        reservationList = mockReservationList
+    fun setReservationList(reservationItemList: List<ResponseReservationDto.Reservation>) {
+        reservationList = reservationItemList
         notifyDataSetChanged()
     }
 }

app/src/main/java/org/sopt/tabling/presentation/queue/ReservationDoneViewHolder.kt

@@ -1,15 +1,16 @@
 package org.sopt.tabling.presentation.queue
 
 import androidx.recyclerview.widget.RecyclerView
+import org.sopt.tabling.data.model.response.ResponseReservationDto
 import org.sopt.tabling.databinding.ItemDoneReservationBinding
-import org.sopt.tabling.domain.model.ReservationItem
 
 class ReservationDoneViewHolder(private val binding: ItemDoneReservationBinding) :
     RecyclerView.ViewHolder(binding.root) {
-    fun onBind(item: ReservationItem.ReservationDoneView) {
-        binding.tvReservationDate.text = item.reserveDate
-        binding.tvReservationPeople.text = item.reserveNum + "명"
-        binding.tvStoreName.text = item.reserveName
-        binding.tvRemainReviewNum.text = item.remainReviewNum + "일"
+    fun onBind(item: ResponseReservationDto.Reservation) {
+        binding.chipReservationWait.text = item.orderStatus
+        binding.tvReservationDate.text = item.orderDate
+        binding.tvReservationPeople.text = item.personCount.toString() + "명"
+        binding.tvStoreName.text = item.shopName
+        binding.tvRemainReviewNum.text = item.remainingReviewPeriod.toString() + "일"
     }
 }