DayLog의 Item들 순서 변경 기능 구현

backend/src/docs/asciidoc/docs.adoc

@@ -44,9 +44,9 @@ include::{snippets}/trip-controller-test/get-trips/http-request.adoc[]
 
 ==== 응답
 include::{snippets}/trip-controller-test/get-trips/http-response.adoc[]
-include::{snippets}/day-log-controller-test/get-trip/response-fields.adoc[]
+include::{snippets}/trip-controller-test/get-trips/response-fields.adoc[]
 
-=== 단일 여행 생성 (POST /trips/:tripId/daylogs/:dayLogId)
+=== 단일 여행 생성 (POST /trips)
 
 ==== 요청
 include::{snippets}/trip-controller-test/create-trip/http-request.adoc[]
@@ -115,6 +115,15 @@ include::{snippets}/day-log-controller-test/update-day-log-title/request-fields.
 include::{snippets}/day-log-controller-test/update-day-log-title/http-response.adoc[]
 
 
+=== DayLog 아이템들 순서 수정 (PATCH /trips/:tripId/daylogs/:dayLogId/order)
+
+==== 요청
+include::{snippets}/day-log-controller-test/update-ordinal-of-items/http-request.adoc[]
+include::{snippets}/day-log-controller-test/update-ordinal-of-items/path-parameters.adoc[]
+include::{snippets}/day-log-controller-test/update-ordinal-of-items/request-fields.adoc[]
+
+==== 응답
+include::{snippets}/day-log-controller-test/update-day-log-title/http-response.adoc[]
 
 == 여행 아이템 API
 

backend/src/main/java/hanglog/global/exception/ExceptionCode.java

@@ -22,7 +22,9 @@ public enum ExceptionCode {
     ALREADY_DELETED_TRIP_ITEM(2001, "이미 삭제된 여행 아이템입니다."),
     ALREADY_DELETED_DATE(2002, "이미 삭제된 날짜입니다."),
 
-    INVALID_RATING(3001, "별점은 N.0점이거나 N.5점 형태이어야 합니다.");
+    INVALID_RATING(3001, "별점은 N.0점이거나 N.5점 형태이어야 합니다."),
+
+    INVALID_ORDERED_ITEM_IDS(4001, "날짜에 속한 모든 여행 아이템들의 ID가 필요합니다.");
 
     private final int code;
     private final String message;

backend/src/main/java/hanglog/trip/domain/Item.java

@@ -116,9 +116,10 @@ public Item(
             final String memo,
             final Place place,
             final DayLog dayLog,
-            final Expense expense
+            final Expense expense,
+            final List<Image> images
     ) {
-        this(id, itemType, title, ordinal, rating, memo, place, dayLog, expense, new ArrayList<>(), USABLE);
+        this(id, itemType, title, ordinal, rating, memo, place, dayLog, expense, images, USABLE);
     }
 
     public Item(
@@ -130,10 +131,9 @@ public Item(
             final String memo,
             final Place place,
             final DayLog dayLog,
-            final Expense expense,
-            final List<Image> images
+            final Expense expense
     ) {
-        this(id, itemType, title, ordinal, rating, memo, place, dayLog, expense, images, USABLE);
+        this(id, itemType, title, ordinal, rating, memo, place, dayLog, expense, new ArrayList<>(), USABLE);
     }
 
     public Item(
@@ -144,10 +144,9 @@ public Item(
             final Double rating,
             final String memo,
             final DayLog dayLog,
-            final Expense expense,
-            final List<Image> images
+            final Expense expense
     ) {
-        this(id, itemType, title, ordinal, rating, memo, null, dayLog, expense, images, USABLE);
+        this(id, itemType, title, ordinal, rating, memo, null, dayLog, expense, new ArrayList<>());
     }
 
     public Item(
@@ -164,22 +163,13 @@ public Item(
         this(null, itemType, title, ordinal, rating, memo, place, dayLog, expense, images);
     }
 
-    public Item(
-            final Long id,
-            final ItemType itemType,
-            final String title,
-            final Integer ordinal,
-            final Double rating,
-            final String memo,
-            final DayLog dayLog,
-            final Expense expense
-    ) {
-        this(id, itemType, title, ordinal, rating, memo, null, dayLog, expense, new ArrayList<>());
-    }
-
     private void validateRatingFormat(final Double rating) {
         if (rating % RATING_DECIMAL_UNIT != 0) {
             throw new InvalidDomainException(INVALID_RATING);
         }
     }
+
+    public void changeOrdinal(final int ordinal) {
+        this.ordinal = ordinal;
+    }
 }

backend/src/main/java/hanglog/trip/dto/request/ItemsOrdinalUpdateRequest.java

@@ -0,0 +1,15 @@
+package hanglog.trip.dto.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ItemsOrdinalUpdateRequest {
+    @NotEmpty(message = "아이템 아이디들을 입력해주세요.")
+    private List<Long> itemIds;
+}

backend/src/main/java/hanglog/trip/presentation/DayLogController.java

@@ -2,6 +2,7 @@
 
 
 import hanglog.trip.dto.request.DayLogUpdateTitleRequest;
+import hanglog.trip.dto.request.ItemsOrdinalUpdateRequest;
 import hanglog.trip.dto.response.DayLogGetResponse;
 import hanglog.trip.service.DayLogService;
 import jakarta.validation.Valid;
@@ -37,4 +38,13 @@ public ResponseEntity<Void> updateDayLogTitle(
         dayLogService.updateTitle(dayLogId, request);
         return ResponseEntity.noContent().build();
     }
+
+    @PatchMapping("/order")
+    public ResponseEntity<Void> updateOrdinalOfItems(
+            @PathVariable final Long tripId,
+            @PathVariable final Long dayLogId,
+            @RequestBody @Valid final ItemsOrdinalUpdateRequest itemsOrdinalUpdateRequest) {
+        dayLogService.updateOrdinalOfDayLogItems(dayLogId, itemsOrdinalUpdateRequest);
+        return ResponseEntity.noContent().build();
+    }
 }

backend/src/main/java/hanglog/trip/service/DayLogService.java

@@ -2,14 +2,20 @@
 
 
 import static hanglog.global.exception.ExceptionCode.ALREADY_DELETED_DATE;
+import static hanglog.global.exception.ExceptionCode.INVALID_ORDERED_ITEM_IDS;
 import static hanglog.global.exception.ExceptionCode.NOT_FOUND_DAY_LOG_ID;
 import static hanglog.global.exception.ExceptionCode.NOT_FOUND_TRIP_ID;
+import static hanglog.global.exception.ExceptionCode.NOT_FOUND_TRIP_ITEM_ID;
 
 import hanglog.global.exception.BadRequestException;
 import hanglog.trip.domain.DayLog;
+import hanglog.trip.domain.Item;
 import hanglog.trip.domain.repository.DayLogRepository;
+import hanglog.trip.domain.repository.ItemRepository;
 import hanglog.trip.dto.request.DayLogUpdateTitleRequest;
+import hanglog.trip.dto.request.ItemsOrdinalUpdateRequest;
 import hanglog.trip.dto.response.DayLogGetResponse;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +26,7 @@
 public class DayLogService {
 
     private final DayLogRepository dayLogRepository;
+    private final ItemRepository itemRepository;
 
     @Transactional(readOnly = true)
     public DayLogGetResponse getById(final Long id) {
@@ -50,4 +57,33 @@ private void validateAlreadyDeleted(final DayLog dayLog) {
             throw new BadRequestException(ALREADY_DELETED_DATE);
         }
     }
+
+    public void updateOrdinalOfDayLogItems(final Long dayLogId,
+                                           final ItemsOrdinalUpdateRequest itemsOrdinalUpdateRequest) {
+        final DayLog dayLog = dayLogRepository.findById(dayLogId)
+                .orElseThrow(() -> new BadRequestException(NOT_FOUND_DAY_LOG_ID));
+        final List<Item> items = dayLog.getItems();
+
+        final List<Long> orderedItemIds = itemsOrdinalUpdateRequest.getItemIds();
+        validateOrderedItemIds(items, orderedItemIds);
+        changeOrdinalOfItemsByOrderedItemIds(orderedItemIds);
+    }
+
+    private void validateOrderedItemIds(final List<Item> items, final List<Long> orderedItemIds) {
+        for (final Item item : items) {
+            if (!orderedItemIds.contains(item.getId())) {
+                throw new BadRequestException(INVALID_ORDERED_ITEM_IDS);
+            }
+        }
+    }
+
+    private void changeOrdinalOfItemsByOrderedItemIds(final List<Long> orderedItemIds) {
+        int ordinal = 1;
+
+        for (final Long itemId : orderedItemIds) {
+            final Item item = itemRepository.findById(itemId)
+                    .orElseThrow(() -> new BadRequestException(NOT_FOUND_TRIP_ITEM_ID));
+            item.changeOrdinal(ordinal++);
+        }
+    }
 }

backend/src/test/java/hanglog/trip/fixture/ItemFixture.java

@@ -6,7 +6,7 @@
 
 public final class ItemFixture {
 
-    private static final DayLog DAYLOG_FOR_ITEM_FIXTURE = new DayLog(
+    public static final DayLog DAYLOG_FOR_ITEM_FIXTURE = new DayLog(
             "첫날",
             1,
             TripFixture.LONDON_TRIP
@@ -34,4 +34,15 @@ public final class ItemFixture {
             DAYLOG_FOR_ITEM_FIXTURE,
             ExpenseFixture.EURO_10000
     );
+
+    public static final Item AIRPLANE_ITEM = new Item(
+            3L,
+            ItemType.NON_SPOT,
+            "비행기",
+            3,
+            4.5,
+            "런던에서 탄 비행기",
+            DAYLOG_FOR_ITEM_FIXTURE,
+            ExpenseFixture.EURO_10000
+    );
 }

backend/src/test/java/hanglog/trip/presentation/DayLogControllerTest.java

@@ -15,13 +15,16 @@
 import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import hanglog.trip.dto.request.DayLogUpdateTitleRequest;
+import hanglog.trip.dto.request.ItemsOrdinalUpdateRequest;
 import hanglog.trip.dto.response.DayLogGetResponse;
 import hanglog.trip.restdocs.RestDocsTest;
 import hanglog.trip.service.DayLogService;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,4 +125,35 @@ void updateDayLogTitle() throws Exception {
                         )
                 );
     }
+
+    @DisplayName("데이로그의 아이템들 순서를 변경할 수 있다.")
+    @Test
+    void updateOrdinalOfItems() throws Exception {
+        //given
+        final ItemsOrdinalUpdateRequest request = new ItemsOrdinalUpdateRequest(List.of(3L,2L,1L));
+
+        doNothing().when(dayLogService).updateOrdinalOfDayLogItems( any(), any());
+
+        // when & then
+        mockMvc.perform(patch("/trips/{tripId}/daylogs/{dayLogId}/order", 1L, 1L)
+                        .contentType(APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().isNoContent())
+                .andDo(
+                        restDocs.document(
+                                pathParameters(
+                                        parameterWithName("tripId")
+                                                .description("여행 ID"),
+                                        parameterWithName("dayLogId")
+                                                .description("날짜별 기록 ID")
+                                ),
+                                requestFields(
+                                        fieldWithPath("itemIds")
+                                                .type(JsonFieldType.ARRAY)
+                                                .description("정렬된 아이템의 IDs")
+                                                .attributes(field("constraint", "ID 배열"))
+                                )
+                        )
+                );
+    }
 }

backend/src/test/java/hanglog/trip/service/DayLogServiceTest.java

@@ -1,14 +1,20 @@
 package hanglog.trip.service;
 
-import static hanglog.trip.fixture.DayLogFixture.*;
+import static hanglog.trip.fixture.DayLogFixture.LONDON_DAYLOG_1;
+import static hanglog.trip.fixture.DayLogFixture.UPDATED_LONDON_DAYLOG;
+import static hanglog.trip.fixture.ItemFixture.DAYLOG_FOR_ITEM_FIXTURE;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
 
 import hanglog.trip.domain.DayLog;
+import hanglog.trip.domain.Item;
 import hanglog.trip.domain.repository.DayLogRepository;
+import hanglog.trip.domain.repository.ItemRepository;
 import hanglog.trip.dto.request.DayLogUpdateTitleRequest;
+import hanglog.trip.dto.request.ItemsOrdinalUpdateRequest;
 import hanglog.trip.dto.response.DayLogGetResponse;
 import java.time.LocalDate;
 import java.util.List;
@@ -29,6 +35,9 @@ class DayLogServiceTest {
     @Mock
     private DayLogRepository dayLogRepository;
 
+    @Mock
+    private ItemRepository itemRepository;
+
     @DisplayName("날짜별 여행을 조회할 수 있다.")
     @Test
     void getDayLogById() {
@@ -68,4 +77,30 @@ void updateTitle() {
         verify(dayLogRepository).findById(UPDATED_LONDON_DAYLOG.getId());
         verify(dayLogRepository).save(any(DayLog.class));
     }
+
+    @DisplayName("정렬된 아이템 ID 리스트를 받아 아이템들의 순서를 변경한다.")
+    @Test
+    void updateItemOrdinals() {
+        // given
+        final ItemsOrdinalUpdateRequest request = new ItemsOrdinalUpdateRequest(List.of(3L, 2L, 1L));
+        given(dayLogRepository.findById(1L))
+                .willReturn(Optional.of(DAYLOG_FOR_ITEM_FIXTURE));
+        given(itemRepository.findById(1L))
+                .willReturn(Optional.ofNullable(DAYLOG_FOR_ITEM_FIXTURE.getItems().get(0)));
+        given(itemRepository.findById(2L))
+                .willReturn(Optional.ofNullable(DAYLOG_FOR_ITEM_FIXTURE.getItems().get(1)));
+        given(itemRepository.findById(3L))
+                .willReturn(Optional.ofNullable(DAYLOG_FOR_ITEM_FIXTURE.getItems().get(2)));
+
+        // when
+        dayLogService.updateOrdinalOfDayLogItems(1L, request);
+
+        // then
+        List<Item> items = DAYLOG_FOR_ITEM_FIXTURE.getItems();
+        assertSoftly(softly -> {
+            softly.assertThat(items.get(0).getOrdinal()).isEqualTo(3);
+            softly.assertThat(items.get(1).getOrdinal()).isEqualTo(2);
+            softly.assertThat(items.get(2).getOrdinal()).isEqualTo(1);
+        });
+    }
 }