Merge pull request #91 from dnd-side-project/feature/55-order-saved-notes

feat: 저장된 쪽지에 정렬기준 추가

Author: ohhamma

src/main/java/com/example/wini/domain/note/controller/NoteController.java

@@ -2,6 +2,7 @@
 
 import com.example.wini.domain.note.dto.request.NoteCreateRequest;
 import com.example.wini.domain.note.dto.response.NoteResponse;
+import com.example.wini.domain.note.dto.response.SimpleNoteResponse;
 import com.example.wini.domain.note.service.NoteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,15 +27,17 @@ public NoteResponse getNote(@PathVariable Long noteId) {
     }
 
     @GetMapping("/latest")
-    @Operation(summary = "최근 받은 쪽지 리스트 조회", description = "24시간 내 받은 쪽지 목록을 반환합니다.")
-    public List<NoteResponse> getLatestNotes() {
-        return noteService.findLatestNotes();
+    @Operation(summary = "최근 받은 쪽지 리스트 조회", description = "24시간 내 받은 쪽지 목록을 최신순 정렬하여 반환합니다.")
+    public List<SimpleNoteResponse> getLatestNotes() {
+        return noteService.findLatestNotesSorted();
     }
 
     @GetMapping("/saved")
-    @Operation(summary = "보관된 쪽지 리스트 조회", description = "사용자가 저장한 쪽지 목록을 반환합니다.")
-    public List<NoteResponse> getSavedNotes() {
-        return noteService.findSavedNotes();
+    @Operation(summary = "보관된 쪽지 리스트 조회", description = "사용자가 저장한 쪽지 목록을 생성일시를 기준으로 정렬하여 반환합니다.")
+    public List<SimpleNoteResponse> getSavedNotes(
+            @RequestParam(value = "sort", required = false, defaultValue = "latest") String sort) {
+        // TODO : 페이징 추가 시 Pageable로 수정
+        return noteService.findSavedNotesSorted(sort);
     }
 
     @PostMapping

src/main/java/com/example/wini/domain/note/domain/SortOrder.java

@@ -0,0 +1,25 @@
+package com.example.wini.domain.note.domain;
+
+import static com.example.wini.global.error.exception.ErrorCode.SORT_ORDER_NOT_FOUND;
+
+import com.example.wini.global.error.exception.CustomException;
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum SortOrder {
+    ASC("oldest"),
+    DESC("latest"),
+    ;
+
+    private final String value;
+
+    public static SortOrder from(String value) {
+        return Arrays.stream(SortOrder.values())
+                .filter(sortOrder -> sortOrder.value.equals(value))
+                .findFirst()
+                .orElseThrow(() -> new CustomException(SORT_ORDER_NOT_FOUND));
+    }
+}

src/main/java/com/example/wini/domain/note/dto/response/SimpleNoteResponse.java

@@ -0,0 +1,12 @@
+package com.example.wini.domain.note.dto.response;
+
+import com.example.wini.domain.note.domain.Note;
+import com.example.wini.domain.template.dto.response.*;
+import java.time.LocalDateTime;
+
+public record SimpleNoteResponse(Long id, EmotionResponse emotion, boolean isRead, LocalDateTime createdAt) {
+    public static SimpleNoteResponse from(Note note) {
+        return new SimpleNoteResponse(
+                note.getId(), EmotionResponse.from(note.getEmotion()), note.isRead(), note.getCreatedAt());
+    }
+}

src/main/java/com/example/wini/domain/note/repository/NoteCustomRepository.java

@@ -3,6 +3,7 @@
 import com.example.wini.domain.log.dto.response.ActionChange;
 import com.example.wini.domain.log.dto.response.WeeklyNoteCount;
 import com.example.wini.domain.note.domain.Note;
+import com.example.wini.domain.note.domain.SortOrder;
 import com.example.wini.domain.template.domain.ActionCategory;
 import com.example.wini.domain.template.domain.EmotionType;
 import java.util.List;
@@ -11,9 +12,9 @@
 public interface NoteCustomRepository {
     Optional<Note> findFullNote(Long noteId);
 
-    List<Note> findLatestNotes(Long memberId, Long roomId);
+    List<Note> findLatestNotesSortedByCreatedAtDesc(Long memberId, Long roomId);
 
-    List<Note> findSavedNotes(Long memberId, Long roomId);
+    List<Note> findSavedNotesSortedByCreatedAt(Long memberId, Long roomId, SortOrder sortOrder);
 
     ActionChange findMostIncreasedPositiveActionChange(Long memberId, Long roomId);
 

src/main/java/com/example/wini/domain/note/repository/NoteCustomRepositoryImpl.java

@@ -7,8 +7,11 @@
 import com.example.wini.domain.log.dto.response.ActionChange;
 import com.example.wini.domain.log.dto.response.WeeklyNoteCount;
 import com.example.wini.domain.note.domain.Note;
+import com.example.wini.domain.note.domain.SortOrder;
 import com.example.wini.domain.template.domain.ActionCategory;
 import com.example.wini.domain.template.domain.EmotionType;
+import com.querydsl.core.types.Order;
+import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
@@ -47,18 +50,23 @@ public Optional<Note> findFullNote(Long noteId) {
     }
 
     @Override
-    public List<Note> findLatestNotes(Long memberId, Long roomId) {
+    public List<Note> findLatestNotesSortedByCreatedAtDesc(Long memberId, Long roomId) {
         return queryFactory
                 .selectFrom(note)
                 .where(isThisRoom(roomId).and(isReceiver(memberId)).and(isCreatedLatest()))
+                .orderBy(note.createdAt.desc())
                 .fetch();
     }
 
     @Override
-    public List<Note> findSavedNotes(Long memberId, Long roomId) {
+    public List<Note> findSavedNotesSortedByCreatedAt(Long memberId, Long roomId, SortOrder sortOrder) {
+        Order order = sortOrder == SortOrder.ASC ? Order.ASC : Order.DESC;
+        OrderSpecifier<?> orderSpecifier = new OrderSpecifier<>(order, note.createdAt);
+
         return queryFactory
                 .selectFrom(note)
                 .where(isThisRoom(roomId).and(isReceiver(memberId)).and(isSaved()))
+                .orderBy(orderSpecifier)
                 .fetch();
     }
 

src/main/java/com/example/wini/domain/note/service/NoteService.java

@@ -6,8 +6,10 @@
 import com.example.wini.domain.member.domain.Member;
 import com.example.wini.domain.member.repository.MemberRepository;
 import com.example.wini.domain.note.domain.Note;
+import com.example.wini.domain.note.domain.SortOrder;
 import com.example.wini.domain.note.dto.request.NoteCreateRequest;
 import com.example.wini.domain.note.dto.response.NoteResponse;
+import com.example.wini.domain.note.dto.response.SimpleNoteResponse;
 import com.example.wini.domain.note.repository.NoteRepository;
 import com.example.wini.domain.notification.domain.NotificationType;
 import com.example.wini.domain.notification.event.NotificationEvent;
@@ -54,23 +56,24 @@ public NoteResponse findNoteById(Long noteId) {
     }
 
     @Transactional(readOnly = true)
-    public List<NoteResponse> findLatestNotes() {
+    public List<SimpleNoteResponse> findLatestNotesSorted() {
         Member me = memberUtil.getCurrentMember();
         Room room = roomRepository
                 .findOpenRoomByMemberId(me.getId())
                 .orElseThrow(() -> new CustomException(ROOM_NOT_FOUND));
-        List<Note> notes = noteRepository.findLatestNotes(me.getId(), room.getId());
-        return notes.stream().map(NoteResponse::from).toList();
+        List<Note> notes = noteRepository.findLatestNotesSortedByCreatedAtDesc(me.getId(), room.getId());
+        return notes.stream().map(SimpleNoteResponse::from).toList();
     }
 
     @Transactional(readOnly = true)
-    public List<NoteResponse> findSavedNotes() {
+    public List<SimpleNoteResponse> findSavedNotesSorted(String sort) {
         Member me = memberUtil.getCurrentMember();
         Room room = roomRepository
                 .findOpenRoomByMemberId(me.getId())
                 .orElseThrow(() -> new CustomException(ROOM_NOT_FOUND));
-        List<Note> notes = noteRepository.findSavedNotes(me.getId(), room.getId());
-        return notes.stream().map(NoteResponse::from).toList();
+        SortOrder sortOrder = SortOrder.from(sort);
+        List<Note> notes = noteRepository.findSavedNotesSortedByCreatedAt(me.getId(), room.getId(), sortOrder);
+        return notes.stream().map(SimpleNoteResponse::from).toList();
     }
 
     @Transactional(readOnly = false)

src/main/java/com/example/wini/global/error/exception/ErrorCode.java

@@ -47,6 +47,7 @@ public enum ErrorCode {
     // Note
     NOTE_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 마음쪽지입니다."),
     NOTE_RECEIVER_MISMATCH(HttpStatus.BAD_REQUEST, "마음쪽지의 수신자가 아닙니다."),
+    SORT_ORDER_NOT_FOUND(HttpStatus.BAD_REQUEST, "잘못된 정렬 순서입니다."),
 
     // Template
     EMOTION_TYPE_NOT_FOUND(HttpStatus.BAD_REQUEST, "잘못된 감정 분류입니다."),