[BE] 방 비교 결과 조회 API에 기능을 추가 구현한다.

backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java

@@ -2,8 +2,6 @@
 
 import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest;
 import com.bang_ggood.category.dto.response.CategoriesReadResponse;
-import com.bang_ggood.category.dto.response.CategoriesReadResponse;
-import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest;
 import com.bang_ggood.category.service.CategoryService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java

@@ -5,9 +5,6 @@
 import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest;
 import com.bang_ggood.category.dto.response.CategoriesReadResponse;
 import com.bang_ggood.category.dto.response.CategoryReadResponse;
-import com.bang_ggood.category.dto.response.CategoriesReadResponse;
-import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest;
-import com.bang_ggood.category.dto.response.CategoryReadResponse;
 import com.bang_ggood.category.repository.CategoryPriorityRepository;
 import com.bang_ggood.exception.BangggoodException;
 import com.bang_ggood.user.domain.User;
@@ -65,7 +62,9 @@ private void validateCategoryId(CategoryPriorityCreateRequest request) {
         request.categoryIds().stream()
                 .filter(id -> !Category.contains(id))
                 .findAny()
-                .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); });
+                .ifPresent(id -> {
+                    throw new BangggoodException(CATEGORY_NOT_FOUND);
+                });
     }
 
     public CategoriesReadResponse readCategories() {

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java

@@ -57,7 +57,8 @@ public ResponseEntity<UserChecklistsPreviewResponse> readUserChecklistsPreview()
     @GetMapping("/checklists/comparison")
     public ResponseEntity<ChecklistsWithScoreReadResponse> readChecklistsComparison(
             @RequestParam("id") List<Long> checklistIds) {
-        return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds));
+        User user = new User(1L, "방끗", "[email protected]");
+        return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds));
     }
 
     @PutMapping("/checklists/{id}")

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java

@@ -1,7 +1,10 @@
 package com.bang_ggood.checklist.domain;
 
 import com.bang_ggood.BaseEntity;
+import com.bang_ggood.room.domain.FloorLevel;
 import com.bang_ggood.room.domain.Room;
+import com.bang_ggood.room.domain.Structure;
+import com.bang_ggood.room.domain.Type;
 import com.bang_ggood.user.domain.User;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -95,6 +98,22 @@ public Integer getRoomWalkingTime() {
         return room.getWalkingTime();
     }
 
+    public Type getRoomType() {
+        return room.getType();
+    }
+
+    public Integer getRoomSize() {
+        return room.getSize();
+    }
+
+    public FloorLevel getRoomFloorLevel() {
+        return room.getFloorLevel();
+    }
+
+    public Structure getRoomStructure() {
+        return room.getStructure();
+    }
+
     public Integer getDeposit() {
         return deposit;
     }

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java

@@ -0,0 +1,15 @@
+package com.bang_ggood.checklist.domain;
+
+import java.util.List;
+
+public class ChecklistRank {
+
+    private ChecklistRank() {
+    }
+
+    public static int calculateRanks(int targetScore, List<Integer> scores) {
+        return (int) scores.stream()
+                .filter(score -> score > targetScore)
+                .count() + 1;
+    }
+}

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java

@@ -10,8 +10,7 @@ public enum Grade {
     GOOD(3),
     SOSO(2),
     BAD(1),
-    NONE(0)
-    ;
+    NONE(0);
 
     private final int score;
 

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java

@@ -1,30 +1,65 @@
 package com.bang_ggood.checklist.dto.response;
 
 import com.bang_ggood.checklist.domain.Checklist;
+import com.bang_ggood.room.dto.response.SelectedRoomResponse;
 import java.util.List;
 
-public record ChecklistWithScoreReadResponse(
-        Long checklistId, String roomName, String address,
-        Integer floor, Integer deposit, Integer rent,
-        Integer contractTerm, String station, Integer walkingTime,
-        Integer optionCount, Integer score,
-        List<CategoryScoreReadResponse> categories
-) {
-    public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore,
+public class ChecklistWithScoreReadResponse {
+
+    private final Long checklistId;
+    private final Integer score;
+    private final SelectedRoomResponse room;
+    private final List<SelectedOptionResponse> options;
+    private final List<CategoryScoreReadResponse> categories;
+    private Integer rank;
+
+    public ChecklistWithScoreReadResponse(Long checklistId, Integer score,
+                                          SelectedRoomResponse room, List<SelectedOptionResponse> options,
+                                          List<CategoryScoreReadResponse> categories) {
+        this.checklistId = checklistId;
+        this.score = score;
+        this.room = room;
+        this.options = options;
+        this.categories = categories;
+    }
+
+    public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistScore,
+                                                    SelectedRoomResponse room, List<SelectedOptionResponse> options,
                                                     List<CategoryScoreReadResponse> categoryScores) {
         return new ChecklistWithScoreReadResponse(
                 checklist.getId(),
-                checklist.getRoomName(),
-                checklist.getRoomAddress(),
-                checklist.getRoomFloor(),
-                checklist.getDeposit(),
-                checklist.getRent(),
-                checklist.getContractTerm(),
-                checklist.getRoomStation(),
-                checklist.getRoomWalkingTime(),
-                checklistOptionCount,
                 checklistScore,
+                room,
+                options,
                 categoryScores
         );
     }
+
+    public void assignRank(int rank) {
+        this.rank = rank;
+    }
+
+    public Long getChecklistId() {
+        return checklistId;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public SelectedRoomResponse getRoom() {
+        return room;
+    }
+
+    public List<SelectedOptionResponse> getOptions() {
+        return options;
+    }
+
+    public List<CategoryScoreReadResponse> getCategories() {
+        return categories;
+    }
+
+    public Integer getRank() {
+        return rank;
+    }
 }

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java

@@ -1,7 +1,6 @@
 package com.bang_ggood.checklist.dto.response;
 
 import com.bang_ggood.checklist.domain.Checklist;
-
 import java.time.LocalDateTime;
 import java.util.List;
 

backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java

@@ -28,11 +28,14 @@ default Checklist getById(long id) {
     //TODO: 논리적 삭제 리팩토링
     List<Checklist> findByUser(User user);
 
-    //TODO: 논리적 삭제 리팩토링
-    List<Checklist> findByUserAndIdIn(User user, List<Long> checklistIds);
-
-    //TODO: 논리적 삭제 리팩토링
-    long countAllByIdIn(List<Long> ids);
+    @Query("SELECT c FROM Checklist c "
+            + "JOIN FETCH c.user u "
+            + "JOIN FETCH c.room r "
+            + "WHERE u = :user "
+            + "AND c.id IN :checklistIds "
+            + "AND c.deleted = false")
+    List<Checklist> findByUserAndIdIn(@Param("user") User user,
+                                      @Param("checklistIds") List<Long> checklistIds);
 
     @Query("SELECT COUNT(c) > 0 FROM Checklist c "
             + "WHERE c.id = :id "
@@ -44,5 +47,4 @@ default Checklist getById(long id) {
             + "SET c.deleted = true "
             + "WHERE c.id = :id")
     void deleteById(@Param("id") long id);
-
 }