Merge pull request #171 from DevKor-github/main

[Merge] main to deploy

Author: jjjh02

ontime-back/src/main/java/devkor/ontime_back/controller/PreparationScheduleController.java

@@ -70,7 +70,7 @@ public ResponseEntity<ApiResponseForm<Void>> createPreparationSchedule(HttpServl
             @ApiResponse(responseCode = "4XX", description = "잘못된 요청", content = @Content(mediaType = "application/json", schema = @Schema(example = "실패 메세지(정확히 어떤 메세지인지는 모름)")))
     })
     @PostMapping("/modify/{scheduleId}")
-    public ResponseEntity<ApiResponseForm<Void>> modifyPreparationUser(HttpServletRequest request, @Parameter(description = "스케줄 ID (UUID 형식)", required = true, example = "3fa85f64-5717-4562-b3fc-2c963f66afe5") @PathVariable UUID scheduleId, @RequestBody List<PreparationDto> preparationDtoList) {
+    public ResponseEntity<ApiResponseForm<Void>> modifyPreparationSchedule(HttpServletRequest request, @Parameter(description = "스케줄 ID (UUID 형식)", required = true, example = "3fa85f64-5717-4562-b3fc-2c963f66afe5") @PathVariable UUID scheduleId, @RequestBody List<PreparationDto> preparationDtoList) {
         Long userId = userAuthService.getUserIdFromToken(request);
 
         preparationScheduleService.updatePreparationSchedules(userId, scheduleId, preparationDtoList);

ontime-back/src/test/java/devkor/ontime_back/ControllerTestSupport.java

@@ -17,7 +17,8 @@
                 UserController.class,
                 ScheduleController.class,
                 FriendShipController.class,
-                PreparationUserController.class
+                PreparationUserController.class,
+                PreparationScheduleController.class
         }
 )
 public abstract class ControllerTestSupport {
@@ -43,6 +44,9 @@ public abstract class ControllerTestSupport {
     @MockBean
     protected PreparationUserService preparationUserService;
 
+    @MockBean
+    protected PreparationScheduleService preparationScheduleService;
+
     @MockBean
     protected UserRepository userRepository;
 

ontime-back/src/test/java/devkor/ontime_back/controller/PreparationScheduleControllerTest.java

@@ -0,0 +1,88 @@
+package devkor.ontime_back.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import devkor.ontime_back.ControllerTestSupport;
+import devkor.ontime_back.TestSecurityConfig;
+import devkor.ontime_back.dto.PreparationDto;
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Import(TestSecurityConfig.class)
+public class PreparationScheduleControllerTest extends ControllerTestSupport {
+
+    @Test
+    @DisplayName("스케줄별 준비과정 생성에 성공한다.")
+    void createPreparationSchedule_success() throws Exception {
+        // given
+        UUID scheduleId = UUID.randomUUID();
+        Long userId = 1L;
+
+        List<PreparationDto> preparationDtoList = List.of(
+                new PreparationDto(UUID.randomUUID(), "세면", 10, UUID.randomUUID()),
+                new PreparationDto(UUID.randomUUID(), "옷입기", 15, null)
+        );
+
+        when(userAuthService.getUserIdFromToken(any(HttpServletRequest.class))).thenReturn(userId);
+        doNothing().when(preparationScheduleService).makePreparationSchedules(eq(userId), eq(scheduleId), any());
+
+        // when & then
+        mockMvc.perform(post("/preparationschedule/create/{scheduleId}", scheduleId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(new ObjectMapper().writeValueAsString(preparationDtoList))
+                        .with(csrf()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("200"))
+                .andExpect(jsonPath("$.status").value("success"))
+                .andExpect(jsonPath("$.message").value("OK"));
+
+        verify(userAuthService, times(1)).getUserIdFromToken(any(HttpServletRequest.class));
+        verify(preparationScheduleService, times(1))
+                .makePreparationSchedules(eq(userId), eq(scheduleId), argThat(list -> list.size() == preparationDtoList.size()));
+    }
+
+    @Test
+    @DisplayName("스케줄별 준비과정 수정에 성공한다.")
+    void modifyPreparationSchedule_success() throws Exception {
+        // given
+        UUID scheduleId = UUID.randomUUID();
+        Long userId = 1L;
+
+        List<PreparationDto> preparationDtoList = List.of(
+                new PreparationDto(UUID.randomUUID(), "세면", 10, UUID.randomUUID()),
+                new PreparationDto(UUID.randomUUID(), "옷입기", 15, null)
+        );
+
+        when(userAuthService.getUserIdFromToken(any(HttpServletRequest.class))).thenReturn(userId);
+        doNothing().when(preparationScheduleService).updatePreparationSchedules(eq(userId), eq(scheduleId), any());
+
+        // when & then
+        mockMvc.perform(post("/preparationschedule/modify/{scheduleId}", scheduleId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(new ObjectMapper().writeValueAsString(preparationDtoList))
+                        .with(csrf()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value("200"))
+                .andExpect(jsonPath("$.status").value("success"))
+                .andExpect(jsonPath("$.message").value("OK"));
+
+        verify(userAuthService, times(1)).getUserIdFromToken(any(HttpServletRequest.class));
+        verify(preparationScheduleService, times(1))
+                .updatePreparationSchedules(eq(userId), eq(scheduleId), argThat(list -> list.size() == preparationDtoList.size()));
+    }
+
+}