Merge pull request #90 from Dallili/dev/feat/list-diary

[feat] DiaryController.diaryDTOList 매칭 안된 일기장에 matchingID 포함하도록 수정
Dallili · May 21, 2024 · 10e2300 · 10e2300
2 parents 8479310 + 88a33c3
commit 10e2300
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/src/main/java/org/dallili/secretfriends/controller/DiaryController.java b/src/main/java/org/dallili/secretfriends/controller/DiaryController.java
@@ -39,15 +39,12 @@ public Map<String, Object> diaryDTOList(@RequestParam("state") Boolean state, Au
         Long memberID = Long.parseLong(authentication.getName());
 
         List<DiaryDTO> diaries = diaryService.findStateDiaries(memberID, state);
-        List<DiaryDTO> unknownMatchingDiary = matchingService.findUnknownDiary(memberID);
-
-        List<DiaryDTO> allDiaries = new ArrayList<>();
-        allDiaries.addAll(diaries);
-        allDiaries.addAll(unknownMatchingDiary);
+        List<DiaryDTO.unKnownMatchingDiary> unknownMatchingDiary = matchingService.findUnknownDiary(memberID);
 
         Map<String, Object> result = new HashMap<>();
-        result.put("total", allDiaries.size());
-        result.put("diaries", allDiaries);
+        result.put("total", diaries.size()+ unknownMatchingDiary.size());
+        result.put("diaries", diaries);
+        result.put("unmatchedDiaries", unknownMatchingDiary);
 
         return result;
     }

diff --git a/src/main/java/org/dallili/secretfriends/dto/DiaryDTO.java b/src/main/java/org/dallili/secretfriends/dto/DiaryDTO.java
@@ -51,5 +51,22 @@ public static class knownMatchingDiary{
         private String color;
     }
 
+    @Data
+    @Builder
+    public static class unKnownMatchingDiary{
+        @NotNull
+        private Long diaryID; //get
+
+        @NotNull
+        private Long memberID; //get, set
+
+        private boolean state; //get, set
+
+        private String color; //get
+
+        private Long matchingID;
+
+    }
+
 
 }
diff --git a/src/main/java/org/dallili/secretfriends/service/MatchingService.java b/src/main/java/org/dallili/secretfriends/service/MatchingService.java
@@ -8,7 +8,7 @@
 
 public interface MatchingService {
 
-    List<DiaryDTO> findUnknownDiary(Long memberID);
+    List<DiaryDTO.unKnownMatchingDiary> findUnknownDiary(Long memberID);
 
     Long addMatching(MatchingDTO matchingDTO);
 

diff --git a/src/main/java/org/dallili/secretfriends/service/MatchingServiceImpl.java b/src/main/java/org/dallili/secretfriends/service/MatchingServiceImpl.java
@@ -40,17 +40,20 @@ public class MatchingServiceImpl implements MatchingService{
 
 
     @Override
-    public List<DiaryDTO> findUnknownDiary(Long memberID) {
-        int matchingCount = matchingRepository.findAllByMemberID(memberID).size();
-        List<DiaryDTO> diaryDTOs = new ArrayList<>();
+    public List<DiaryDTO.unKnownMatchingDiary> findUnknownDiary(Long memberID) {
+
+        List<Matching> matchingList = matchingRepository.findAllByMemberID(memberID);
+        int matchingCount = matchingList.size();
+        List<DiaryDTO.unKnownMatchingDiary> diaryDTOs = new ArrayList<>();
 
         if(matchingCount > 0){
-            DiaryDTO diaryDTO = DiaryDTO.builder()
-                    .memberID(memberID)
-                    .color("#000000")
-                    .state(true)
-                    .build();
             for (int i=0; i<matchingCount; i++) {
+                DiaryDTO.unKnownMatchingDiary diaryDTO = DiaryDTO.unKnownMatchingDiary.builder()
+                        .memberID(memberID)
+                        .color("#000000")
+                        .state(true)
+                        .matchingID(matchingList.get(i).getMatchingID())
+                        .build();
                 diaryDTOs.add(diaryDTO);
             }
         }