refactor: 약속 리스트 화면 리팩터링 (#973)

* refactor: MeetingsBindingAdapter 함수 분리

* refactor: fab 클릭 액션을 바인딩 어댑터로 변경

* style: 코드 스타일 변경

* refactor: NavigateAction 통해서 액티비티 이동하도록 수정

* refactor: MeetingUiModel position 제거

* chore: meetingCatalog -> meeting 네이밍 변경

* style: ktLint 적용

* chore: Meeting -> DetailMeeting 네이밍 변경

* chore: MeetingCatalog -> Meeting 네이밍 변경

* feat: 설정 화면으로 이동 시 floating 버튼 닫도록 수정

Author: kimhm0728

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/mapper/MeetingResponseMapper.kt

@@ -1,14 +1,14 @@
 package com.mulberry.ody.data.remote.core.entity.meeting.mapper
 
-import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingResponse
+import com.mulberry.ody.data.remote.core.entity.meeting.response.DetailMeetingResponse
+import com.mulberry.ody.domain.model.DetailMeeting
 import com.mulberry.ody.domain.model.Mate
-import com.mulberry.ody.domain.model.Meeting
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
-fun MeetingResponse.toMeeting(): Meeting =
-    Meeting(
+fun DetailMeetingResponse.toDetailMeeting(): DetailMeeting =
+    DetailMeeting(
         id = id,
         name = name,
         date = date.toLocalDate(),

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/mapper/MeetingCatalogMapper.kt android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/mapper/MeetingsMapper.kt

@@ -1,16 +1,16 @@
 package com.mulberry.ody.data.remote.core.entity.meeting.mapper
 
-import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingCatalogResponse
-import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingCatalogsResponse
-import com.mulberry.ody.domain.model.MeetingCatalog
+import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingResponse
+import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingsResponse
+import com.mulberry.ody.domain.model.Meeting
 import java.time.LocalDate
 import java.time.LocalTime
 
-fun MeetingCatalogResponse.toMeetingCatalog(): MeetingCatalog {
+private fun MeetingResponse.toMeeting(): Meeting {
     val date = LocalDate.parse(date)
     val time = LocalTime.parse(time)
     val dateTime = date.atTime(time)
-    return MeetingCatalog(
+    return Meeting(
         durationMinutes = durationMinutes,
         id = id,
         mateCount = mateCount,
@@ -21,4 +21,4 @@ fun MeetingCatalogResponse.toMeetingCatalog(): MeetingCatalog {
     )
 }
 
-fun MeetingCatalogsResponse.toMeetingCatalogs(): List<MeetingCatalog> = meetingCatalogs.map { it.toMeetingCatalog() }
+fun MeetingsResponse.toMeetings(): List<Meeting> = meetings.map { it.toMeeting() }

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/response/MeetingCatalogResponse.kt android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/response/DetailMeetingResponse.kt

@@ -4,21 +4,31 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class MeetingCatalogResponse(
+data class DetailMeetingResponse(
     @Json(name = "id")
     val id: Long,
     @Json(name = "name")
     val name: String,
-    @Json(name = "mateCount")
-    val mateCount: Int,
     @Json(name = "date")
     val date: String,
     @Json(name = "time")
     val time: String,
-    @Json(name = "targetAddress")
-    val targetAddress: String,
     @Json(name = "originAddress")
     val originAddress: String,
-    @Json(name = "durationMinutes")
-    val durationMinutes: Long,
+    @Json(name = "departureTime")
+    val departureTime: String,
+    @Json(name = "routeTime")
+    val routeTime: Int,
+    @Json(name = "targetAddress")
+    val targetAddress: String,
+    @Json(name = "targetLatitude")
+    val targetLatitude: String,
+    @Json(name = "targetLongitude")
+    val targetLongitude: String,
+    @Json(name = "mateCount")
+    val mateCount: Int,
+    @Json(name = "mates")
+    val mates: List<MateResponse>,
+    @Json(name = "inviteCode")
+    val inviteCode: String,
 )

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/response/MeetingCatalogsResponse.kt

@@ -9,26 +9,16 @@ data class MeetingResponse(
     val id: Long,
     @Json(name = "name")
     val name: String,
+    @Json(name = "mateCount")
+    val mateCount: Int,
     @Json(name = "date")
     val date: String,
     @Json(name = "time")
     val time: String,
-    @Json(name = "originAddress")
-    val originAddress: String,
-    @Json(name = "departureTime")
-    val departureTime: String,
-    @Json(name = "routeTime")
-    val routeTime: Int,
     @Json(name = "targetAddress")
     val targetAddress: String,
-    @Json(name = "targetLatitude")
-    val targetLatitude: String,
-    @Json(name = "targetLongitude")
-    val targetLongitude: String,
-    @Json(name = "mateCount")
-    val mateCount: Int,
-    @Json(name = "mates")
-    val mates: List<MateResponse>,
-    @Json(name = "inviteCode")
-    val inviteCode: String,
+    @Json(name = "originAddress")
+    val originAddress: String,
+    @Json(name = "durationMinutes")
+    val durationMinutes: Long,
 )

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/response/MeetingResponse.kt

@@ -2,18 +2,18 @@ package com.mulberry.ody.data.remote.core.repository
 
 import com.mulberry.ody.data.local.db.MateEtaInfoDao
 import com.mulberry.ody.data.local.entity.eta.MateEtaInfoEntity
+import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toDetailMeeting
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMateEtaInfo
-import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeeting
-import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeetingCatalogs
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeetingRequest
+import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeetings
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toNudgeRequest
 import com.mulberry.ody.data.remote.core.entity.meeting.request.MatesEtaRequest
 import com.mulberry.ody.data.remote.core.service.MeetingService
 import com.mulberry.ody.domain.apiresult.ApiResult
 import com.mulberry.ody.domain.apiresult.map
+import com.mulberry.ody.domain.model.DetailMeeting
 import com.mulberry.ody.domain.model.MateEtaInfo
 import com.mulberry.ody.domain.model.Meeting
-import com.mulberry.ody.domain.model.MeetingCatalog
 import com.mulberry.ody.domain.model.MeetingCreationInfo
 import com.mulberry.ody.domain.model.Nudge
 import com.mulberry.ody.domain.repository.ody.MeetingRepository
@@ -29,14 +29,15 @@ class DefaultMeetingRepository
             return service.fetchInviteCodeValidity(inviteCode)
         }
 
-        override suspend fun fetchMeeting(meetingId: Long): ApiResult<Meeting> {
-            return service.fetchMeeting(meetingId).map { it.toMeeting() }
+        override suspend fun fetchMeeting(meetingId: Long): ApiResult<DetailMeeting> {
+            return service.fetchMeeting(meetingId).map { it.toDetailMeeting() }
         }
 
         override suspend fun postNudge(nudge: Nudge): ApiResult<Unit> = service.postNudge(nudge.toNudgeRequest())
 
-        override suspend fun postMeeting(meetingCreationInfo: MeetingCreationInfo): ApiResult<String> =
-            service.postMeeting(meetingCreationInfo.toMeetingRequest()).map { it.inviteCode }
+        override suspend fun postMeeting(meetingCreationInfo: MeetingCreationInfo): ApiResult<String> {
+            return service.postMeeting(meetingCreationInfo.toMeetingRequest()).map { it.inviteCode }
+        }
 
         override suspend fun patchMatesEta(
             meetingId: Long,
@@ -60,8 +61,7 @@ class DefaultMeetingRepository
             return ApiResult.Success(Unit)
         }
 
-        override suspend fun fetchMeetingCatalogs(): ApiResult<List<MeetingCatalog>> =
-            service.fetchMeetingCatalogs().map { it.toMeetingCatalogs() }
+        override suspend fun fetchMeetings(): ApiResult<List<Meeting>> = service.fetchMeetings().map { it.toMeetings() }
 
         override suspend fun exitMeeting(meetingId: Long): ApiResult<Unit> {
             return service.exitMeeting(meetingId)

android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultMeetingRepository.kt

@@ -3,10 +3,10 @@ package com.mulberry.ody.data.remote.core.service
 import com.mulberry.ody.data.remote.core.entity.meeting.request.MatesEtaRequest
 import com.mulberry.ody.data.remote.core.entity.meeting.request.MeetingRequest
 import com.mulberry.ody.data.remote.core.entity.meeting.request.NudgeRequest
+import com.mulberry.ody.data.remote.core.entity.meeting.response.DetailMeetingResponse
 import com.mulberry.ody.data.remote.core.entity.meeting.response.MatesEtaResponse
-import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingCatalogsResponse
 import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingCreationResponse
-import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingResponse
+import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingsResponse
 import com.mulberry.ody.domain.apiresult.ApiResult
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -33,12 +33,12 @@ interface MeetingService {
     ): ApiResult<MatesEtaResponse>
 
     @GET("/v1/meetings/me")
-    suspend fun fetchMeetingCatalogs(): ApiResult<MeetingCatalogsResponse>
+    suspend fun fetchMeetings(): ApiResult<MeetingsResponse>
 
     @GET("/v2/meetings/{meetingId}")
     suspend fun fetchMeeting(
         @Path(value = "meetingId") meetingId: Long,
-    ): ApiResult<MeetingResponse>
+    ): ApiResult<DetailMeetingResponse>
 
     @POST("/v1/mates/nudge")
     suspend fun postNudge(

android/app/src/main/java/com/mulberry/ody/data/remote/core/service/MeetingService.kt

@@ -0,0 +1,17 @@
+package com.mulberry.ody.domain.model
+
+import java.time.LocalDate
+import java.time.LocalTime
+
+data class DetailMeeting(
+    val id: Long,
+    val name: String,
+    val date: LocalDate,
+    val time: LocalTime,
+    val destinationAddress: String,
+    val departureAddress: String,
+    val departureTime: LocalTime,
+    val durationTime: Int,
+    val mates: List<Mate>,
+    val inviteCode: String,
+)

android/app/src/main/java/com/mulberry/ody/domain/model/DetailMeeting.kt

@@ -1,17 +1,13 @@
 package com.mulberry.ody.domain.model
 
-import java.time.LocalDate
-import java.time.LocalTime
+import java.time.LocalDateTime
 
 data class Meeting(
     val id: Long,
     val name: String,
-    val date: LocalDate,
-    val time: LocalTime,
-    val destinationAddress: String,
-    val departureAddress: String,
-    val departureTime: LocalTime,
-    val durationTime: Int,
-    val mates: List<Mate>,
-    val inviteCode: String,
+    val mateCount: Int,
+    val datetime: LocalDateTime,
+    val targetAddress: String,
+    val originAddress: String,
+    val durationMinutes: Long,
 )

android/app/src/main/java/com/mulberry/ody/domain/model/Meeting.kt

@@ -1,9 +1,9 @@
 package com.mulberry.ody.domain.repository.ody
 
 import com.mulberry.ody.domain.apiresult.ApiResult
+import com.mulberry.ody.domain.model.DetailMeeting
 import com.mulberry.ody.domain.model.MateEtaInfo
 import com.mulberry.ody.domain.model.Meeting
-import com.mulberry.ody.domain.model.MeetingCatalog
 import com.mulberry.ody.domain.model.MeetingCreationInfo
 import com.mulberry.ody.domain.model.Nudge
 
@@ -24,9 +24,9 @@ interface MeetingRepository {
         mateEtaInfo: MateEtaInfo,
     ): ApiResult<Unit>
 
-    suspend fun fetchMeetingCatalogs(): ApiResult<List<MeetingCatalog>>
+    suspend fun fetchMeetings(): ApiResult<List<Meeting>>
 
-    suspend fun fetchMeeting(meetingId: Long): ApiResult<Meeting>
+    suspend fun fetchMeeting(meetingId: Long): ApiResult<DetailMeeting>
 
     suspend fun postNudge(nudge: Nudge): ApiResult<Unit>