From 850524e3e6634f3df1a7439fd76faa83af62ec96 Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:23:09 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20[#41]=20CategoryApi=20=EC=8A=A4?= =?UTF-8?q?=EC=9B=A8=EA=B1=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/jaksim/category/api/CategoryApi.java | 127 ++++++++++++++++++ .../category/api/CategoryApiController.java | 6 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApi.java diff --git a/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApi.java b/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApi.java new file mode 100644 index 0000000..fa0954e --- /dev/null +++ b/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApi.java @@ -0,0 +1,127 @@ +package org.sopt.jaksim.category.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.sopt.jaksim.category.dto.CategoryCreateRequest; +import org.sopt.jaksim.global.common.BaseResponse; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; + +@Tag(name = "Category 관련 API") +@SecurityRequirement(name = "Authorization") +public interface CategoryApi { + + @Operation( + summary = "카테고리 생성 API", + responses = { + @ApiResponse( + responseCode = "201", + description = "요청이 성공했습니다."), + + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> create(@RequestBody CategoryCreateRequest request); + + + + @Operation( + summary = "전체 카테고리, 태스크 조희 API (홈뷰)", + responses = { + @ApiResponse( + responseCode = "201", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다", + content = @Content), + + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.", + content = @Content)}) + + public ResponseEntity> retrieve(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, + @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate); + + @Operation( + summary = "카테고리 조희 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + ResponseEntity> getCategoriesByUserId(); + +} diff --git a/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApiController.java b/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApiController.java index 2eb0584..222fcd4 100644 --- a/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApiController.java +++ b/jaksim/src/main/java/org/sopt/jaksim/category/api/CategoryApiController.java @@ -22,24 +22,28 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") -public class CategoryApiController { +public class CategoryApiController implements CategoryApi{ private final CategoryService categoryService; private final CategoryTaskFacade categoryTaskFacade; @PostMapping("/categories") + @Override public ResponseEntity> create(@RequestBody CategoryCreateRequest request) { categoryService.create(request); return ApiResponseUtil.success(SuccessMessage.SUCCESS); } @GetMapping("/resources") + @Override public ResponseEntity> retrieve(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) { List response = categoryTaskFacade.getAllResources(startDate, endDate); return ApiResponseUtil.success(SuccessMessage.SUCCESS, response); } + @GetMapping("/categories") + @Override public ResponseEntity> getCategoriesByUserId() { List categories = categoryService.getCategoriesByUserId(); // categoryRepository를 통해 데이터베이스에서 특정 사용자의 카테고리를 조회 return ApiResponseUtil.success(SuccessMessage.SUCCESS, categories); // 성공 응답 반환 From 02b474b337c662a56b31c7c6da2bd2808308614a Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:23:25 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Fix=20[#41]=20TaskApi=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/jaksim/task/api/TaskApi.java | 107 ++++++++++++++++++ .../jaksim/task/api/TaskApiController.java | 5 +- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApi.java diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApi.java b/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApi.java new file mode 100644 index 0000000..10c9017 --- /dev/null +++ b/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApi.java @@ -0,0 +1,107 @@ +package org.sopt.jaksim.task.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.sopt.jaksim.global.common.BaseResponse; +import org.sopt.jaksim.task.dto.TaskCreateRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + + +@Tag(name = "태스크 관련 API") +@SecurityRequirement(name = "Authorization") +public interface TaskApi { + @Operation( + summary = "URL로 탭 이름 가져오기 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "요청된 url이 유효하지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> fetchTitle(@RequestParam("requestUrl") String requestUrl); + + @Operation( + summary = "태스크 생성 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다."), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> create(@PathVariable("categoryId") Long categoryId, + @RequestBody TaskCreateRequest taskCreateRequest); + + + @Operation( + summary = "태스크 상태 변경 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다."), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "존재하지 않는 태스크입니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> toggleTaskStatus(@PathVariable("taskId") Long taskId); +} diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApiController.java b/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApiController.java index a1733cf..2d9cbda 100644 --- a/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApiController.java +++ b/jaksim/src/main/java/org/sopt/jaksim/task/api/TaskApiController.java @@ -25,10 +25,11 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") -public class TaskApiController { +public class TaskApiController implements TaskApi{ private final TaskService taskService; @GetMapping("/fetch-title") + @Override public ResponseEntity> fetchTitle(@RequestParam("requestUrl") String requestUrl) { try { Document doc = Jsoup.connect(requestUrl).get(); @@ -40,6 +41,7 @@ public ResponseEntity> fetchTitle(@RequestParam("requestUrl") St } @PostMapping("/categories/{categoryId}") + @Override public ResponseEntity> create(@PathVariable("categoryId") Long categoryId, @RequestBody TaskCreateRequest taskCreateRequest) { taskService.create(categoryId, taskCreateRequest); @@ -47,6 +49,7 @@ public ResponseEntity> create(@PathVariable("categoryId") Long c } @PatchMapping("/tasks/{taskId}/status") + @Override public ResponseEntity> toggleTaskStatus(@PathVariable("taskId") Long taskId) { taskService.toggleTaskCompletionStatus(taskId); return ApiResponseUtil.success(SuccessMessage.SUCCESS); From 7be4fe6239df5b54e9ddea1a4362981058776662 Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:23:35 +0900 Subject: [PATCH 3/6] =?UTF-8?q?Fix=20[#41]=20TimerApi=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/jaksim/task/api/TimerApi.java | 150 ++++++++++++++++++ .../jaksim/task/api/TimerApiController.java | 2 +- 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApi.java diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApi.java b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApi.java new file mode 100644 index 0000000..8f1d872 --- /dev/null +++ b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApi.java @@ -0,0 +1,150 @@ +package org.sopt.jaksim.task.api; + + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.sopt.jaksim.global.common.BaseResponse; +import org.sopt.jaksim.task.dto.StartTimerRequest; +import org.sopt.jaksim.task.dto.StopTimerRequest; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.time.LocalDate; + +@Tag(name = "타이머 관련 API") +@SecurityRequirement(name = "Authorization") +public interface TimerApi { + + @Operation( + summary = "오늘 나의 작업시간 조회 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "403", + description = "유효하지 않은 날짜 형식입니다. yyyyMMdd 형식으로 작성해주세요.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "targetDate가 오늘 날짜가 아닙니다.", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.", + content = @Content)}) + public ResponseEntity> getTotalTimeToday(@RequestParam("targetDate") String targetDate); + + @Operation( + summary = "타이머 정지 액션 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다."), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다", // + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.", + content = @Content)}) + public ResponseEntity> stopTimerAndFetchAccumulatedTime(@PathVariable Long taskId, @RequestBody StopTimerRequest stopTimerRequest); + + @Operation( + summary = "할일 추가 후 타이머 시작 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다."), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> startTimer(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate targetDate, + @RequestBody StartTimerRequest startTimerRequest); + + @Operation( + summary = "타이머 내 할 일 카드 리스트 조회 API", + responses = { + @ApiResponse( + responseCode = "200", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> getTodoCards(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate targetDate); +} diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java index 03593e7..94cfe56 100644 --- a/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java +++ b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java @@ -23,7 +23,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") -public class TimerApiController { +public class TimerApiController implements TimerApi{ private final TaskTimerService taskTimerService; private final UserTimerService userTimerService; From e4ea2e6e3d508de57bb1912c9a20576a2cfc23ff Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:25:10 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Fix=20[#41]=20MsetApi=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/jaksim/mset/api/MsetApi.java | 48 +++++++++++++++++++ .../jaksim/mset/api/MsetApiController.java | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApi.java diff --git a/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApi.java b/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApi.java new file mode 100644 index 0000000..a629d01 --- /dev/null +++ b/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApi.java @@ -0,0 +1,48 @@ +package org.sopt.jaksim.mset.api; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.sopt.jaksim.global.common.BaseResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; + +@Tag(name = "Mset 관련 API") +@SecurityRequirement(name = "Authorization") +public interface MsetApi { + @Operation( + summary = "다른 카테고리에서 모립세트 불러오기 API", + responses = { + @ApiResponse( + responseCode = "201", + description = "요청이 성공했습니다.", + content = @Content(schema = @Schema(implementation = BaseResponse.class))), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰이 만료되었습니다. 재발급 받아주세요.", + content = @Content), + @ApiResponse( + responseCode = "401", + description = "액세스 토큰의 값이 올바르지 않습니다.", + content = @Content), + @ApiResponse( + responseCode = "404", + description = "대상을 찾을 수 없습니다", + content = @Content), + @ApiResponse( + responseCode = "405", + description = "잘못된 HTTP method 요청입니다.", + content = @Content), + @ApiResponse( + responseCode = "500", + description = "서버 내부 오류입니다.")}) + public ResponseEntity> getFromOtherCategory(@PathVariable("categoryId") Long categoryId); + +} diff --git a/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApiController.java b/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApiController.java index 4876d53..767821e 100644 --- a/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApiController.java +++ b/jaksim/src/main/java/org/sopt/jaksim/mset/api/MsetApiController.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.coyote.Response; +import org.sopt.jaksim.category.api.CategoryApi; import org.sopt.jaksim.category.dto.CategoryMsetLinkResponse; import org.sopt.jaksim.category.facade.CategoryMsetFacade; import org.sopt.jaksim.global.common.ApiResponseUtil; @@ -18,10 +19,11 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") -public class MsetApiController { +public class MsetApiController implements MsetApi { private final CategoryMsetFacade categoryMsetFacade; @GetMapping("/mset/categories/{categoryId}") + @Override public ResponseEntity> getFromOtherCategory(@PathVariable("categoryId") Long categoryId) { CategoryMsetLinkResponse response = categoryMsetFacade.getFromOtherCategory(categoryId); return ApiResponseUtil.success(SuccessMessage.SUCCESS, response); From b5ac116276f2a2234861d6b9baa5aa6d26ce8800 Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:25:33 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Fix=20[#41]=20TimerApi=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/jaksim/task/api/TimerApiController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java index 94cfe56..d5be52a 100644 --- a/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java +++ b/jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java @@ -30,12 +30,14 @@ public class TimerApiController implements TimerApi{ private final TodoService todoService; @GetMapping("/timer") + @Override public ResponseEntity> getTotalTimeToday(@RequestParam("targetDate") String targetDate) { TotalTimeTodayResponse response = userTimerService.getTotalTimeToday(targetDate); return ApiResponseUtil.success(SuccessMessage.SUCCESS, response); } @PostMapping("/timer/stop/{taskId}") + @Override public ResponseEntity> stopTimerAndFetchAccumulatedTime(@PathVariable Long taskId, @RequestBody StopTimerRequest stopTimerRequest) { taskTimerService.calculateTaskTimerOnStop(taskId, stopTimerRequest); userTimerService.calculateUserTimerOnStop(stopTimerRequest); @@ -43,6 +45,7 @@ public ResponseEntity> stopTimerAndFetchAccumulatedTime(@PathVar } @PostMapping("/timer/start") + @Override public ResponseEntity> startTimer(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate targetDate, @RequestBody StartTimerRequest startTimerRequest) { todoService.startTimer(targetDate, startTimerRequest); @@ -50,6 +53,7 @@ public ResponseEntity> startTimer(@RequestParam @DateTimeFormat( } @GetMapping("/timer/todo-card") + @Override public ResponseEntity> getTodoCards(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate targetDate) { TodoCardResponse response = todoService.getTodoCard(targetDate); return ApiResponseUtil.success(SuccessMessage.SUCCESS, response); From 13af8e7ec844070e1401d61d5a3d0a06cde20b13 Mon Sep 17 00:00:00 2001 From: eunseo5343 <130284467+eunseo5343@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:25:43 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Fix=20[#41]=20=EC=9E=90=EC=9E=98=ED=95=9C?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/sopt/jaksim/user/api/SocialLiginTemp.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 jaksim/src/main/java/org/sopt/jaksim/user/api/SocialLiginTemp.java diff --git a/jaksim/src/main/java/org/sopt/jaksim/user/api/SocialLiginTemp.java b/jaksim/src/main/java/org/sopt/jaksim/user/api/SocialLiginTemp.java new file mode 100644 index 0000000..b2bc43d --- /dev/null +++ b/jaksim/src/main/java/org/sopt/jaksim/user/api/SocialLiginTemp.java @@ -0,0 +1,4 @@ +package org.sopt.jaksim.user.api; + +public interface SocialLiginTemp { +}