Merge pull request #102 from KNU-HAEDAL/issue/#101

Issue/#101
KNU-HAEDAL · Sep 26, 2024 · b1f534d · b1f534d
2 parents 13a49eb + 7fd153d
commit b1f534d
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 5 deletions.
diff --git a/.../app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewReq.java b/.../app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewReq.java
@@ -7,13 +7,19 @@ public class ChallengeReviewReq {
     public record Create(
             String content,
             @Schema(description = "평점", example = "5")
-            Integer rating
+            Integer rating,
+            @Schema(description = "체감 난이도", example = "1")
+            Integer difficulty,
+            @Schema(description = "성취도", example = "1")
+            Integer achievement
     ) {
 
         public ChallengeReviewCommand.Create toCommand() {
             return ChallengeReviewCommand.Create.builder()
                     .content(content)
                     .rating(rating)
+                    .difficulty(difficulty)
+                    .achievement(achievement)
                     .build();
         }
     }

diff --git a/.../app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewRes.java b/.../app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewRes.java
@@ -1,5 +1,6 @@
 package org.haedal.zzansuni.challengereview.controller;
 
+import java.time.LocalDateTime;
 import java.util.Map;
 import lombok.Builder;
 import org.haedal.zzansuni.user.controller.UserRes;
@@ -40,7 +41,10 @@ public record InfoWithChallenge(
         Integer challengeDifficulty,
         UserRes.User user,
         String content,
-        Integer rating
+        Integer rating,
+        Integer difficulty,
+        Integer achievement,
+        LocalDateTime createdAt
     ) {
 
         public static InfoWithChallenge from(
@@ -53,6 +57,9 @@ public static InfoWithChallenge from(
                 .user(user)
                 .content(challengeReviewWithChallenge.content())
                 .rating(challengeReviewWithChallenge.rating())
+                .difficulty(challengeReviewWithChallenge.difficulty())
+                .achievement(challengeReviewWithChallenge.achievement())
+                .createdAt(challengeReviewWithChallenge.createdAt())
                 .build();
         }
     }

diff --git a/...-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReview.java b/...-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReview.java
@@ -38,13 +38,21 @@ public class ChallengeReview extends BaseTimeEntity {
     @Column(nullable = false)
     private Long challengeGroupId;
 
+    @Column(nullable = false)
+    private Integer difficulty;
+
+    @Column(nullable = false)
+    private Integer achievement;
+
     public static ChallengeReview create(UserChallenge userChallenge, ChallengeReviewCommand.Create command) {
         Long challengeGroupId = userChallenge.getChallenge().getChallengeGroupId();
         return ChallengeReview.builder()
             .userChallenge(userChallenge)
             .content(command.getContent())
             .rating(command.getRating())
             .challengeGroupId(challengeGroupId)
+            .difficulty(command.getDifficulty())
+            .achievement(command.getAchievement())
             .build();
     }
 

diff --git a/.../app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewCommand.java b/.../app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewCommand.java
@@ -20,10 +20,22 @@ public static class Create extends SelfValidating<Create> {
         @Max(5)
         private final Integer rating;
 
+        @NotNull(message = "평점은 필수입니다.")
+        @Min(1)
+        @Max(5)
+        private final Integer difficulty;
+
+        @NotNull(message = "평점은 필수입니다.")
+        @Min(1)
+        @Max(3)
+        private final Integer achievement;
+
         @Builder
-        public Create(String content, Integer rating) {
+        public Create(String content, Integer rating, Integer difficulty, Integer achievement) {
             this.content = content;
             this.rating = rating;
+            this.difficulty = difficulty;
+            this.achievement = achievement;
             this.validateSelf();
         }
 

diff --git a/...er/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewModel.java b/...er/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewModel.java
@@ -1,5 +1,6 @@
 package org.haedal.zzansuni.challengereview.domain;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +43,10 @@ public record ChallengeReviewWithChallenge(
         Integer challengeDifficulty,
         UserModel.Main user,
         String content,
-        Integer rating
+        Integer rating,
+        Integer difficulty,
+        Integer achievement,
+        LocalDateTime createdAt
     ) {
 
         public static ChallengeReviewWithChallenge from(ChallengeReview challengeReview) {
@@ -58,6 +62,9 @@ public static ChallengeReviewWithChallenge from(ChallengeReview challengeReview)
                 .user(userModel)
                 .content(challengeReview.getContent())
                 .rating(challengeReview.getRating())
+                .difficulty(challengeReview.getDifficulty())
+                .achievement(challengeReview.getAchievement())
+                .createdAt(challengeReview.getCreatedAt())
                 .build();
         }
 

diff --git a/zzansuni-api-server/app/src/main/resources/db/migration/V4__add_column_review.sql b/zzansuni-api-server/app/src/main/resources/db/migration/V4__add_column_review.sql
@@ -0,0 +1,5 @@
+ALTER TABLE challenge_review ADD COLUMN difficulty TINYINT DEFULT(1) NOT NULL;
+ALTER TABLE challenge_review ADD COLUMN achievement TINYINT DEFULT(1) NOT NULL;
+
+ALTER TABLE challenge_review ALTER COLUMN difficulty DROP DEFAULT;
+ALTER TABLE challenge_review ALTER COLUMN achievement DROP DEFAULT;
diff --git a/...ava/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewReaderImplTest.java b/...ava/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewReaderImplTest.java
@@ -64,6 +64,8 @@ void getScoreModelByChallengeGroupId() {
                 .userChallenge(userChallenge)
                 .content("content")
                 .rating(i % 4 + 1)
+                .difficulty(1)
+                .achievement(1)
                 .build())
             .toList();
         // -> 1:3 / 2:3 / 3:3 / 4:2 / 5:0

diff --git a/...src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java b/...src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java
@@ -146,7 +146,7 @@ void createReview() {
         Long userId = 1L;
         Long challengeId = 1L;
         ChallengeReviewCommand.Create command = new ChallengeReviewCommand.Create(
-            "Great challenge!", 5);
+            "Great challenge!", 5,1,1);
 
         when(userChallengeReader.findByUserIdAndChallengeId(userId, challengeId)).thenReturn(
             Optional.of(userChallenge));