Merge branch 'develop' of https://github.com/Donggrina/Backend into d…

…evelop
Donggrina · Jun 21, 2024 · 3f89187 · 3f89187
2 parents 86c5fac + d2ed4a7
commit 3f89187
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/com/codeit/donggrina/domain/diary/dto/request/DiarySearchRequest.java b/src/main/java/com/codeit/donggrina/domain/diary/dto/request/DiarySearchRequest.java
@@ -1,12 +1,8 @@
 package com.codeit.donggrina.domain.diary.dto.request;
 
-import jakarta.validation.constraints.NotNull;
-import java.time.LocalDate;
 import java.util.List;
 
 public record DiarySearchRequest(
-    @NotNull(message = "날짜를 입력해주세요")
-    LocalDate date,
     List<Long> petIds,
     List<String> authors,
     String keyword

diff --git a/src/main/java/com/codeit/donggrina/domain/diary/repository/CustomDiaryRepositoryImpl.java b/src/main/java/com/codeit/donggrina/domain/diary/repository/CustomDiaryRepositoryImpl.java
@@ -46,7 +46,6 @@ public List<Diary> searchDiaries(DiarySearchRequest request, Group group) {
             .leftJoin(pet.profileImage).fetchJoin()
             .where(
                 eqGroup(group),
-                eqDate(request.date()),
                 eqAuthor(request.authors()),
                 eqPet(request.petIds()),
                 eqKeyword(request.keyword())
@@ -58,10 +57,6 @@ private BooleanExpression eqGroup(Group group) {
         return diary.group.eq(group);
     }
 
-    private BooleanExpression eqDate(LocalDate date) {
-        return diary.date.eq(date);
-    }
-
     private BooleanBuilder eqAuthor(List<String> authors) {
         if (authors == null) {
             return null;

diff --git a/src/main/java/com/codeit/donggrina/domain/diary/service/DiaryService.java b/src/main/java/com/codeit/donggrina/domain/diary/service/DiaryService.java
@@ -104,7 +104,7 @@ public void updateDiary(Long diaryId, DiaryUpdateRequest diaryUpdateRequest, Lon
             )
             .toList();
 
-        List<DiaryImage> images = new ArrayList<>();
+        List<DiaryImage> images = targetDiary.getDiaryImages();
         if (diaryUpdateRequest.images() != null) {
             images = diaryUpdateRequest.images().stream()
                 .map((imageId) ->
@@ -195,6 +195,7 @@ public DiaryFindResponse findDiary(Long diaryId, Long memberId) {
 
         List<String> contentImages = foundDiary.getDiaryImages().stream()
             .map(DiaryImage::getUrl)
+            .distinct()
             .toList();
 
         Optional<Heart> favoriteOptional = heartRepository.findByMemberIdAndDiary(memberId,

diff --git a/src/main/java/com/codeit/donggrina/domain/story/service/StoryService.java b/src/main/java/com/codeit/donggrina/domain/story/service/StoryService.java
@@ -115,6 +115,7 @@ public StoryFindResponse findStory(Long diaryId, Long memberId) {
 
         List<String> petImages = foundStory.getDiaryPets().stream()
             .map(diaryPet -> diaryPet.getPet().getProfileImage().getUrl())
+            .sorted()
             .toList();
 
         Member author = foundStory.getMember();
@@ -158,6 +159,7 @@ public StoryFindListPage findStories(Long memberId, Pageable pageable) {
 
                 List<String> petImages = diary.getDiaryPets().stream()
                     .map(diaryPet -> diaryPet.getPet().getProfileImage().getUrl())
+                    .sorted()
                     .toList();
 
                 Member author = diary.getMember();