Merge pull request #157 from Gamegoo-repo/feat/155

[Feat/155] 매너 평가 조회 추가 구현

src/main/java/com/gamegoo/controller/mannner/MannerController.java

@@ -94,7 +94,7 @@ public ApiResponse<MannerResponse.mannerUpdateResponseDTO> mannerUpdate(
 
     }
 
-    @GetMapping("good/{memberId}")
+    @GetMapping("/good/{memberId}")
     @Operation(summary = "매너 평가 조회 API", description = "회원이 실시한 매너 평가를 조회하는 API 입니다.")
     @Parameter(name = "memberId", description = "회원이 실시한 매너평가 대상의 id 입니다.")
     public ApiResponse<MannerResponse.mannerKeywordResponseDTO> getMannerKeyword(@PathVariable(name = "memberId") Long targetMemberId){
@@ -106,7 +106,7 @@ public ApiResponse<MannerResponse.mannerKeywordResponseDTO> getMannerKeyword(@Pa
         return ApiResponse.onSuccess(result);
     }
 
-    @GetMapping("bad/{memberId}")
+    @GetMapping("/bad/{memberId}")
     @Operation(summary = "비매너 평가 조회 API", description = "회원이 실시한 비매너 평가를 조회하는 API 입니다.")
     @Parameter(name = "memberId", description = "회원이 실시한 비매너평가 대상의 id 입니다.")
     public ApiResponse<MannerResponse.badMannerKeywordResponseDTO> getBadMannerKeyword(@PathVariable(name = "memberId") Long targetMemberId){

src/main/java/com/gamegoo/dto/manner/MannerResponse.java

@@ -30,6 +30,8 @@ public static class mannerUpdateResponseDTO{
     @NoArgsConstructor
     @AllArgsConstructor
     public static class mannerKeywordResponseDTO{
+        Boolean isPositive;
+        Boolean isExist;
         List<Long> mannerRatingKeywordList;
     }
 
@@ -38,6 +40,8 @@ public static class mannerKeywordResponseDTO{
     @NoArgsConstructor
     @AllArgsConstructor
     public static class badMannerKeywordResponseDTO{
+        Boolean isPositive;
+        Boolean isExist;
         List<Long> mannerRatingKeywordList;
     }
 
@@ -49,14 +53,13 @@ public static class myMannerResponseDTO{
         Integer mannerLevel;
         List<mannerKeywordDTO> mannerKeywords;
     }
-
     @Getter
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
     public static class mannerKeywordDTO{
-       Boolean isPositive;
-       Integer mannerKeywordId;
-       Integer count;
+        Boolean isPositive;
+        Integer mannerKeywordId;
+        Integer count;
     }
 }

src/main/java/com/gamegoo/service/manner/MannerService.java

@@ -367,6 +367,8 @@ public MannerResponse.mannerKeywordResponseDTO getMannerKeyword(Long memberId, L
         // 매너평가를 받은 회원 존재 여부 검증.
         Member targetMember = memberRepository.findById(targetMemberId).orElseThrow(() -> new MemberHandler(ErrorStatus.MANNER_TARGET_MEMBER_NOT_FOUND));
 
+        Boolean isExist;
+
         // 매너평가를 받은 회원 탈퇴 여부 검증.
         if (targetMember.getBlind()) {
             throw new MemberHandler(ErrorStatus.USER_DEACTIVATED);
@@ -379,18 +381,33 @@ public MannerResponse.mannerKeywordResponseDTO getMannerKeyword(Long memberId, L
                 .collect(Collectors.toList());
 
         if (positiveMannerRatings.isEmpty()) {
-            throw new MannerHandler(ErrorStatus.MANNER_NOT_FOUND);
-        }
 
-        MannerRating positiveMannerRating = positiveMannerRatings.get(0);
+            isExist = false;
 
-        List<Long> mannerKeywordIds = positiveMannerRating.getMannerRatingKeywordList().stream()
-                .map(mannerRatingKeyword -> mannerRatingKeyword.getMannerKeyword().getId())
-                .collect(Collectors.toList());
+            List<Long> mannerKeywordIds = Collections.emptyList();
 
-        return MannerResponse.mannerKeywordResponseDTO.builder()
-                .mannerRatingKeywordList(mannerKeywordIds)
-                .build();
+            return MannerResponse.mannerKeywordResponseDTO.builder()
+                    .isPositive(true)
+                    .isExist(isExist)
+                    .mannerRatingKeywordList(mannerKeywordIds)
+                    .build();
+
+        } else {
+
+            isExist = true;
+
+            MannerRating positiveMannerRating = positiveMannerRatings.get(0);
+
+            List<Long> mannerKeywordIds = positiveMannerRating.getMannerRatingKeywordList().stream()
+                    .map(mannerRatingKeyword -> mannerRatingKeyword.getMannerKeyword().getId())
+                    .collect(Collectors.toList());
+
+            return MannerResponse.mannerKeywordResponseDTO.builder()
+                    .isPositive(true)
+                    .isExist(isExist)
+                    .mannerRatingKeywordList(mannerKeywordIds)
+                    .build();
+        }
     }
 
     // 비매너평가 조회
@@ -402,25 +419,41 @@ public MannerResponse.badMannerKeywordResponseDTO getBadMannerKeyword(Long membe
         // 비매너평가를 받은 회원 존재 여부 검증.
         Member targetMember = memberRepository.findById(targetMemberId).orElseThrow(() -> new MemberHandler(ErrorStatus.BAD_MANNER_TARGET_MEMBER_NOT_FOUND));
 
+        Boolean isExist;
+
         // 비매너평가 ID 조회
         List<MannerRating> mannerRatings = mannerRatingRepository.findByFromMemberIdAndToMemberId(member.getId(), targetMember.getId());
         List<MannerRating> negativeMannerRatings = mannerRatings.stream()
                 .filter(mannerRating -> !mannerRating.getIsPositive())
                 .collect(Collectors.toList());
 
         if (negativeMannerRatings.isEmpty()) {
-            throw new MannerHandler(ErrorStatus.BAD_MANNER_NOT_FOUND);
-        }
 
-        MannerRating negativeMannerRating = negativeMannerRatings.get(0);
+            isExist = false;
 
-        List<Long> badMannerKeywordIds = negativeMannerRating.getMannerRatingKeywordList().stream()
-                .map(mannerRatingKeyword -> mannerRatingKeyword.getMannerKeyword().getId())
-                .collect(Collectors.toList());
+            List<Long> badMannerKeywordIds = Collections.emptyList();
 
-        return MannerResponse.badMannerKeywordResponseDTO.builder()
-                .mannerRatingKeywordList(badMannerKeywordIds)
-                .build();
+            return MannerResponse.badMannerKeywordResponseDTO.builder()
+                    .isPositive(false)
+                    .isExist(isExist)
+                    .mannerRatingKeywordList(badMannerKeywordIds)
+                    .build();
+        } else {
+
+            isExist = true;
+
+            MannerRating negativeMannerRating = negativeMannerRatings.get(0);
+
+            List<Long> badMannerKeywordIds = negativeMannerRating.getMannerRatingKeywordList().stream()
+                    .map(mannerRatingKeyword -> mannerRatingKeyword.getMannerKeyword().getId())
+                    .collect(Collectors.toList());
+
+            return MannerResponse.badMannerKeywordResponseDTO.builder()
+                    .isPositive(false)
+                    .isExist(isExist)
+                    .mannerRatingKeywordList(badMannerKeywordIds)
+                    .build();
+        }
     }
 
     // 내가 받은 매너 평가 조회