diff --git a/src/main/java/org/dallili/secretfriends/controller/DiaryController.java b/src/main/java/org/dallili/secretfriends/controller/DiaryController.java index 6e9a1d6..58b80c4 100644 --- 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 diaryDTOList(@RequestParam("state") Boolean state, Au Long memberID = Long.parseLong(authentication.getName()); List diaries = diaryService.findStateDiaries(memberID, state); - List unknownMatchingDiary = matchingService.findUnknownDiary(memberID); - - List allDiaries = new ArrayList<>(); - allDiaries.addAll(diaries); - allDiaries.addAll(unknownMatchingDiary); + List unknownMatchingDiary = matchingService.findUnknownDiary(memberID); Map 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 index 6996665..b608bce 100644 --- 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 index d75be37..ac79266 100644 --- 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 findUnknownDiary(Long memberID); + List 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 index e28b446..9f1c1f7 100644 --- 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 findUnknownDiary(Long memberID) { - int matchingCount = matchingRepository.findAllByMemberID(memberID).size(); - List diaryDTOs = new ArrayList<>(); + public List findUnknownDiary(Long memberID) { + + List matchingList = matchingRepository.findAllByMemberID(memberID); + int matchingCount = matchingList.size(); + List diaryDTOs = new ArrayList<>(); if(matchingCount > 0){ - DiaryDTO diaryDTO = DiaryDTO.builder() - .memberID(memberID) - .color("#000000") - .state(true) - .build(); for (int i=0; i