Merge pull request #49 from Capstone-Richam/feature/39-mail

[feat]: Main 메일 목록 시간순 정렬
Capstone-Richam · Dec 8, 2023 · 6fd6724 · 6fd6724
2 parents 3e5eecb + fde5717
commit 6fd6724
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/Nunbody/domain/Mail/repository/MailRepository.java b/src/main/java/com/Nunbody/domain/Mail/repository/MailRepository.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 public interface MailRepository extends JpaRepository<MailHeader,Long> {
-    Page<MailHeader> findAllByMemberId(Long id, Pageable pageable);
-    List<MailHeader> findAllByMemberId(Long id);
-    Page<MailHeader> findAllByMemberIdAndPlatformType(Long memberId, PlatformType platformType, Pageable pageable);
+    Page<MailHeader> findAllByMemberIdOrderByDate(Long id, Pageable pageable);
+    List<MailHeader> findAllByMemberIdOrderByDate(Long id);
+    Page<MailHeader> findAllByMemberIdAndPlatformTypeOrderByDate(Long memberId, PlatformType platformType, Pageable pageable);
 }
diff --git a/src/main/java/com/Nunbody/domain/Mail/service/FilterService.java b/src/main/java/com/Nunbody/domain/Mail/service/FilterService.java
@@ -230,7 +230,7 @@ private Datum<String, String> makeDatum(String label, String feature) {
         return new BasicDatum<>(Collections.singleton(label), feature);
     }
     private List<MailHeader> getMailHeaderList(Long memberId){
-        return mailRepository.findAllByMemberId(memberId);
+        return mailRepository.findAllByMemberIdOrderByDate(memberId);
     }
     private MailBody getMailBody(Long mailId){
         return mailBodyRepository.findByMailId(mailId);

diff --git a/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java b/src/main/java/com/Nunbody/domain/mail/service/MailManageService.java
@@ -35,11 +35,11 @@ public Page<MailResponseDto> getMailList(Long memberId, String type, Pageable pa
     }
     private Page<MailResponseDto> createMailListResponseDtoList(Long memberId, String type, Pageable pageable){
         if(type.equals("ALL")){
-            Page<MailHeader> mailHeaderPage = mailRepository.findAllByMemberId(memberId, pageable);
+            Page<MailHeader> mailHeaderPage = mailRepository.findAllByMemberIdOrderByDate(memberId, pageable);
             return mailHeaderPage.map(mailHeader -> MailResponseDto.of(mailHeader));
 
         }
-        Page<MailHeader> mailHeaderPage = mailRepository.findAllByMemberIdAndPlatformType(memberId, PlatformType.getEnumPlatformTypeFromStringPlatformType(type),pageable);
+        Page<MailHeader> mailHeaderPage = mailRepository.findAllByMemberIdAndPlatformTypeOrderByDate(memberId, PlatformType.getEnumPlatformTypeFromStringPlatformType(type),pageable);
         return mailHeaderPage.map(mailHeader -> MailResponseDto.of(mailHeader));
     }
     public String validateConnect(ValidateRequestDto validateRequestDto) throws MessagingException {