[Feat] 리뷰 v2

app/build.gradle.kts

@@ -17,8 +17,15 @@ android {
     namespace = "com.eatssu.android"
     compileSdk = 35
 
-    // S8: API 28
-    // S21: API 33
+    /**
+     * 현재 팀 내 안드로이드 OS 버전
+     * 진 S8: 9 (sdk 28)
+     * 진 S21: 14 (sdk 33)
+     * 윤소: 9
+     * 유리: 10
+     * 제훈: 14
+     */
+
     defaultConfig {
         applicationId = "com.eatssu.android"
         minSdk = 23
@@ -114,6 +121,7 @@ android {
 
 dependencies {
     implementation(project(":core:design-system"))
+    implementation(project(":core:design-system"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
@@ -126,6 +134,27 @@ dependencies {
     implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.fragment.ktx)
 
+    // Compose
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.animation)
+    implementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.lifecycle.viewmodel)
+    implementation(libs.androidx.compose.lifecycle.runtime)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.compose.theme.adapter)
+    implementation(libs.accompanist.appcompat.theme)
+    androidTestImplementation(libs.androidx.compose.bom)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
+
+    // navigation
+    implementation(libs.androidx.navigation.fragment)
+    implementation(libs.androidx.navigation.ui)
+    implementation(libs.androidx.navigation.compose)
+
     //glance
     implementation(libs.androidx.glance)
     implementation(libs.androidx.glance.preview)
@@ -153,6 +182,9 @@ dependencies {
     implementation(libs.glide)
     kapt(libs.glide.compiler)
 
+    //coil: 이미지 로딩
+    implementation(libs.coil.compose)
+
     //compressor: 이미지 압축
     implementation(libs.compressor)
 
@@ -170,6 +202,7 @@ dependencies {
     kapt(libs.androidx.hilt.compiler)
     implementation(libs.androidx.hilt.common)
     implementation(libs.androidx.hilt.work)
+    implementation(libs.hilt.navigation.compose)
 
     // ViewModel and LiveData
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
@@ -189,27 +222,6 @@ dependencies {
     // OSS
     implementation(libs.oss.licenses)
 
-    // Compose
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.compose.animation)
-    implementation(libs.androidx.compose.ui.tooling)
-    implementation(libs.androidx.compose.lifecycle.viewmodel)
-    implementation(libs.androidx.compose.lifecycle.runtime)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.graphics)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.compose.material3)
-//    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    implementation(libs.compose.theme.adapter)
-    implementation(libs.accompanist.appcompat.theme)
-    androidTestImplementation(libs.androidx.compose.bom)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
-
-    // navigation
-    implementation(libs.androidx.navigation.fragment)
-    implementation(libs.androidx.navigation.ui)
-
     // worker (Kotlin + coroutines)
     implementation(libs.androidx.work.runtime.ktx)
 

app/src/main/AndroidManifest.xml

@@ -133,15 +133,12 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.cafeteria.review.write.ReviewWriteRateActivity"
+            android:name=".presentation.cafeteria.review.ReviewComposeActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".presentation.cafeteria.review.write.menu.ReviewWriteMenuActivity"
-            android:exported="false" />
         <activity
             android:name=".presentation.login.LoginActivity"
             android:exported="true">
@@ -186,14 +183,7 @@
                 android:value="" />
         </activity>
         <activity
-            android:name=".presentation.mypage.myreview.MyReviewListActivity"
-            android:exported="true">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
-        <activity
-            android:name=".presentation.cafeteria.review.list.ReviewActivity"
+            android:name=".presentation.mypage.myreview.MyReviewListComposeActivity"
             android:exported="true">
             <meta-data
                 android:name="android.app.lib_name"
@@ -214,13 +204,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".presentation.cafeteria.review.modify.ModifyReviewActivity"
-            android:exported="true">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
     </application>
 
 </manifest>

app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequest.kt

@@ -1,10 +1,18 @@
 package com.eatssu.android.data.dto.request
 
+import com.eatssu.android.data.dto.request.WriteMenuReviewRequest.MenuLike
 import com.google.gson.annotations.SerializedName
 
 data class ModifyReviewRequest(
-    @SerializedName("mainRating") var mainRating: Int? = null,
-    @SerializedName("amountRating") var amountRating: Int? = null,
-    @SerializedName("tasteRating") var tasteRating: Int? = null,
-    @SerializedName("content") var content: String? = null,
-)
+
+    @SerializedName("rating") var rating: Int? = null,
+    @SerializedName("menuLikes") var menuLikes: MenuLike? = MenuLike(),
+    @SerializedName("content") var content: String? = null
+) {
+    data class MenuLikes(
+
+        @SerializedName("menuId") var menuId: Long? = null,
+        @SerializedName("isLike") var isLike: Boolean? = null
+
+    )
+}

app/src/main/java/com/eatssu/android/data/dto/request/ReportRequest.kt

@@ -3,12 +3,7 @@ package com.eatssu.android.data.dto.request
 import com.google.gson.annotations.SerializedName
 
 data class ReportRequest(
-    @SerializedName("reviewId")
-    val reviewId: Long,
-
-    @SerializedName("reportType")
-    val reportType: String,
-
-    @SerializedName("content")
-    val content: String,
+    @SerializedName("reviewId") var reviewId: Long? = null,
+    @SerializedName("reportType") var reportType: String? = null,
+    @SerializedName("content") var content: String? = null
 )

app/src/main/java/com/eatssu/android/data/dto/request/WriteReviewRequest.kt → app/src/main/java/com/eatssu/android/data/dto/request/WriteMealReviewRequest.kt

@@ -2,12 +2,20 @@ package com.eatssu.android.data.dto.request
 
 import com.google.gson.annotations.SerializedName
 
-data class WriteReviewRequest(
 
+data class WriteMenuReviewRequest(
+    @SerializedName("menuId") var menuId: Int? = null,
     @SerializedName("mainRating") var mainRating: Int? = null,
     @SerializedName("amountRating") var amountRating: Int? = null,
     @SerializedName("tasteRating") var tasteRating: Int? = null,
     @SerializedName("content") var content: String? = null,
     @SerializedName("imageUrl") var imageUrl: String? = null,
+    @SerializedName("menuLike") var menuLike: MenuLike? = MenuLike()
+) {
+    data class MenuLike(
 
-    )
+        @SerializedName("menuId") var menuId: Long? = null,
+        @SerializedName("isLike") var isLike: Boolean? = null
+
+    )
+}

app/src/main/java/com/eatssu/android/data/dto/request/WriteMenuReviewRequest.kt

@@ -0,0 +1,18 @@
+package com.eatssu.android.data.dto.request
+
+import com.google.gson.annotations.SerializedName
+
+
+data class WriteMealReviewRequest(
+    @SerializedName("mealId") var mealId: Int? = null,
+    @SerializedName("rating") var rating: Int? = null,
+    @SerializedName("menuLikes") var menuLikes: List<MenuLikes> = arrayListOf(),
+    @SerializedName("content") var content: String? = null,
+    @SerializedName("imageUrls") var imageUrls: List<String> = arrayListOf()
+
+) {
+    data class MenuLikes(
+        @SerializedName("menuId") var menuId: Long? = null,
+        @SerializedName("isLike") var isLike: Boolean? = null
+    )
+}

app/src/main/java/com/eatssu/android/data/dto/response/MealReviewInfoResponse.kt

@@ -3,38 +3,29 @@ package com.eatssu.android.data.dto.response
 import com.eatssu.android.domain.model.ReviewInfo
 import com.google.gson.annotations.SerializedName
 
-data class GetMealReviewInfoResponse(
-
-    @SerializedName("menuNames") var menuNames: ArrayList<String> = arrayListOf(),
+data class MealReviewInfoResponse(
+    @SerializedName("menuNames") var menuNames: List<String>? = null,
     @SerializedName("totalReviewCount") var totalReviewCount: Int? = null,
     @SerializedName("mainRating") var mainRating: Double? = null,
-    @SerializedName("amountRating") var amountRating: Double? = null,
-    @SerializedName("tasteRating") var tasteRating: Double? = null,
-    @SerializedName("reviewRatingCount") var reviewRatingCount: ReviewRatingCount = ReviewRatingCount(),
-
-    ) {
+    @SerializedName("likeCount") var likeCount: Int? = null,
+    @SerializedName("reviewRatingCount") var reviewRatingCount: ReviewRatingCount? = ReviewRatingCount()
+) {
     data class ReviewRatingCount(
-
         @SerializedName("oneStarCount") var oneStarCount: Int? = null,
         @SerializedName("twoStarCount") var twoStarCount: Int? = null,
         @SerializedName("threeStarCount") var threeStarCount: Int? = null,
         @SerializedName("fourStarCount") var fourStarCount: Int? = null,
-        @SerializedName("fiveStarCount") var fiveStarCount: Int? = null,
-
-        )
-
+        @SerializedName("fiveStarCount") var fiveStarCount: Int? = null
+    )
 }
 
-fun GetMealReviewInfoResponse.asReviewInfo() = ReviewInfo(
-
-    name = menuNames.joinToString(separator = "+"),
+fun MealReviewInfoResponse.toDomain() = ReviewInfo(
+    name = menuNames?.joinToString(separator = " + ") ?: "",
     reviewCnt = totalReviewCount ?: 0,
     mainRating = mainRating ?: 0.0,
-    amountRating = amountRating ?: 0.0,
-    tasteRating = tasteRating ?: 0.0,
-    one = reviewRatingCount.oneStarCount ?: 0,
-    two = reviewRatingCount.twoStarCount ?: 0,
-    three = reviewRatingCount.threeStarCount ?: 0,
-    four = reviewRatingCount.fourStarCount ?: 0,
-    five = reviewRatingCount.fiveStarCount ?: 0,
+    one = reviewRatingCount?.oneStarCount ?: 0,
+    two = reviewRatingCount?.twoStarCount ?: 0,
+    three = reviewRatingCount?.threeStarCount ?: 0,
+    four = reviewRatingCount?.fourStarCount ?: 0,
+    five = reviewRatingCount?.fiveStarCount ?: 0,
 )

app/src/main/java/com/eatssu/android/data/dto/response/MealReviewListResponse.kt

@@ -0,0 +1,51 @@
+package com.eatssu.android.data.dto.response
+
+import com.eatssu.android.domain.model.Review
+import com.google.gson.annotations.SerializedName
+
+data class MealReviewListResponse(
+    @SerializedName("numberOfElements") var numberOfElements: Int? = null,
+    @SerializedName("hasNext") var hasNext: Boolean? = null,
+    @SerializedName("dataList") var dataList: ArrayList<DataList> = arrayListOf()
+) {
+    data class DataList(
+        @SerializedName("reviewId") var reviewId: Long? = null,
+        @SerializedName("writerId") var writerId: Long? = null,
+        @SerializedName("isWriter") var isWriter: Boolean? = null,
+        @SerializedName("writerNickname") var writerNickname: String? = null,
+        @SerializedName("rating") var rating: Int? = null,
+        @SerializedName("writtenAt") var writtenAt: String? = null,
+        @SerializedName("content") var content: String? = null,
+        @SerializedName("imageUrls") var imageUrls: ArrayList<String> = arrayListOf(),
+        @SerializedName("menuList") var menuList: ArrayList<MenuList> = arrayListOf()
+    ) {
+        data class MenuList(
+            @SerializedName("id") var id: Long? = null,
+            @SerializedName("name") var name: String? = null,
+            @SerializedName("isLike") var isLike: Boolean? = null
+        )
+    }
+}
+
+
+fun MealReviewListResponse?.toDomain(): List<Review> {
+    // MealReviewListResponse 객체 자체가 null이면 emptyList() 반환
+    return this?.dataList?.map { data ->
+        Review(
+            reviewId = data.reviewId ?: 0,
+            isWriter = data.isWriter ?: false,
+            menuList = data.menuList.map {
+                Review.Menu(
+                    menuId = it.id ?: -1L,
+                    name = it.name ?: "",
+                    isLike = it.isLike ?: false
+                )
+            },
+            writerNickname = data.writerNickname ?: "유저",
+            mainGrade = data.rating ?: 0,
+            writeDate = data.writtenAt ?: "",
+            content = data.content ?: "",
+            imgUrl = data.imageUrls.firstOrNull(),
+        )
+    } ?: emptyList()
+}

app/src/main/java/com/eatssu/android/data/dto/response/MenuOfMealResponse.kt

@@ -1,26 +1,20 @@
 package com.eatssu.android.data.dto.response
 
-import com.eatssu.android.domain.model.MenuMini
 import com.google.gson.annotations.SerializedName
 
 data class MenuOfMealResponse(
-    @SerializedName("briefMenus") var briefMenus: ArrayList<MenusInformation> = arrayListOf(),
+    @SerializedName("menuList") var menuList: ArrayList<MenuList> = arrayListOf()
 )
 
-data class MenusInformation(
+data class MenuList(
 
-    @SerializedName("menuId") var menuId: Long,
-    @SerializedName("name") var name: String,
+    @SerializedName("menuId") var menuId: Long? = null,
+    @SerializedName("name") var name: String? = null
 
-    )
-
-fun MenuOfMealResponse.toMenuMiniList(): List<MenuMini> {
-    return briefMenus.map { it.toMenuMini() }
-}
+)
 
-fun MenusInformation.toMenuMini(): MenuMini {
-    return MenuMini(
-        id = this.menuId,
-        name = this.name
-    )
+fun MenuOfMealResponse.toDomain(): List<Pair<Long, String>> {
+    return menuList.map {
+        (it.menuId ?: -1L) to (it.name ?: "")
+    }
 }