Skip to content

Commit 70acbdf

Browse files
authored
Merge pull request #210 from DevKor-github/main
[Merge] main to deploy
2 parents bc5bce3 + 66368f5 commit 70acbdf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

ontime-back/src/main/java/devkor/ontime_back/config/SwaggerConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
import org.springframework.context.annotation.Configuration;
1414

1515
@Configuration
16-
//@OpenAPIDefinition(
17-
// servers = {
18-
// @Server(url = "https://ontime.devkor.club", description = "Production Server")
19-
// }
20-
//)
16+
@OpenAPIDefinition(
17+
servers = {
18+
@Server(url = "https://ontime.devkor.club", description = "Production Server")
19+
}
20+
)
2121
public class SwaggerConfig {
2222
@Bean
2323
public OpenAPI openAPI() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public ResponseEntity<ApiResponseForm<List<LatenessHistoryResponse>>> getLatenes
219219
)),
220220
@ApiResponse(responseCode = "4XX", description = "준비과정 조회 실패", content = @Content(mediaType = "application/json", schema = @Schema(example = "실패 메세지(정확히 어떤 메세지인지는 모름)")))
221221
})
222-
@GetMapping("/{scheduleId}/preparation")
222+
@GetMapping("/{scheduleId}/preparations")
223223
public ResponseEntity<ApiResponseForm<List<PreparationDto>>> getPreparation(HttpServletRequest request, @PathVariable UUID scheduleId) {
224224
Long userId = userAuthService.getUserIdFromToken(request);
225225
List<PreparationDto> preparationDtoList = scheduleService.getPreparations(userId, scheduleId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void getPreparation_success() throws Exception {
212212
when(scheduleService.getPreparations(userId, scheduleId)).thenReturn(mockPreparations);
213213

214214
// when & then
215-
mockMvc.perform(get("/schedules/{scheduleId}/preparation", scheduleId)
215+
mockMvc.perform(get("/schedules/{scheduleId}/preparations", scheduleId)
216216
.header("Authorization", "Bearer test-token")
217217
.contentType(MediaType.APPLICATION_JSON))
218218
.andExpect(status().isOk()) // HTTP 200 확인

0 commit comments

Comments
 (0)