From fed45d577c6ec7bf3df3219b774a3c9a11dff12e Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 15:56:35 +0900 Subject: [PATCH 01/26] =?UTF-8?q?#18=20docs:=20=EC=9D=91=EC=9B=90=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC,=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/cheer/CheerController.java | 17 ++++++++++++++++ .../cheer/docs/CheerControllerSwagger.java | 12 +++++++++++ .../kr/co/api/cheer/rqrs/PhraseReadRs.java | 9 +++++++++ .../java/kr/co/api/point/PointController.java | 20 +++++++++++++++++++ .../point/docs/PointControllerSwagger.java | 17 ++++++++++++++++ .../kr/co/api/point/rqrs/PointReadRs.java | 9 +++++++++ 6 files changed, 84 insertions(+) create mode 100644 motimo-api/src/main/java/kr/co/api/cheer/CheerController.java create mode 100644 motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java create mode 100644 motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java create mode 100644 motimo-api/src/main/java/kr/co/api/point/PointController.java create mode 100644 motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java create mode 100644 motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java diff --git a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java new file mode 100644 index 00000000..e41a04a0 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java @@ -0,0 +1,17 @@ +package kr.co.api.cheer; + +import kr.co.api.cheer.docs.CheerControllerSwagger; +import kr.co.api.cheer.rqrs.PhraseReadRs; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/v1/cheers") +public class CheerController implements CheerControllerSwagger { + + @GetMapping + public PhraseReadRs readPhrase() { + return null; + } +} diff --git a/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java new file mode 100644 index 00000000..b3c00a28 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java @@ -0,0 +1,12 @@ +package kr.co.api.cheer.docs; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; +import kr.co.api.cheer.rqrs.PhraseReadRs; + +@Tag(name = "응원 API", description = "응원 관련 API 목록입니다") +public interface CheerControllerSwagger { + @Operation(summary = "응원 문구 조회 API", description = "응원 문구를 랜덤 조회합니다.") + PhraseReadRs readPhrase(); +} diff --git a/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java new file mode 100644 index 00000000..5b5334ef --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java @@ -0,0 +1,9 @@ +package kr.co.api.cheer.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record PhraseReadRs( + @Schema(description = "응원 문구", example = "목표는 멀어도 나는 계속 가는중") + String phrase +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/point/PointController.java b/motimo-api/src/main/java/kr/co/api/point/PointController.java new file mode 100644 index 00000000..3d9ed1c3 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/point/PointController.java @@ -0,0 +1,20 @@ +package kr.co.api.point; + +import kr.co.api.point.docs.PointControllerSwagger; +import kr.co.api.point.rqrs.PointReadRs; +import kr.co.api.security.annotation.AuthUser; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.UUID; + +@RestController +@RequestMapping("/v1/points") +public class PointController implements PointControllerSwagger { + + @GetMapping + public PointReadRs read(@AuthUser UUID userId) { + return null; + } +} diff --git a/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java new file mode 100644 index 00000000..65dd1d08 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java @@ -0,0 +1,17 @@ +package kr.co.api.point.docs; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import kr.co.api.point.rqrs.PointReadRs; +import kr.co.api.security.annotation.AuthUser; + +import java.util.UUID; + +@Tag(name = "포인트 API", description = "포인트 관련 API 목록입니다") +public interface PointControllerSwagger { + + @Operation(summary = "현재 획득한 포인트 조회 API", description = "사용자가 획득한 포인트를 조회합니다.") + PointReadRs read(@AuthUser UUID userId); +} diff --git a/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java new file mode 100644 index 00000000..1035c605 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java @@ -0,0 +1,9 @@ +package kr.co.api.point.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record PointReadRs( + @Schema(description = "사용자가 현재 획득한 포인트", example = "1000") + int point +) { +} From ab854500ffe29a6a2eccf02b4d3086c024d1eeac Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 17:09:48 +0900 Subject: [PATCH 02/26] =?UTF-8?q?#18=20docs:=20=EB=AA=A9=ED=91=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/api/cheer/rqrs/PhraseReadRs.java | 4 +- .../main/java/kr/co/api/common/rs/IdRs.java | 8 ++++ .../java/kr/co/api/goal/GoalController.java | 19 ++++++++++ .../api/goal/docs/GoalControllerSwagger.java | 12 ++++++ .../kr/co/api/goal/rqrs/GoalCreateRq.java | 38 +++++++++++++++++++ .../kr/co/api/goal/rqrs/SubGoalCreateRq.java | 17 +++++++++ .../kr/co/api/point/rqrs/PointReadRs.java | 4 +- 7 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/GoalController.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalCreateRq.java diff --git a/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java index 5b5334ef..b5014db8 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.annotations.media.Schema; public record PhraseReadRs( - @Schema(description = "응원 문구", example = "목표는 멀어도 나는 계속 가는중") - String phrase + @Schema(description = "응원 문구", example = "목표는 멀어도 나는 계속 가는중") + String phrase ) { } diff --git a/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java b/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java new file mode 100644 index 00000000..cc05ce86 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java @@ -0,0 +1,8 @@ +package kr.co.api.common.rs; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record IdRs( + String id +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java new file mode 100644 index 00000000..7a643e7e --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -0,0 +1,19 @@ +package kr.co.api.goal; + +import kr.co.api.common.rs.IdRs; +import kr.co.api.goal.docs.GoalControllerSwagger; +import kr.co.api.goal.rqrs.GoalCreateRq; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/v1/goals") +public class GoalController implements GoalControllerSwagger { + + @ResponseStatus(HttpStatus.CREATED) + @PostMapping + public IdRs create(@RequestBody GoalCreateRq rq) { + System.out.println("ddd"+rq.subGoals()); + return null; + } +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java new file mode 100644 index 00000000..b6760135 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java @@ -0,0 +1,12 @@ +package kr.co.api.goal.docs; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import kr.co.api.common.rs.IdRs; +import kr.co.api.goal.rqrs.GoalCreateRq; + +@Tag(name = "목표 API", description = "목표 관련 API 목록입니다") +public interface GoalControllerSwagger { + @Operation(summary = "목표 생성 API", description = "목표를 생성합니다.") + IdRs create(GoalCreateRq rq); +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java new file mode 100644 index 00000000..5eb18e20 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java @@ -0,0 +1,38 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public record GoalCreateRq( + @NotNull + @Size(min = 1, max = 20) + @Schema(description = "목표 이름", example = "자격증 따기") + String title, + + @NotNull + @Schema(description = "개월 수로 기간 설정 여부") + boolean isMonthSetting, + + @Size(min = 1, max = 12) + @Schema(description = "목표 개월 수") + Integer month, + + @Schema(description = "목표 완료 날짜", format = "date") + LocalDate date, + + @Schema(description = "세부 목표 목록") + List subGoals +) { + public GoalCreateRq { + if (Objects.isNull(subGoals)) { + subGoals = new ArrayList<>(); + } + } +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalCreateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalCreateRq.java new file mode 100644 index 00000000..698279b3 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalCreateRq.java @@ -0,0 +1,17 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record SubGoalCreateRq( + @NotNull + @Size(min = 1, max = 20) + @Schema(description = "세부 목표 이름", example = "책 한 권 읽기") + String title, + + @Size(min = 1, max = 3) + @Schema(description = "세부 목표 중요도 (상: 1, 하:3)") + int importance +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java index 1035c605..b0a6af11 100644 --- a/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.annotations.media.Schema; public record PointReadRs( - @Schema(description = "사용자가 현재 획득한 포인트", example = "1000") - int point + @Schema(description = "사용자가 현재 획득한 포인트", example = "1000") + int point ) { } From d7065aec2f0a02dd608df8f033257bccb4c298e7 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 17:52:31 +0900 Subject: [PATCH 03/26] =?UTF-8?q?#18=20docs:=20=EB=AA=A9=ED=91=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1,=20=EC=88=98=EC=A0=95,=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/goal/GoalController.java | 16 +++++++++- .../api/goal/docs/GoalControllerSwagger.java | 11 +++++++ .../kr/co/api/goal/rqrs/GoalCreateRq.java | 2 +- .../kr/co/api/goal/rqrs/GoalItemReadRs.java | 18 +++++++++++ .../kr/co/api/goal/rqrs/GoalListReadRs.java | 11 +++++++ .../kr/co/api/goal/rqrs/GoalUpdateRq.java | 30 +++++++++++++++++++ .../kr/co/api/goal/rqrs/SubGoalUpdateRq.java | 20 +++++++++++++ 7 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java create mode 100644 motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalUpdateRq.java diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index 7a643e7e..d859cf3a 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -3,9 +3,14 @@ import kr.co.api.common.rs.IdRs; import kr.co.api.goal.docs.GoalControllerSwagger; import kr.co.api.goal.rqrs.GoalCreateRq; +import kr.co.api.goal.rqrs.GoalListReadRs; +import kr.co.api.goal.rqrs.GoalUpdateRq; +import kr.co.api.security.annotation.AuthUser; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import java.util.UUID; + @RestController @RequestMapping("/v1/goals") public class GoalController implements GoalControllerSwagger { @@ -13,7 +18,16 @@ public class GoalController implements GoalControllerSwagger { @ResponseStatus(HttpStatus.CREATED) @PostMapping public IdRs create(@RequestBody GoalCreateRq rq) { - System.out.println("ddd"+rq.subGoals()); + return null; + } + + @PutMapping("/{:id}") + public IdRs update(@PathVariable String id, GoalUpdateRq rq) { + return null; + } + + @GetMapping + public GoalListReadRs readList(@AuthUser UUID userId) { return null; } } diff --git a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java index b6760135..72b2ee70 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java @@ -4,9 +4,20 @@ import io.swagger.v3.oas.annotations.tags.Tag; import kr.co.api.common.rs.IdRs; import kr.co.api.goal.rqrs.GoalCreateRq; +import kr.co.api.goal.rqrs.GoalListReadRs; +import kr.co.api.goal.rqrs.GoalUpdateRq; +import kr.co.api.security.annotation.AuthUser; + +import java.util.UUID; @Tag(name = "목표 API", description = "목표 관련 API 목록입니다") public interface GoalControllerSwagger { @Operation(summary = "목표 생성 API", description = "목표를 생성합니다.") IdRs create(GoalCreateRq rq); + + @Operation(summary = "목표 수정 API", description = "목표를 수정합니다.") + IdRs update(String id, GoalUpdateRq rq); + + @Operation(summary = "목표 목록 API", description = "목표 목록을 조회합니다.") + GoalListReadRs readList(UUID userId); } diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java index 5eb18e20..fc5caacd 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java @@ -25,7 +25,7 @@ public record GoalCreateRq( Integer month, @Schema(description = "목표 완료 날짜", format = "date") - LocalDate date, + LocalDate dueDate, @Schema(description = "세부 목표 목록") List subGoals diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java new file mode 100644 index 00000000..d0fab2ee --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java @@ -0,0 +1,18 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.math.BigDecimal; +import java.time.LocalDate; + +public record GoalItemReadRs( + @Schema(description = "목표 이름", example = "자격증 따기") + String title, + + @Schema(description = "목표 완료 날짜", type = "date") + LocalDate dueDate, + + @Schema(description = "목표 달성률 (%)", example = "24.5") + float progress +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java new file mode 100644 index 00000000..923a63e3 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java @@ -0,0 +1,11 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.List; + +public record GoalListReadRs( + @Schema(description = "목표 목록") + List goals +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java new file mode 100644 index 00000000..d48427ca --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java @@ -0,0 +1,30 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public record GoalUpdateRq( + @NotNull + @Size(min = 1, max = 20) + @Schema(description = "목표 이름", example = "자격증 따기") + String title, + + @NotNull + @Schema(description = "목표 완료 날짜", format = "date") + LocalDate date, + + @Schema(description = "세부 목표 목록") + List subGoals +) { + public GoalUpdateRq { + if (Objects.isNull(subGoals)) { + subGoals = new ArrayList<>(); + } + } +} diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalUpdateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalUpdateRq.java new file mode 100644 index 00000000..c8e67077 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/SubGoalUpdateRq.java @@ -0,0 +1,20 @@ +package kr.co.api.goal.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record SubGoalUpdateRq( + @Schema(description = "수정할 세부 목표 아이디") + String id, + + @NotNull + @Size(min = 1, max = 20) + @Schema(description = "세부 목표 이름", example = "책 한 권 읽기") + String title, + + @Size(min = 1, max = 3) + @Schema(description = "세부 목표 중요도 (상: 1, 하:3)") + int importance +) { +} From b710f479f3742ff4dcdacbfc64a81cffaf099df4 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:09:56 +0900 Subject: [PATCH 04/26] =?UTF-8?q?#18=20fix:=20Path=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- motimo-api/src/main/java/kr/co/api/goal/GoalController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index d859cf3a..fc816be4 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -21,7 +21,7 @@ public IdRs create(@RequestBody GoalCreateRq rq) { return null; } - @PutMapping("/{:id}") + @PutMapping("/{id}") public IdRs update(@PathVariable String id, GoalUpdateRq rq) { return null; } From d1d13015e85be4b3a2e8a1934776695064e05214 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:10:12 +0900 Subject: [PATCH 05/26] =?UTF-8?q?#18=20docs:=20swagger=EC=97=90=20token=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/config/SwaggerConfig.java | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/config/SwaggerConfig.java b/motimo-api/src/main/java/kr/co/api/config/SwaggerConfig.java index 2073ece0..d37a5dbc 100644 --- a/motimo-api/src/main/java/kr/co/api/config/SwaggerConfig.java +++ b/motimo-api/src/main/java/kr/co/api/config/SwaggerConfig.java @@ -1,6 +1,9 @@ package kr.co.api.config; +import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,39 +14,51 @@ public class SwaggerConfig { @Bean public GroupedOpenApi motimoAPI() { return GroupedOpenApi - .builder() - .group("Motimo API List") - .addOpenApiCustomizer( - openApi -> - openApi - .setInfo( - new Info() - .title("Motimo API List") // API 제목 - .description("모티모 API 목록입니다.") // API 설명 - .version("1.0.0") // API 버전 - ) - ) - .build(); + .builder() + .group("Motimo API List") + .addOpenApiCustomizer(openApi -> { + jwtSecuritySetting(openApi); + openApi.setInfo( + new Info() + .title("Motimo API List") + .description("모티모 API 목록입니다.") + .version("1.0.0") + ); + }) + .build(); } + + @Bean public GroupedOpenApi version1() { return GroupedOpenApi - .builder() - .group("Motimo V1 API List") - .pathsToMatch("/v1/**") - .addOpenApiCustomizer( - openApi -> - openApi - .setInfo( - new Info() - .title("Motimo Version1 API List") - .description("모티모 버전 1 API 목록입니다.") - .version("1.0.0") - ) - ) - .build(); + .builder() + .group("Motimo V1 API List") + .pathsToMatch("/v1/**") + .addOpenApiCustomizer(openApi -> { + jwtSecuritySetting(openApi); + openApi.setInfo( + new Info() + .title("Motimo Version1 API List") + .description("모티모 버전 1 API 목록입니다.") + .version("1.0.0") + ); + }) + .build(); } + private void jwtSecuritySetting(OpenAPI openApi) { + openApi.getComponents().addSecuritySchemes("BearerAuth", + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + ); + + openApi.addSecurityItem(new SecurityRequirement().addList("BearerAuth")); + } + } \ No newline at end of file From 5486ce1be9825a59ddba9cd0d8c150fc8b583ad5 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:11:17 +0900 Subject: [PATCH 06/26] =?UTF-8?q?refactor:=20resolve=20arg=EC=97=90=20?= =?UTF-8?q?=EB=B0=98=ED=99=98=EA=B0=92=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/resolver/AuthUserArgumentResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/security/resolver/AuthUserArgumentResolver.java b/motimo-api/src/main/java/kr/co/api/security/resolver/AuthUserArgumentResolver.java index cb999a16..1d547386 100644 --- a/motimo-api/src/main/java/kr/co/api/security/resolver/AuthUserArgumentResolver.java +++ b/motimo-api/src/main/java/kr/co/api/security/resolver/AuthUserArgumentResolver.java @@ -11,6 +11,8 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +import java.util.UUID; + @Component public class AuthUserArgumentResolver implements HandlerMethodArgumentResolver { @@ -26,10 +28,10 @@ public boolean supportsParameter(MethodParameter parameter) { } @Override - public Object resolveArgument(MethodParameter parameter, - ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, - WebDataBinderFactory binderFactory) throws Exception { + public UUID resolveArgument(MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) throws Exception { HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); String header = request.getHeader(HttpHeaders.AUTHORIZATION); From 4331bb7da5ef3b1d5f349c55722e3112a5508354 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:15:44 +0900 Subject: [PATCH 07/26] =?UTF-8?q?#18=20docs:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20=EC=95=A0=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=8A=A4=EC=9B=A8=EA=B1=B0=EC=97=90=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=20=EC=95=88=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/security/annotation/AuthToken.java | 3 +++ .../src/main/java/kr/co/api/security/annotation/AuthUser.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/motimo-api/src/main/java/kr/co/api/security/annotation/AuthToken.java b/motimo-api/src/main/java/kr/co/api/security/annotation/AuthToken.java index 33999af6..b7b04484 100644 --- a/motimo-api/src/main/java/kr/co/api/security/annotation/AuthToken.java +++ b/motimo-api/src/main/java/kr/co/api/security/annotation/AuthToken.java @@ -1,9 +1,12 @@ package kr.co.api.security.annotation; +import io.swagger.v3.oas.annotations.Parameter; + import java.lang.annotation.*; @Target({ElementType.METHOD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Documented +@Parameter(hidden = true) public @interface AuthToken { } diff --git a/motimo-api/src/main/java/kr/co/api/security/annotation/AuthUser.java b/motimo-api/src/main/java/kr/co/api/security/annotation/AuthUser.java index 49fdd87a..99fc96f4 100644 --- a/motimo-api/src/main/java/kr/co/api/security/annotation/AuthUser.java +++ b/motimo-api/src/main/java/kr/co/api/security/annotation/AuthUser.java @@ -1,9 +1,12 @@ package kr.co.api.security.annotation; +import io.swagger.v3.oas.annotations.Parameter; + import java.lang.annotation.*; @Target({ElementType.METHOD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Documented +@Parameter(hidden = true) public @interface AuthUser { } From 06431ebc4752160ba5847988ca9c386237f0c6f3 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:36:24 +0900 Subject: [PATCH 08/26] =?UTF-8?q?#18=20docs:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EA=B0=80=EC=9E=85=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/api/user/controller/UserController.java | 15 +++++++++++++++ .../user/controller/rqrs/UserJoinedDateRs.java | 14 ++++++++++++++ .../co/api/user/docs/UserControllerSwagger.java | 11 +++++++++++ 3 files changed, 40 insertions(+) create mode 100644 motimo-api/src/main/java/kr/co/api/user/controller/UserController.java create mode 100644 motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java create mode 100644 motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java new file mode 100644 index 00000000..ef2e3020 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java @@ -0,0 +1,15 @@ +package kr.co.api.user.controller; + +import kr.co.api.user.controller.rqrs.UserJoinedDateRs; +import kr.co.api.user.docs.UserControllerSwagger; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/v1/users") +public class UserController implements UserControllerSwagger { + + public UserJoinedDateRs readJoinedDate() { + return null; + } +} diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java b/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java new file mode 100644 index 00000000..6618da14 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java @@ -0,0 +1,14 @@ +package kr.co.api.user.controller.rqrs; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDate; + +public record UserJoinedDateRs( + @Schema(description = "가입일", type = "date") + LocalDate date, + + @Schema(description = "가입일로부터 날짜", example = "43") + int day +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java new file mode 100644 index 00000000..8fa46f71 --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java @@ -0,0 +1,11 @@ +package kr.co.api.user.docs; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import kr.co.api.user.controller.rqrs.UserJoinedDateRs; + +@Tag(name = "사용자 API", description = "사용자 관련 API 목록입니다") +public interface UserControllerSwagger { + @Operation(summary = "사용자 가입일 조회 API", description = "사용자 가입일을 조회합니다.") + UserJoinedDateRs readJoinedDate(); +} From 4f035d6f69bd47087f55a23dfdb755f4e7dd1e13 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Tue, 27 May 2025 18:37:04 +0900 Subject: [PATCH 09/26] =?UTF-8?q?#18=20docs:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EA=B0=80=EC=9E=85=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20path=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/user/controller/UserController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java index ef2e3020..733a8f85 100644 --- a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java +++ b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java @@ -2,6 +2,7 @@ import kr.co.api.user.controller.rqrs.UserJoinedDateRs; import kr.co.api.user.docs.UserControllerSwagger; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -9,6 +10,7 @@ @RequestMapping("/v1/users") public class UserController implements UserControllerSwagger { + @GetMapping("/joined-dates") public UserJoinedDateRs readJoinedDate() { return null; } From c24d7b3ce474307c45e6a17aae3bd6233240f44a Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 00:12:06 +0900 Subject: [PATCH 10/26] =?UTF-8?q?#21=20fix:=20resolve=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EC=97=90=EC=84=9C=20Object=20->=20UUID=20=EB=84=98=EA=B8=B0?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/resolver/AuthTokenArgumentResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/security/resolver/AuthTokenArgumentResolver.java b/motimo-api/src/main/java/kr/co/api/security/resolver/AuthTokenArgumentResolver.java index a7f0b163..175b8ea6 100644 --- a/motimo-api/src/main/java/kr/co/api/security/resolver/AuthTokenArgumentResolver.java +++ b/motimo-api/src/main/java/kr/co/api/security/resolver/AuthTokenArgumentResolver.java @@ -11,6 +11,8 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +import java.util.UUID; + @Component public class AuthTokenArgumentResolver implements HandlerMethodArgumentResolver { @@ -26,10 +28,10 @@ public boolean supportsParameter(MethodParameter parameter) { } @Override - public Object resolveArgument(MethodParameter parameter, - ModelAndViewContainer mavContainer, - NativeWebRequest webRequest, - WebDataBinderFactory binderFactory) throws Exception { + public UUID resolveArgument(MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) throws Exception { HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); String header = request.getHeader(HttpHeaders.AUTHORIZATION); From deab0eb10249af473c5941f2aad13bbe943d57c5 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 00:16:30 +0900 Subject: [PATCH 11/26] =?UTF-8?q?#21=20fix:=20IdRs=20->=20CreateIdRs?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/common/rs/CreateIdRs.java | 9 +++++++++ motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java delete mode 100644 motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java diff --git a/motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java b/motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java new file mode 100644 index 00000000..0c54918b --- /dev/null +++ b/motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java @@ -0,0 +1,9 @@ +package kr.co.api.common.rs; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record CreateIdRs( + @Schema(description = "생성된 아이디") + String id +) { +} diff --git a/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java b/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java deleted file mode 100644 index cc05ce86..00000000 --- a/motimo-api/src/main/java/kr/co/api/common/rs/IdRs.java +++ /dev/null @@ -1,8 +0,0 @@ -package kr.co.api.common.rs; - -import io.swagger.v3.oas.annotations.media.Schema; - -public record IdRs( - String id -) { -} From db934ca87950b3b077c98d8132a95754a341fb8d Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 00:19:39 +0900 Subject: [PATCH 12/26] =?UTF-8?q?#21=20fix:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=B0=98=EC=98=81=20(=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85,=20=EB=A6=AC=ED=84=B4=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/goal/GoalController.java | 7 +++---- .../java/kr/co/api/goal/docs/GoalControllerSwagger.java | 7 +++---- .../src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java | 2 +- .../kr/co/api/user/controller/rqrs/UserJoinedDateRs.java | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index fc816be4..84b753d7 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -1,6 +1,6 @@ package kr.co.api.goal; -import kr.co.api.common.rs.IdRs; +import kr.co.api.common.rs.CreateIdRs; import kr.co.api.goal.docs.GoalControllerSwagger; import kr.co.api.goal.rqrs.GoalCreateRq; import kr.co.api.goal.rqrs.GoalListReadRs; @@ -17,13 +17,12 @@ public class GoalController implements GoalControllerSwagger { @ResponseStatus(HttpStatus.CREATED) @PostMapping - public IdRs create(@RequestBody GoalCreateRq rq) { + public CreateIdRs create(@RequestBody GoalCreateRq rq) { return null; } @PutMapping("/{id}") - public IdRs update(@PathVariable String id, GoalUpdateRq rq) { - return null; + public void update(@PathVariable String id, GoalUpdateRq rq) { } @GetMapping diff --git a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java index 72b2ee70..88cc5201 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java @@ -2,21 +2,20 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.co.api.common.rs.IdRs; +import kr.co.api.common.rs.CreateIdRs; import kr.co.api.goal.rqrs.GoalCreateRq; import kr.co.api.goal.rqrs.GoalListReadRs; import kr.co.api.goal.rqrs.GoalUpdateRq; -import kr.co.api.security.annotation.AuthUser; import java.util.UUID; @Tag(name = "목표 API", description = "목표 관련 API 목록입니다") public interface GoalControllerSwagger { @Operation(summary = "목표 생성 API", description = "목표를 생성합니다.") - IdRs create(GoalCreateRq rq); + CreateIdRs create(GoalCreateRq rq); @Operation(summary = "목표 수정 API", description = "목표를 수정합니다.") - IdRs update(String id, GoalUpdateRq rq); + void update(String id, GoalUpdateRq rq); @Operation(summary = "목표 목록 API", description = "목표 목록을 조회합니다.") GoalListReadRs readList(UUID userId); diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java index d48427ca..a8b94aeb 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalUpdateRq.java @@ -17,7 +17,7 @@ public record GoalUpdateRq( @NotNull @Schema(description = "목표 완료 날짜", format = "date") - LocalDate date, + LocalDate dueDate, @Schema(description = "세부 목표 목록") List subGoals diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java b/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java index 6618da14..3a225b0b 100644 --- a/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java +++ b/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java @@ -6,9 +6,9 @@ public record UserJoinedDateRs( @Schema(description = "가입일", type = "date") - LocalDate date, + LocalDate joinedDate, @Schema(description = "가입일로부터 날짜", example = "43") - int day + int joinedDays ) { } From 9db7e45d74e139cb3bec730fd015982d42ef2a33 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 00:25:48 +0900 Subject: [PATCH 13/26] =?UTF-8?q?#21=20fix:=20Phrase=20->=20CheerPhrase?= =?UTF-8?q?=EB=A1=9C=20=EB=AA=85=ED=99=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/cheer/CheerController.java | 4 ++-- .../java/kr/co/api/cheer/docs/CheerControllerSwagger.java | 5 ++--- .../api/cheer/rqrs/{PhraseReadRs.java => CheerPhraseRs.java} | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) rename motimo-api/src/main/java/kr/co/api/cheer/rqrs/{PhraseReadRs.java => CheerPhraseRs.java} (78%) diff --git a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java index e41a04a0..c9c45583 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java @@ -1,7 +1,7 @@ package kr.co.api.cheer; import kr.co.api.cheer.docs.CheerControllerSwagger; -import kr.co.api.cheer.rqrs.PhraseReadRs; +import kr.co.api.cheer.rqrs.CheerPhraseRs; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,7 +11,7 @@ public class CheerController implements CheerControllerSwagger { @GetMapping - public PhraseReadRs readPhrase() { + public CheerPhraseRs readCheerPhrase() { return null; } } diff --git a/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java index b3c00a28..76e0a033 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java @@ -1,12 +1,11 @@ package kr.co.api.cheer.docs; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.co.api.cheer.rqrs.PhraseReadRs; +import kr.co.api.cheer.rqrs.CheerPhraseRs; @Tag(name = "응원 API", description = "응원 관련 API 목록입니다") public interface CheerControllerSwagger { @Operation(summary = "응원 문구 조회 API", description = "응원 문구를 랜덤 조회합니다.") - PhraseReadRs readPhrase(); + CheerPhraseRs readCheerPhrase(); } diff --git a/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/CheerPhraseRs.java similarity index 78% rename from motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java rename to motimo-api/src/main/java/kr/co/api/cheer/rqrs/CheerPhraseRs.java index b5014db8..36395f67 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/rqrs/PhraseReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/rqrs/CheerPhraseRs.java @@ -2,8 +2,8 @@ import io.swagger.v3.oas.annotations.media.Schema; -public record PhraseReadRs( +public record CheerPhraseRs( @Schema(description = "응원 문구", example = "목표는 멀어도 나는 계속 가는중") - String phrase + String cheerPhrase ) { } From 0bfff50a13ff0ef9d4b4ee8213ae477a9ededade Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 11:26:26 +0900 Subject: [PATCH 14/26] =?UTF-8?q?#21=20refactor:=20=EA=B0=80=EC=9E=85?= =?UTF-8?q?=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20URI=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/user/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java index 733a8f85..3d370a44 100644 --- a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java +++ b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java @@ -10,7 +10,7 @@ @RequestMapping("/v1/users") public class UserController implements UserControllerSwagger { - @GetMapping("/joined-dates") + @GetMapping("/me/joined-date") public UserJoinedDateRs readJoinedDate() { return null; } From 5645ca875ffa6cd97fc545436861c73182952e71 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 11:29:50 +0900 Subject: [PATCH 15/26] =?UTF-8?q?#21=20refactor:=20List=20null=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20@=20JsonSetter=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/goal/rqrs/GoalCreateRq.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java index fc5caacd..d419273c 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java @@ -1,14 +1,13 @@ package kr.co.api.goal.rqrs; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.Nulls; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.annotation.Nullable; -import jakarta.validation.constraints.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; public record GoalCreateRq( @NotNull @@ -28,11 +27,7 @@ public record GoalCreateRq( LocalDate dueDate, @Schema(description = "세부 목표 목록") + @JsonSetter(nulls = Nulls.AS_EMPTY) List subGoals ) { - public GoalCreateRq { - if (Objects.isNull(subGoals)) { - subGoals = new ArrayList<>(); - } - } } From 8b6daf29659d9cc2db7b6c2366395846e0c2020a Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 11:32:12 +0900 Subject: [PATCH 16/26] =?UTF-8?q?#21=20refactor:=20Rs=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=EC=97=90=20Read=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/goal/docs/GoalControllerSwagger.java | 8 ++++---- .../rs/CreateIdRs.java => goal/rqrs/GoalIdRs.java} | 4 ++-- .../goal/rqrs/{GoalItemReadRs.java => GoalItemRs.java} | 3 +-- .../goal/rqrs/{GoalListReadRs.java => GoalListRs.java} | 4 ++-- .../src/main/java/kr/co/api/point/PointController.java | 4 ++-- .../java/kr/co/api/point/docs/PointControllerSwagger.java | 6 ++---- .../co/api/point/rqrs/{PointReadRs.java => PointRs.java} | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-) rename motimo-api/src/main/java/kr/co/api/{common/rs/CreateIdRs.java => goal/rqrs/GoalIdRs.java} (68%) rename motimo-api/src/main/java/kr/co/api/goal/rqrs/{GoalItemReadRs.java => GoalItemRs.java} (86%) rename motimo-api/src/main/java/kr/co/api/goal/rqrs/{GoalListReadRs.java => GoalListRs.java} (71%) rename motimo-api/src/main/java/kr/co/api/point/rqrs/{PointReadRs.java => PointRs.java} (87%) diff --git a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java index 88cc5201..1623a445 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java @@ -2,9 +2,9 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.co.api.common.rs.CreateIdRs; import kr.co.api.goal.rqrs.GoalCreateRq; -import kr.co.api.goal.rqrs.GoalListReadRs; +import kr.co.api.goal.rqrs.GoalIdRs; +import kr.co.api.goal.rqrs.GoalListRs; import kr.co.api.goal.rqrs.GoalUpdateRq; import java.util.UUID; @@ -12,11 +12,11 @@ @Tag(name = "목표 API", description = "목표 관련 API 목록입니다") public interface GoalControllerSwagger { @Operation(summary = "목표 생성 API", description = "목표를 생성합니다.") - CreateIdRs create(GoalCreateRq rq); + GoalIdRs create(GoalCreateRq rq); @Operation(summary = "목표 수정 API", description = "목표를 수정합니다.") void update(String id, GoalUpdateRq rq); @Operation(summary = "목표 목록 API", description = "목표 목록을 조회합니다.") - GoalListReadRs readList(UUID userId); + GoalListRs readList(UUID userId); } diff --git a/motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalIdRs.java similarity index 68% rename from motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java rename to motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalIdRs.java index 0c54918b..d0a9d18f 100644 --- a/motimo-api/src/main/java/kr/co/api/common/rs/CreateIdRs.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalIdRs.java @@ -1,8 +1,8 @@ -package kr.co.api.common.rs; +package kr.co.api.goal.rqrs; import io.swagger.v3.oas.annotations.media.Schema; -public record CreateIdRs( +public record GoalIdRs( @Schema(description = "생성된 아이디") String id ) { diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemRs.java similarity index 86% rename from motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java rename to motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemRs.java index d0fab2ee..e3d2c430 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalItemRs.java @@ -2,10 +2,9 @@ import io.swagger.v3.oas.annotations.media.Schema; -import java.math.BigDecimal; import java.time.LocalDate; -public record GoalItemReadRs( +public record GoalItemRs( @Schema(description = "목표 이름", example = "자격증 따기") String title, diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListRs.java similarity index 71% rename from motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java rename to motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListRs.java index 923a63e3..d7082863 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalListRs.java @@ -4,8 +4,8 @@ import java.util.List; -public record GoalListReadRs( +public record GoalListRs( @Schema(description = "목표 목록") - List goals + List goals ) { } diff --git a/motimo-api/src/main/java/kr/co/api/point/PointController.java b/motimo-api/src/main/java/kr/co/api/point/PointController.java index 3d9ed1c3..97f3450c 100644 --- a/motimo-api/src/main/java/kr/co/api/point/PointController.java +++ b/motimo-api/src/main/java/kr/co/api/point/PointController.java @@ -1,7 +1,7 @@ package kr.co.api.point; import kr.co.api.point.docs.PointControllerSwagger; -import kr.co.api.point.rqrs.PointReadRs; +import kr.co.api.point.rqrs.PointRs; import kr.co.api.security.annotation.AuthUser; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,7 +14,7 @@ public class PointController implements PointControllerSwagger { @GetMapping - public PointReadRs read(@AuthUser UUID userId) { + public PointRs read(@AuthUser UUID userId) { return null; } } diff --git a/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java index 65dd1d08..73e37f83 100644 --- a/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java @@ -1,10 +1,8 @@ package kr.co.api.point.docs; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.co.api.point.rqrs.PointReadRs; +import kr.co.api.point.rqrs.PointRs; import kr.co.api.security.annotation.AuthUser; import java.util.UUID; @@ -13,5 +11,5 @@ public interface PointControllerSwagger { @Operation(summary = "현재 획득한 포인트 조회 API", description = "사용자가 획득한 포인트를 조회합니다.") - PointReadRs read(@AuthUser UUID userId); + PointRs read(@AuthUser UUID userId); } diff --git a/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointRs.java similarity index 87% rename from motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java rename to motimo-api/src/main/java/kr/co/api/point/rqrs/PointRs.java index b0a6af11..93355ef3 100644 --- a/motimo-api/src/main/java/kr/co/api/point/rqrs/PointReadRs.java +++ b/motimo-api/src/main/java/kr/co/api/point/rqrs/PointRs.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; -public record PointReadRs( +public record PointRs( @Schema(description = "사용자가 현재 획득한 포인트", example = "1000") int point ) { From 74f7a719e70c101e1d13d4c332470fea4f9595db Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 11:38:55 +0900 Subject: [PATCH 17/26] =?UTF-8?q?fix:=20gradle=20jar=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- motimo-api/gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 ------- 2 files changed, 7 deletions(-) delete mode 100644 motimo-api/gradle/wrapper/gradle-wrapper.jar delete mode 100644 motimo-api/gradle/wrapper/gradle-wrapper.properties diff --git a/motimo-api/gradle/wrapper/gradle-wrapper.jar b/motimo-api/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 9bbc975c742b298b441bfb90dbc124400a3751b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43705 zcma&Obx`DOvL%eWOXJW;V64viP??$)@wHcsJ68)>bJS6*&iHnskXE8MjvIPVl|FrmV}Npeql07fCw6`pw`0s zGauF(<*@v{3t!qoUU*=j)6;|-(yg@jvDx&fV^trtZt27?4Tkn729qrItVh@PMwG5$ z+oXHSPM??iHZ!cVP~gYact-CwV`}~Q+R}PPNRy+T-geK+>fHrijpllon_F4N{@b-} z1M0=a!VbVmJM8Xk@NRv)m&aRYN}FSJ{LS;}2ArQ5baSjfy40l@T5)1r-^0fAU6f_} zzScst%$Nd-^ElV~H0TetQhMc%S{}Q4lssln=|;LG?Ulo}*mhg8YvBAUY7YFdXs~vv zv~{duzVw%C#GxkBwX=TYp1Dh*Uaum2?RmsvPaLlzO^fIJ`L?&OV?Y&kKj~^kWC`Ly zfL-}J^4a0Ojuz9O{jUbIS;^JatJ5+YNNHe}6nG9Yd6P-lJiK2ms)A^xq^H2fKrTF) zp!6=`Ece~57>^9(RA4OB9;f1FAhV%zVss%#rDq$9ZW3N2cXC7dMz;|UcRFecBm`DA z1pCO!#6zKp#@mx{2>Qcme8y$Qg_gnA%(`Vtg3ccwgb~D(&@y8#Jg8nNYW*-P{_M#E zZ|wCsQoO1(iIKd-2B9xzI}?l#Q@G5d$m1Lfh0q;iS5FDQ&9_2X-H)VDKA*fa{b(sV zL--krNCXibi1+*C2;4qVjb0KWUVGjjRT{A}Q*!cFmj0tRip2ra>WYJ>ZK4C|V~RYs z6;~+*)5F^x^aQqk9tjh)L;DOLlD8j+0<>kHc8MN|68PxQV`tJFbgxSfq-}b(_h`luA0&;Vk<@51i0 z_cu6{_*=vlvYbKjDawLw+t^H?OV00_73Cn3goU5?})UYFuoSX6Xqw;TKcrsc|r# z$sMWYl@cs#SVopO$hpHZ)cdU-+Ui%z&Sa#lMI~zWW@vE%QDh@bTe0&V9nL>4Et9`N zGT8(X{l@A~loDx}BDz`m6@tLv@$mTlVJ;4MGuj!;9Y=%;;_kj#o8n5tX%@M)2I@}u z_{I!^7N1BxW9`g&Z+K#lZ@7_dXdsqp{W9_`)zgZ=sD~%WS5s$`7z#XR!Lfy(4se(m zR@a3twgMs19!-c4jh`PfpJOSU;vShBKD|I0@rmv_x|+ogqslnLLOepJpPMOxhRb*i zGHkwf#?ylQ@k9QJL?!}MY4i7joSzMcEhrDKJH&?2v{-tgCqJe+Y0njl7HYff z{&~M;JUXVR$qM1FPucIEY(IBAuCHC@^~QG6O!dAjzQBxDOR~lJEr4KS9R*idQ^p{D zS#%NQADGbAH~6wAt}(1=Uff-1O#ITe)31zCL$e9~{w)gx)g>?zFE{Bc9nJT6xR!i8 z)l)~9&~zSZTHk{?iQL^MQo$wLi}`B*qnvUy+Y*jEraZMnEhuj`Fu+>b5xD1_Tp z)8|wedv42#3AZUL7x&G@p@&zcUvPkvg=YJS6?1B7ZEXr4b>M+9Gli$gK-Sgh{O@>q7TUg+H zNJj`6q#O@>4HpPJEHvNij`sYW&u%#=215HKNg;C!0#hH1vlO5+dFq9& zS)8{5_%hz?#D#wn&nm@aB?1_|@kpA@{%jYcs{K%$a4W{k@F zPyTav?jb;F(|GaZhm6&M#g|`ckO+|mCtAU)5_(hn&Ogd z9Ku}orOMu@K^Ac>eRh3+0-y^F`j^noa*OkS3p^tLV`TY$F$cPXZJ48!xz1d7%vfA( zUx2+sDPqHfiD-_wJDb38K^LtpN2B0w=$A10z%F9f_P2aDX63w7zDG5CekVQJGy18I zB!tI`6rZr7TK10L(8bpiaQ>S@b7r_u@lh^vakd0e6USWw7W%d_Ob%M!a`K>#I3r-w zo2^+9Y)Sb?P9)x0iA#^ns+Kp{JFF|$09jb6ZS2}_<-=$?^#IUo5;g`4ICZknr!_aJ zd73%QP^e-$%Xjt|28xM}ftD|V@76V_qvNu#?Mt*A-OV{E4_zC4Ymo|(cb+w^`Wv== z>)c%_U0w`d$^`lZQp@midD89ta_qTJW~5lRrIVwjRG_9aRiQGug%f3p@;*%Y@J5uQ|#dJ+P{Omc`d2VR)DXM*=ukjVqIpkb<9gn9{*+&#p)Ek zN=4zwNWHF~=GqcLkd!q0p(S2_K=Q`$whZ}r@ec_cb9hhg9a z6CE=1n8Q;hC?;ujo0numJBSYY6)GTq^=kB~`-qE*h%*V6-ip=c4+Yqs*7C@@b4YAi zuLjsmD!5M7r7d5ZPe>4$;iv|zq=9=;B$lI|xuAJwi~j~^Wuv!Qj2iEPWjh9Z&#+G>lZQpZ@(xfBrhc{rlLwOC;optJZDj4Xfu3$u6rt_=YY0~lxoy~fq=*L_&RmD7dZWBUmY&12S;(Ui^y zBpHR0?Gk|`U&CooNm_(kkO~pK+cC%uVh^cnNn)MZjF@l{_bvn4`Jc}8QwC5_)k$zs zM2qW1Zda%bIgY^3NcfL)9ug`05r5c%8ck)J6{fluBQhVE>h+IA&Kb}~$55m-^c1S3 zJMXGlOk+01qTQUFlh5Jc3xq|7McY$nCs$5=`8Y;|il#Ypb{O9}GJZD8!kYh{TKqs@ z-mQn1K4q$yGeyMcryHQgD6Ra<6^5V(>6_qg`3uxbl|T&cJVA*M_+OC#>w(xL`RoPQ zf1ZCI3G%;o-x>RzO!mc}K!XX{1rih0$~9XeczHgHdPfL}4IPi~5EV#ZcT9 zdgkB3+NPbybS-d;{8%bZW^U+x@Ak+uw;a5JrZH!WbNvl!b~r4*vs#he^bqz`W93PkZna2oYO9dBrKh2QCWt{dGOw)%Su%1bIjtp4dKjZ^ zWfhb$M0MQiDa4)9rkip9DaH0_tv=XxNm>6MKeWv>`KNk@QVkp$Lhq_~>M6S$oliq2 zU6i7bK;TY)m>-}X7hDTie>cc$J|`*}t=MAMfWIALRh2=O{L57{#fA_9LMnrV(HrN6 zG0K_P5^#$eKt{J|#l~U0WN_3)p^LLY(XEqes0OvI?3)GTNY&S13X+9`6PLVFRf8K) z9x@c|2T72+-KOm|kZ@j4EDDec>03FdgQlJ!&FbUQQH+nU^=U3Jyrgu97&#-W4C*;_ z(WacjhBDp@&Yon<9(BWPb;Q?Kc0gR5ZH~aRNkPAWbDY!FiYVSu!~Ss^9067|JCrZk z-{Rn2KEBR|Wti_iy) zXnh2wiU5Yz2L!W{{_#LwNWXeNPHkF=jjXmHC@n*oiz zIoM~Wvo^T@@t!QQW?Ujql-GBOlnB|HjN@x~K8z)c(X}%%5Zcux09vC8=@tvgY>czq z3D(U&FiETaN9aP}FDP3ZSIXIffq>M3{~eTB{uauL07oYiM=~K(XA{SN!rJLyXeC+Y zOdeebgHOc2aCIgC=8>-Q>zfuXV*=a&gp{l#E@K|{qft@YtO>xaF>O7sZz%8);e86? z+jJlFB{0fu6%8ew^_<+v>>%6eB8|t*_v7gb{x=vLLQYJKo;p7^o9!9A1)fZZ8i#ZU z<|E?bZakjkEV8xGi?n+{Xh3EgFKdM^;4D;5fHmc04PI>6oU>>WuLy6jgpPhf8$K4M zjJo*MbN0rZbZ!5DmoC^@hbqXiP^1l7I5;Wtp2i9Jkh+KtDJoXP0O8qmN;Sp(+%upX zAxXs*qlr(ck+-QG_mMx?hQNXVV~LT{$Q$ShX+&x?Q7v z@8t|UDylH6@RZ?WsMVd3B0z5zf50BP6U<&X_}+y3uJ0c5OD}+J&2T8}A%2Hu#Nt_4 zoOoTI$A!hQ<2pk5wfZDv+7Z{yo+Etqry=$!*pvYyS+kA4xnJ~3b~TBmA8Qd){w_bE zqDaLIjnU8m$wG#&T!}{e0qmHHipA{$j`%KN{&#_Kmjd&#X-hQN+ju$5Ms$iHj4r?) z&5m8tI}L$ih&95AjQ9EDfPKSmMj-@j?Q+h~C3<|Lg2zVtfKz=ft{YaQ1i6Om&EMll zzov%MsjSg=u^%EfnO+W}@)O6u0LwoX709h3Cxdc2Rwgjd%LLTChQvHZ+y<1q6kbJXj3_pq1&MBE{8 zd;aFotyW>4WHB{JSD8Z9M@jBitC1RF;!B8;Rf-B4nOiVbGlh9w51(8WjL&e{_iXN( zAvuMDIm_>L?rJPxc>S`bqC|W$njA0MKWa?V$u6mN@PLKYqak!bR!b%c^ze(M`ec(x zv500337YCT4gO3+9>oVIJLv$pkf`01S(DUM+4u!HQob|IFHJHm#>eb#eB1X5;bMc| z>QA4Zv}$S?fWg~31?Lr(C>MKhZg>gplRm`2WZ--iw%&&YlneQYY|PXl;_4*>vkp;I z$VYTZq|B*(3(y17#@ud@o)XUZPYN*rStQg5U1Sm2gM}7hf_G<>*T%6ebK*tF(kbJc zNPH4*xMnJNgw!ff{YXrhL&V$6`ylY={qT_xg9znQWw9>PlG~IbhnpsG_94Kk_(V-o&v7#F znra%uD-}KOX2dkak**hJnZZQyp#ERyyV^lNe!Qrg=VHiyr7*%j#PMvZMuYNE8o;JM zGrnDWmGGy)(UX{rLzJ*QEBd(VwMBXnJ@>*F8eOFy|FK*Vi0tYDw;#E zu#6eS;%Nm2KY+7dHGT3m{TM7sl=z8|V0e!DzEkY-RG8vTWDdSQFE|?+&FYA146@|y zV(JP>LWL;TSL6rao@W5fWqM1-xr$gRci#RQV2DX-x4@`w{uEUgoH4G|`J%H!N?*Qn zy~rjzuf(E7E!A9R2bSF|{{U(zO+;e29K_dGmC^p7MCP!=Bzq@}&AdF5=rtCwka zTT1A?5o}i*sXCsRXBt)`?nOL$zxuP3i*rm3Gmbmr6}9HCLvL*45d|(zP;q&(v%}S5yBmRVdYQQ24zh z6qL2<2>StU$_Ft29IyF!6=!@;tW=o8vNzVy*hh}XhZhUbxa&;9~woye<_YmkUZ)S?PW{7t; zmr%({tBlRLx=ffLd60`e{PQR3NUniWN2W^~7Sy~MPJ>A#!6PLnlw7O0(`=PgA}JLZ ztqhiNcKvobCcBel2 z-N82?4-()eGOisnWcQ9Wp23|ybG?*g!2j#>m3~0__IX1o%dG4b;VF@^B+mRgKx|ij zWr5G4jiRy}5n*(qu!W`y54Y*t8g`$YrjSunUmOsqykYB4-D(*(A~?QpuFWh;)A;5= zPl|=x+-w&H9B7EZGjUMqXT}MkcSfF}bHeRFLttu!vHD{Aq)3HVhvtZY^&-lxYb2%` zDXk7>V#WzPfJs6u{?ZhXpsMdm3kZscOc<^P&e&684Rc1-d=+=VOB)NR;{?0NjTl~D z1MXak$#X4{VNJyD$b;U~Q@;zlGoPc@ny!u7Pe;N2l4;i8Q=8>R3H{>HU(z z%hV2?rSinAg6&wuv1DmXok`5@a3@H0BrqsF~L$pRYHNEXXuRIWom0l zR9hrZpn1LoYc+G@q@VsFyMDNX;>_Vf%4>6$Y@j;KSK#g)TZRmjJxB!_NmUMTY(cAV zmewn7H{z`M3^Z& z2O$pWlDuZHAQJ{xjA}B;fuojAj8WxhO}_9>qd0|p0nBXS6IIRMX|8Qa!YDD{9NYYK z%JZrk2!Ss(Ra@NRW<7U#%8SZdWMFDU@;q<}%F{|6n#Y|?FaBgV$7!@|=NSVoxlJI4G-G(rn}bh|?mKkaBF$-Yr zA;t0r?^5Nz;u6gwxURapQ0$(-su(S+24Ffmx-aP(@8d>GhMtC5x*iEXIKthE*mk$` zOj!Uri|EAb4>03C1xaC#(q_I<;t}U7;1JqISVHz3tO{) zD(Yu@=>I9FDmDtUiWt81;BeaU{_=es^#QI7>uYl@e$$lGeZ~Q(f$?^3>$<<{n`Bn$ zn8bamZlL@6r^RZHV_c5WV7m2(G6X|OI!+04eAnNA5=0v1Z3lxml2#p~Zo57ri;4>;#16sSXXEK#QlH>=b$inEH0`G#<_ zvp;{+iY)BgX$R!`HmB{S&1TrS=V;*5SB$7*&%4rf_2wQS2ed2E%Wtz@y$4ecq4w<) z-?1vz_&u>s?BMrCQG6t9;t&gvYz;@K@$k!Zi=`tgpw*v-#U1Pxy%S9%52`uf$XMv~ zU}7FR5L4F<#9i%$P=t29nX9VBVv)-y7S$ZW;gmMVBvT$BT8d}B#XV^@;wXErJ-W2A zA=JftQRL>vNO(!n4mcd3O27bHYZD!a0kI)6b4hzzL9)l-OqWn)a~{VP;=Uo|D~?AY z#8grAAASNOkFMbRDdlqVUfB;GIS-B-_YXNlT_8~a|LvRMVXf!<^uy;)d$^OR(u)!) zHHH=FqJF-*BXif9uP~`SXlt0pYx|W&7jQnCbjy|8b-i>NWb@!6bx;1L&$v&+!%9BZ z0nN-l`&}xvv|wwxmC-ZmoFT_B#BzgQZxtm|4N+|;+(YW&Jtj^g!)iqPG++Z%x0LmqnF875%Ry&2QcCamx!T@FgE@H zN39P6e#I5y6Yl&K4eUP{^biV`u9{&CiCG#U6xgGRQr)zew;Z%x+ z-gC>y%gvx|dM=OrO`N@P+h2klPtbYvjS!mNnk4yE0+I&YrSRi?F^plh}hIp_+OKd#o7ID;b;%*c0ES z!J))9D&YufGIvNVwT|qsGWiZAwFODugFQ$VsNS%gMi8OJ#i${a4!E3<-4Jj<9SdSY z&xe|D0V1c`dZv+$8>(}RE|zL{E3 z-$5Anhp#7}oO(xm#}tF+W=KE*3(xxKxhBt-uuJP}`_K#0A< zE%rhMg?=b$ot^i@BhE3&)bNBpt1V*O`g?8hhcsV-n#=|9wGCOYt8`^#T&H7{U`yt2 z{l9Xl5CVsE=`)w4A^%PbIR6uG_5Ww9k`=q<@t9Bu662;o{8PTjDBzzbY#tL;$wrpjONqZ{^Ds4oanFm~uyPm#y1Ll3(H57YDWk9TlC zq;kebC!e=`FU&q2ojmz~GeLxaJHfs0#F%c(i+~gg$#$XOHIi@1mA72g2pFEdZSvp}m0zgQb5u2?tSRp#oo!bp`FP}< zaK4iuMpH+Jg{bb7n9N6eR*NZfgL7QiLxI zk6{uKr>xxJ42sR%bJ%m8QgrL|fzo9@?9eQiMW8O`j3teoO_R8cXPe_XiLnlYkE3U4 zN!^F)Z4ZWcA8gekEPLtFqX-Q~)te`LZnJK_pgdKs)Dp50 zdUq)JjlJeELskKg^6KY!sIou-HUnSFRsqG^lsHuRs`Z{f(Ti9eyd3cwu*Kxp?Ws7l z3cN>hGPXTnQK@qBgqz(n*qdJ2wbafELi?b90fK~+#XIkFGU4+HihnWq;{{)1J zv*Txl@GlnIMOjzjA1z%g?GsB2(6Zb-8fooT*8b0KF2CdsIw}~Hir$d3TdVHRx1m3c z4C3#h@1Xi@{t4zge-#B6jo*ChO%s-R%+9%-E|y<*4;L>$766RiygaLR?X%izyqMXA zb|N=Z-0PSFeH;W6aQ3(5VZWVC>5Ibgi&cj*c%_3=o#VyUJv* zM&bjyFOzlaFq;ZW(q?|yyi|_zS%oIuH^T*MZ6NNXBj;&yM3eQ7!CqXY?`7+*+GN47 zNR#%*ZH<^x{(0@hS8l{seisY~IE*)BD+R6^OJX}<2HRzo^fC$n>#yTOAZbk4%=Bei=JEe=o$jm`or0YDw*G?d> z=i$eEL7^}_?UI^9$;1Tn9b>$KOM@NAnvWrcru)r`?LodV%lz55O3y(%FqN;cKgj7t zlJ7BmLTQ*NDX#uelGbCY>k+&H*iSK?x-{w;f5G%%!^e4QT9z<_0vHbXW^MLR} zeC*jezrU|{*_F`I0mi)9=sUj^G03i@MjXx@ePv@(Udt2CCXVOJhRh4yp~fpn>ssHZ z?k(C>2uOMWKW5FVsBo#Nk!oqYbL`?#i~#!{3w^qmCto05uS|hKkT+iPrC-}hU_nbL zO622#mJupB21nChpime}&M1+whF2XM?prT-Vv)|EjWYK(yGYwJLRRMCkx;nMSpu?0 zNwa*{0n+Yg6=SR3-S&;vq=-lRqN`s9~#)OOaIcy3GZ&~l4g@2h| zThAN#=dh{3UN7Xil;nb8@%)wx5t!l z0RSe_yJQ+_y#qEYy$B)m2yDlul^|m9V2Ia$1CKi6Q19~GTbzqk*{y4;ew=_B4V8zw zScDH&QedBl&M*-S+bH}@IZUSkUfleyM45G>CnYY{hx8J9q}ME?Iv%XK`#DJRNmAYt zk2uY?A*uyBA=nlYjkcNPMGi*552=*Q>%l?gDK_XYh*Rya_c)ve{=ps`QYE0n!n!)_$TrGi_}J|>1v}(VE7I~aP-wns#?>Y zu+O7`5kq32zM4mAQpJ50vJsUDT_^s&^k-llQMy9!@wRnxw@~kXV6{;z_wLu3i=F3m z&eVsJmuauY)8(<=pNUM5!!fQ4uA6hBkJoElL1asWNkYE#qaP?a+biwWw~vB48PRS7 zY;DSHvgbIB$)!uJU)xA!yLE*kP0owzYo`v@wfdux#~f!dv#uNc_$SF@Qq9#3q5R zfuQnPPN_(z;#X#nRHTV>TWL_Q%}5N-a=PhkQ^GL+$=QYfoDr2JO-zo#j;mCsZVUQ) zJ96e^OqdLW6b-T@CW@eQg)EgIS9*k`xr$1yDa1NWqQ|gF^2pn#dP}3NjfRYx$pTrb zwGrf8=bQAjXx*8?du*?rlH2x~^pXjiEmj^XwQo{`NMonBN=Q@Y21!H)D( zA~%|VhiTjaRQ%|#Q9d*K4j~JDXOa4wmHb0L)hn*;Eq#*GI}@#ux4}bt+olS(M4$>c z=v8x74V_5~xH$sP+LZCTrMxi)VC%(Dg!2)KvW|Wwj@pwmH6%8zd*x0rUUe$e(Z%AW z@Q{4LL9#(A-9QaY2*+q8Yq2P`pbk3!V3mJkh3uH~uN)+p?67d(r|Vo0CebgR#u}i? zBxa^w%U|7QytN%L9bKaeYhwdg7(z=AoMeP0)M3XZA)NnyqL%D_x-(jXp&tp*`%Qsx z6}=lGr;^m1<{;e=QQZ!FNxvLcvJVGPkJ63at5%*`W?46!6|5FHYV0qhizSMT>Zoe8 zsJ48kb2@=*txGRe;?~KhZgr-ZZ&c0rNV7eK+h$I-UvQ=552@psVrvj#Ys@EU4p8`3 zsNqJu-o=#@9N!Pq`}<=|((u)>^r0k^*%r<{YTMm+mOPL>EoSREuQc-e2~C#ZQ&Xve zZ}OUzmE4{N-7cqhJiUoO_V#(nHX11fdfVZJT>|6CJGX5RQ+Ng$Nq9xs-C86-)~`>p zW--X53J`O~vS{WWjsAuGq{K#8f#2iz` zzSSNIf6;?5sXrHig%X(}0q^Y=eYwvh{TWK-fT>($8Ex>!vo_oGFw#ncr{vmERi^m7lRi%8Imph})ZopLoIWt*eFWSPuBK zu>;Pu2B#+e_W|IZ0_Q9E9(s@0>C*1ft`V{*UWz^K<0Ispxi@4umgGXW!j%7n+NC~* zBDhZ~k6sS44(G}*zg||X#9Weto;u*Ty;fP!+v*7be%cYG|yEOBomch#m8Np!Sw`L)q+T` zmrTMf2^}7j=RPwgpO9@eXfb{Q>GW#{X=+xt`AwTl!=TgYm)aS2x5*`FSUaaP_I{Xi zA#irF%G33Bw>t?^1YqX%czv|JF0+@Pzi%!KJ?z!u$A`Catug*tYPO`_Zho5iip0@! z;`rR0-|Ao!YUO3yaujlSQ+j-@*{m9dHLtve!sY1Xq_T2L3&=8N;n!!Eb8P0Z^p4PL zQDdZ?An2uzbIakOpC|d@=xEA}v-srucnX3Ym{~I#Ghl~JZU(a~Ppo9Gy1oZH&Wh%y zI=KH_s!Lm%lAY&`_KGm*Ht)j*C{-t}Nn71drvS!o|I|g>ZKjE3&Mq0TCs6}W;p>%M zQ(e!h*U~b;rsZ1OPigud>ej=&hRzs@b>>sq6@Yjhnw?M26YLnDH_Wt#*7S$-BtL08 zVyIKBm$}^vp?ILpIJetMkW1VtIc&7P3z0M|{y5gA!Yi5x4}UNz5C0Wdh02!h zNS>923}vrkzl07CX`hi)nj-B?#n?BJ2Vk0zOGsF<~{Fo7OMCN_85daxhk*pO}x_8;-h>}pcw26V6CqR-=x2vRL?GB#y%tYqi;J}kvxaz}*iFO6YO0ha6!fHU9#UI2Nv z_(`F#QU1B+P;E!t#Lb)^KaQYYSewj4L!_w$RH%@IL-M($?DV@lGj%3ZgVdHe^q>n(x zyd5PDpGbvR-&p*eU9$#e5#g3-W_Z@loCSz}f~{94>k6VRG`e5lI=SE0AJ7Z_+=nnE zTuHEW)W|a8{fJS>2TaX zuRoa=LCP~kP)kx4L+OqTjtJOtXiF=y;*eUFgCn^Y@`gtyp?n14PvWF=zhNGGsM{R- z^DsGxtoDtx+g^hZi@E2Y(msb-hm{dWiHdoQvdX88EdM>^DS#f}&kCGpPFDu*KjEpv$FZtLpeT>@)mf|z#ZWEsueeW~hF78Hu zfY9a+Gp?<)s{Poh_qdcSATV2oZJo$OH~K@QzE2kCADZ@xX(; z)0i=kcAi%nvlsYagvUp(z0>3`39iKG9WBDu3z)h38p|hLGdD+Khk394PF3qkX!02H z#rNE`T~P9vwNQ_pNe0toMCRCBHuJUmNUl)KFn6Gu2je+p>{<9^oZ4Gfb!)rLZ3CR3 z-o&b;Bh>51JOt=)$-9+Z!P}c@cKev_4F1ZZGs$I(A{*PoK!6j@ZJrAt zv2LxN#p1z2_0Ox|Q8PVblp9N${kXkpsNVa^tNWhof)8x8&VxywcJz#7&P&d8vvxn` zt75mu>yV=Dl#SuiV!^1BPh5R)`}k@Nr2+s8VGp?%Le>+fa{3&(XYi~{k{ z-u4#CgYIdhp~GxLC+_wT%I*)tm4=w;ErgmAt<5i6c~)7JD2olIaK8by{u-!tZWT#RQddptXRfEZxmfpt|@bs<*uh?Y_< zD>W09Iy4iM@@80&!e^~gj!N`3lZwosC!!ydvJtc0nH==K)v#ta_I}4Tar|;TLb|+) zSF(;=?$Z0?ZFdG6>Qz)6oPM}y1&zx_Mf`A&chb znSERvt9%wdPDBIU(07X+CY74u`J{@SSgesGy~)!Mqr#yV6$=w-dO;C`JDmv=YciTH zvcrN1kVvq|(3O)NNdth>X?ftc`W2X|FGnWV%s})+uV*bw>aoJ#0|$pIqK6K0Lw!@- z3pkPbzd`ljS=H2Bt0NYe)u+%kU%DWwWa>^vKo=lzDZHr>ruL5Ky&#q7davj-_$C6J z>V8D-XJ}0cL$8}Xud{T_{19#W5y}D9HT~$&YY-@=Th219U+#nT{tu=d|B)3K`pL53 zf7`I*|L@^dPEIDJkI3_oA9vsH7n7O}JaR{G~8 zfi$?kmKvu20(l`dV7=0S43VwVKvtF!7njv1Q{Ju#ysj=|dASq&iTE8ZTbd-iiu|2& zmll%Ee1|M?n9pf~?_tdQ<7%JA53!ulo1b^h#s|Su2S4r{TH7BRB3iIOiX5|vc^;5( zKfE1+ah18YA9o1EPT(AhBtve5(%GMbspXV)|1wf5VdvzeYt8GVGt0e*3|ELBhwRaO zE|yMhl;Bm?8Ju3-;DNnxM3Roelg`^!S%e({t)jvYtJCKPqN`LmMg^V&S z$9OIFLF$%Py~{l?#ReyMzpWixvm(n(Y^Am*#>atEZ8#YD&?>NUU=zLxOdSh0m6mL? z_twklB0SjM!3+7U^>-vV=KyQZI-6<(EZiwmNBzGy;Sjc#hQk%D;bay$v#zczt%mFCHL*817X4R;E$~N5(N$1Tv{VZh7d4mhu?HgkE>O+^-C*R@ zR0ima8PsEV*WFvz`NaB+lhX3&LUZcWWJJrG7ZjQrOWD%_jxv=)`cbCk zMgelcftZ%1-p9u!I-Zf_LLz{hcn5NRbxkWby@sj2XmYfAV?iw^0?hM<$&ZDctdC`; zsL|C-7d;w$z2Gt0@hsltNlytoPnK&$>ksr(=>!7}Vk#;)Hp)LuA7(2(Hh(y3LcxRY zim!`~j6`~B+sRBv4 z<#B{@38kH;sLB4eH2+8IPWklhd25r5j2VR}YK$lpZ%7eVF5CBr#~=kUp`i zlb+>Z%i%BJH}5dmfg1>h7U5Q(-F{1d=aHDbMv9TugohX5lq#szPAvPE|HaokMQIi_ zTcTNsO53(oX=hg2w!XA&+qP}nwr$(C)pgG8emS@Mf7m0&*kiA!wPLS`88c=aD$niJ zp?3j%NI^uy|5*MzF`k4hFbsyQZ@wu!*IY+U&&9PwumdmyfL(S0#!2RFfmtzD3m9V7 zsNOw9RQofl-XBfKBF^~~{oUVouka#r3EqRf=SnleD=r1Hm@~`y8U7R)w16fgHvK-6?-TFth)f3WlklbZh+}0 zx*}7oDF4U^1tX4^$qd%987I}g;+o0*$Gsd=J>~Uae~XY6UtbdF)J8TzJXoSrqHVC) zJ@pMgE#;zmuz?N2MIC+{&)tx=7A%$yq-{GAzyz zLzZLf=%2Jqy8wGHD;>^x57VG)sDZxU+EMfe0L{@1DtxrFOp)=zKY1i%HUf~Dro#8} zUw_Mj10K7iDsX}+fThqhb@&GI7PwONx!5z;`yLmB_92z0sBd#HiqTzDvAsTdx+%W{ z2YL#U=9r!@3pNXMp_nvximh+@HV3psUaVa-lOBekVuMf1RUd26~P*|MLouQrb}XM-bEw(UgQxMI6M&l3Nha z{MBcV=tl(b_4}oFdAo}WX$~$Mj-z70FowdoB{TN|h2BdYs?$imcj{IQpEf9q z)rzpttc0?iwopSmEoB&V!1aoZqEWEeO-MKMx(4iK7&Fhc(94c zdy}SOnSCOHX+A8q@i>gB@mQ~Anv|yiUsW!bO9hb&5JqTfDit9X6xDEz*mQEiNu$ay zwqkTV%WLat|Ar+xCOfYs0UQNM`sdsnn*zJr>5T=qOU4#Z(d90!IL76DaHIZeWKyE1 zqwN%9+~lPf2d7)vN2*Q?En?DEPcM+GQwvA<#;X3v=fqsxmjYtLJpc3)A8~*g(KqFx zZEnqqruFDnEagXUM>TC7ngwKMjc2Gx%#Ll#=N4qkOuK|;>4%=0Xl7k`E69@QJ-*Vq zk9p5!+Ek#bjuPa<@Xv7ku4uiWo|_wy)6tIr`aO!)h>m5zaMS-@{HGIXJ0UilA7*I} z?|NZ!Tp8@o-lnyde*H+@8IHME8VTQOGh96&XX3E+}OB zA>VLAGW+urF&J{H{9Gj3&u+Gyn?JAVW84_XBeGs1;mm?2SQm9^!3UE@(_FiMwgkJI zZ*caE={wMm`7>9R?z3Ewg!{PdFDrbzCmz=RF<@(yQJ_A6?PCd_MdUf5vv6G#9Mf)i#G z($OxDT~8RNZ>1R-vw|nN699a}MQN4gJE_9gA-0%>a?Q<9;f3ymgoi$OI!=aE6Elw z2I`l!qe-1J$T$X&x9Zz#;3!P$I);jdOgYY1nqny-k=4|Q4F!mkqACSN`blRji>z1` zc8M57`~1lgL+Ha%@V9_G($HFBXH%k;Swyr>EsQvg%6rNi){Tr&+NAMga2;@85531V z_h+h{jdB&-l+%aY{$oy2hQfx`d{&?#psJ78iXrhrO)McOFt-o80(W^LKM{Zw93O}m z;}G!51qE?hi=Gk2VRUL2kYOBRuAzktql%_KYF4>944&lJKfbr+uo@)hklCHkC=i)E zE*%WbWr@9zoNjumq|kT<9Hm*%&ahcQ)|TCjp@uymEU!&mqqgS;d|v)QlBsE0Jw|+^ zFi9xty2hOk?rlGYT3)Q7i4k65@$RJ-d<38o<`}3KsOR}t8sAShiVWevR8z^Si4>dS z)$&ILfZ9?H#H&lumngpj7`|rKQQ`|tmMmFR+y-9PP`;-425w+#PRKKnx7o-Rw8;}*Ctyw zKh~1oJ5+0hNZ79!1fb(t7IqD8*O1I_hM;o*V~vd_LKqu7c_thyLalEF8Y3oAV=ODv z$F_m(Z>ucO(@?+g_vZ`S9+=~Msu6W-V5I-V6h7->50nQ@+TELlpl{SIfYYNvS6T6D z`9cq=at#zEZUmTfTiM3*vUamr!OB~g$#?9$&QiwDMbSaEmciWf3O2E8?oE0ApScg38hb&iN%K+kvRt#d))-tr^ zD+%!d`i!OOE3in0Q_HzNXE!JcZ<0;cu6P_@;_TIyMZ@Wv!J z)HSXAYKE%-oBk`Ye@W3ShYu-bfCAZ}1|J16hFnLy z?Bmg2_kLhlZ*?`5R8(1%Y?{O?xT)IMv{-)VWa9#1pKH|oVRm4!lLmls=u}Lxs44@g^Zwa0Z_h>Rk<(_mHN47=Id4oba zQ-=qXGz^cNX(b*=NT0<^23+hpS&#OXzzVO@$Z2)D`@oS=#(s+eQ@+FSQcpXD@9npp zlxNC&q-PFU6|!;RiM`?o&Sj&)<4xG3#ozRyQxcW4=EE;E)wcZ&zUG*5elg;{9!j}I z9slay#_bb<)N!IKO16`n3^@w=Y%duKA-{8q``*!w9SW|SRbxcNl50{k&CsV@b`5Xg zWGZ1lX)zs_M65Yt&lO%mG0^IFxzE_CL_6$rDFc&#xX5EXEKbV8E2FOAt>Ka@e0aHQ zMBf>J$FLrCGL@$VgPKSbRkkqo>sOXmU!Yx+Dp7E3SRfT`v~!mjU3qj-*!!YjgI*^) z+*05x78FVnVwSGKr^A|FW*0B|HYgc{c;e3Ld}z4rMI7hVBKaiJRL_e$rxDW^8!nGLdJ<7ex9dFoyj|EkODflJ#Xl`j&bTO%=$v)c+gJsLK_%H3}A_} z6%rfG?a7+k7Bl(HW;wQ7BwY=YFMSR3J43?!;#~E&)-RV_L!|S%XEPYl&#`s!LcF>l zn&K8eemu&CJp2hOHJKaYU#hxEutr+O161ze&=j3w12)UKS%+LAwbjqR8sDoZHnD=m0(p62!zg zxt!Sj65S?6WPmm zL&U9c`6G}T`irf=NcOiZ!V)qhnvMNOPjVkyO2^CGJ+dKTnNAPa?!AxZEpO7yL_LkB zWpolpaDfSaO-&Uv=dj7`03^BT3_HJOAjn~X;wz-}03kNs@D^()_{*BD|0mII!J>5p z1h06PTyM#3BWzAz1FPewjtrQfvecWhkRR=^gKeFDe$rmaYAo!np6iuio3>$w?az$E zwGH|zy@OgvuXok}C)o1_&N6B3P7ZX&-yimXc1hAbXr!K&vclCL%hjVF$yHpK6i_Wa z*CMg1RAH1(EuuA01@lA$sMfe*s@9- z$jNWqM;a%d3?(>Hzp*MiOUM*?8eJ$=(0fYFis!YA;0m8s^Q=M0Hx4ai3eLn%CBm14 zOb8lfI!^UAu_RkuHmKA-8gx8Z;##oCpZV{{NlNSe<i;9!MfIN!&;JI-{|n{(A19|s z9oiGesENcLf@NN^9R0uIrgg(46r%kjR{0SbnjBqPq()wDJ@LC2{kUu_j$VR=l`#RdaRe zxx;b7bu+@IntWaV$si1_nrQpo*IWGLBhhMS13qH zTy4NpK<-3aVc;M)5v(8JeksSAGQJ%6(PXGnQ-g^GQPh|xCop?zVXlFz>42%rbP@jg z)n)% zM9anq5(R=uo4tq~W7wES$g|Ko z1iNIw@-{x@xKxSXAuTx@SEcw(%E49+JJCpT(y=d+n9PO0Gv1SmHkYbcxPgDHF}4iY zkXU4rkqkwVBz<{mcv~A0K|{zpX}aJcty9s(u-$je2&=1u(e#Q~UA{gA!f;0EAaDzdQ=}x7g(9gWrWYe~ zV98=VkHbI!5Rr;+SM;*#tOgYNlfr7;nLU~MD^jSdSpn@gYOa$TQPv+e8DyJ&>aInB zDk>JmjH=}<4H4N4z&QeFx>1VPY8GU&^1c&71T*@2#dINft%ibtY(bAm%<2YwPL?J0Mt{ z7l7BR718o5=v|jB!<7PDBafdL>?cCdVmKC;)MCOobo5edt%RTWiReAMaIU5X9h`@El0sR&Z z7Ed+FiyA+QAyWn zf7=%(8XpcS*C4^-L24TBUu%0;@s!Nzy{e95qjgkzElf0#ou`sYng<}wG1M|L? zKl6ITA1X9mt6o@S(#R3B{uwJI8O$&<3{+A?T~t>Kapx6#QJDol6%?i-{b1aRu?&9B z*W@$T*o&IQ&5Kc*4LK_)MK-f&Ys^OJ9FfE?0SDbAPd(RB)Oju#S(LK)?EVandS1qb#KR;OP|86J?;TqI%E8`vszd&-kS%&~;1Als=NaLzRNnj4q=+ zu5H#z)BDKHo1EJTC?Cd_oq0qEqNAF8PwU7fK!-WwVEp4~4g z3SEmE3-$ddli))xY9KN$lxEIfyLzup@utHn=Q{OCoz9?>u%L^JjClW$M8OB`txg4r6Q-6UlVx3tR%%Z!VMb6#|BKRL`I))#g zij8#9gk|p&Iwv+4s+=XRDW7VQrI(+9>DikEq!_6vIX8$>poDjSYIPcju%=qluSS&j zI-~+ztl1f71O-B+s7Hf>AZ#}DNSf`7C7*)%(Xzf|ps6Dr7IOGSR417xsU=Rxb z1pgk9vv${17h7mZ{)*R{mc%R=!i}8EFV9pl8V=nXCZruBff`$cqN3tpB&RK^$yH!A8RL zJ5KltH$&5%xC7pLZD}6wjD2-uq3&XL8CM$@V9jqalF{mvZ)c4Vn?xXbvkB(q%xbSdjoXJXanVN@I;8I`)XlBX@6BjuQKD28Jrg05} z^ImmK-Ux*QMn_A|1ionE#AurP8Vi?x)7jG?v#YyVe_9^up@6^t_Zy^T1yKW*t* z&Z0+0Eo(==98ig=^`he&G^K$I!F~1l~gq}%o5#pR6?T+ zLmZu&_ekx%^nys<^tC@)s$kD`^r8)1^tUazRkWEYPw0P)=%cqnyeFo3nW zyV$^0DXPKn5^QiOtOi4MIX^#3wBPJjenU#2OIAgCHPKXv$OY=e;yf7+_vI7KcjKq% z?RVzC24ekYp2lEhIE^J$l&wNX0<}1Poir8PjM`m#zwk-AL0w6WvltT}*JN8WFmtP_ z6#rK7$6S!nS!}PSFTG6AF7giGJw5%A%14ECde3x95(%>&W3zUF!8x5%*h-zk8b@Bz zh`7@ixoCVCZ&$$*YUJpur90Yg0X-P82>c~NMzDy7@Ed|6(#`;{)%t7#Yb>*DBiXC3 zUFq(UDFjrgOsc%0KJ_L;WQKF0q!MINpQzSsqwv?#Wg+-NO; z84#4nk$+3C{2f#}TrRhin=Erdfs77TqBSvmxm0P?01Tn@V(}gI_ltHRzQKPyvQ2=M zX#i1-a(>FPaESNx+wZ6J{^m_q3i})1n~JG80c<%-Ky!ZdTs8cn{qWY%x%X^27-Or_ z`KjiUE$OG9K4lWS16+?aak__C*)XA{ z6HmS*8#t_3dl}4;7ZZgn4|Tyy1lOEM1~6Qgl(|BgfQF{Mfjktch zB5kc~4NeehRYO%)3Z!FFHhUVVcV@uEX$eft5Qn&V3g;}hScW_d)K_h5i)vxjKCxcf zL>XlZ^*pQNuX*RJQn)b6;blT3<7@Ap)55)aK3n-H08GIx65W zO9B%gE%`!fyT`)hKjm-&=on)l&!i-QH+mXQ&lbXg0d|F{Ac#U;6b$pqQcpqWSgAPo zmr$gOoE*0r#7J=cu1$5YZE%uylM!i3L{;GW{ae9uy)+EaV>GqW6QJ)*B2)-W`|kLL z)EeeBtpgm;79U_1;Ni5!c^0RbG8yZ0W98JiG~TC8rjFRjGc6Zi8BtoC);q1@8h7UV zFa&LRzYsq%6d!o5-yrqyjXi>jg&c8bu}{Bz9F2D(B%nnuVAz74zmBGv)PAdFXS2(A z=Z?uupM2f-ar0!A)C6l2o8a|+uT*~huH)!h3i!&$ zr>76mt|lwexD(W_+5R{e@2SwR15lGxsnEy|gbS-s5?U}l*kcfQlfnQKo5=LZXizrL zM=0ty+$#f_qGGri-*t@LfGS?%7&LigUIU#JXvwEdJZvIgPCWFBTPT`@Re5z%%tRDO zkMlJCoqf2A=hkU7Ih=IxmPF~fEL90)u76nfFRQwe{m7b&Ww$pnk~$4Lx#s9|($Cvt ze|p{Xozhb^g1MNh-PqS_dLY|Fex4|rhM#lmzq&mhebD$5P>M$eqLoV|z=VQY{)7&sR#tW zl(S1i!!Rrg7kv+V@EL51PGpm511he%MbX2-Jl+DtyYA(0gZyZQjPZP@`SAH{n&25@ zd)emg(p2T3$A!Nmzo|%=z%AhLX)W4hsZNFhmd4<1l6?b3&Fg)G(Zh%J{Cf8Q;?_++ zgO7O<(-)H|Es@QqUgcXNJEfC-BCB~#dhi6ADVZtL!)Mx|u7>ukD052z!QZ5UC-+rd zYXWNRpCmdM{&?M9OMa;OiN{Y#0+F>lBQ=W@M;OXq;-7v3niC$pM8p!agNmq7F04;| z@s-_98JJB&s`Pr6o$KZ=8}qO*7m6SMp7kVmmh$jfnG{r@O(auI7Z^jj!x}NTLS9>k zdo}&Qc2m4Ws3)5qFw#<$h=g%+QUKiYog33bE)e4*H~6tfd42q+|FT5+vmr6Y$6HGC zV!!q>B`1Ho|6E|D<2tYE;4`8WRfm2#AVBBn%_W)mi(~x@g;uyQV3_)~!#A6kmFy0p zY~#!R1%h5E{5;rehP%-#kjMLt*{g((o@0-9*8lKVu+t~CtnOxuaMgo2ssI6@kX09{ zkn~q8Gx<6T)l}7tWYS#q0&~x|-3ho@l}qIr79qOJQcm&Kfr7H54=BQto0)vd1A_*V z)8b2{xa5O^u95~TS=HcJF5b9gMV%&M6uaj<>E zPNM~qGjJ~xbg%QTy#(hPtfc46^nN=Y_GmPYY_hTL{q`W3NedZyRL^kgU@Q$_KMAjEzz*eip`3u6AhPDcWXzR=Io5EtZRPme>#K9 z4lN&87i%YYjoCKN_z9YK+{fJu{yrriba#oGM|2l$ir017UH86Eoig3x+;bz32R*;n zt)Eyg#PhQbbGr^naCv0?H<=@+Poz)Xw*3Gn00qdSL|zGiyYKOA0CP%qk=rBAlt~hr zEvd3Z4nfW%g|c`_sfK$z8fWsXTQm@@eI-FpLGrW<^PIjYw)XC-xFk+M<6>MfG;WJr zuN}7b;p^`uc0j(73^=XJcw;|D4B(`)Flm|qEbB?>qBBv2V?`mWA?Q3yRdLkK7b}y& z+!3!JBI{+&`~;%Pj#n&&y+<;IQzw5SvqlbC+V=kLZLAHOQb zS{{8E&JXy1p|B&$K!T*GKtSV^{|Uk;`oE*F;?@q1dX|>|KWb@|Dy*lbGV0Gx;gpA$ z*N16`v*gQ?6Skw(f^|SL;;^ox6jf2AQ$Zl?gvEV&H|-ep*hIS@0TmGu1X1ZmEPY&f zKCrV{UgRAiNU*=+Uw%gjIQhTAC@67m)6(_D+N>)(^gK74F%M2NUpWpho}aq|Kxh$3 zz#DWOmQV4Lg&}`XTU41Z|P~5;wN2c?2L{a=)Xi~!m#*=22c~&AW zgG#yc!_p##fI&E{xQD9l#^x|9`wSyCMxXe<3^kDIkS0N>=oAz7b`@M>aT?e$IGZR; zS;I{gnr4cS^u$#>D(sjkh^T6_$s=*o%vNLC5+6J=HA$&0v6(Y1lm|RDn&v|^CTV{= zjVrg_S}WZ|k=zzp>DX08AtfT@LhW&}!rv^);ds7|mKc5^zge_Li>FTNFoA8dbk@K$ zuuzmDQRL1leikp%m}2_`A7*7=1p2!HBlj0KjPC|WT?5{_aa%}rQ+9MqcfXI0NtjvXz1U)|H>0{6^JpHspI4MfXjV%1Tc1O!tdvd{!IpO+@ z!nh()i-J3`AXow^MP!oVLVhVW&!CDaQxlD9b|Zsc%IzsZ@d~OfMvTFXoEQg9Nj|_L zI+^=(GK9!FGck+y8!KF!nzw8ZCX>?kQr=p@7EL_^;2Mlu1e7@ixfZQ#pqpyCJ```(m;la2NpJNoLQR};i4E;hd+|QBL@GdQy(Cc zTSgZ)4O~hXj86x<7&ho5ePzDrVD`XL7{7PjjNM1|6d5>*1hFPY!E(XDMA+AS;_%E~ z(dOs)vy29&I`5_yEw0x{8Adg%wvmoW&Q;x?5`HJFB@KtmS+o0ZFkE@f)v>YYh-z&m z#>ze?@JK4oE7kFRFD%MPC@x$^p{aW}*CH9Y_(oJ~St#(2)4e-b34D>VG6giMGFA83 zpZTHM2I*c8HE}5G;?Y7RXMA2k{Y?RxHb2 zZFQv?!*Kr_q;jt3`{?B5Wf}_a7`roT&m1BN9{;5Vqo6JPh*gnN(gj}#=A$-F(SRJj zUih_ce0f%K19VLXi5(VBGOFbc(YF zLvvOJl+W<}>_6_4O?LhD>MRGlrk;~J{S#Q;Q9F^;Cu@>EgZAH=-5fp02(VND(v#7n zK-`CfxEdonk!!65?3Ry(s$=|CvNV}u$5YpUf?9kZl8h@M!AMR7RG<9#=`_@qF@})d ztJDH>=F!5I+h!4#^DN6C$pd6^)_;0Bz7|#^edb9_qFg&eI}x{Roovml5^Yf5;=ehZ zGqz-x{I`J$ejkmGTFipKrUbv-+1S_Yga=)I2ZsO16_ye@!%&Op^6;#*Bm;=I^#F;? z27Sz-pXm4x-ykSW*3`)y4$89wy6dNOP$(@VYuPfb97XPDTY2FE{Z+{6=}LLA23mAc zskjZJ05>b)I7^SfVc)LnKW(&*(kP*jBnj>jtph`ZD@&30362cnQpZW8juUWcDnghc zy|tN1T6m?R7E8iyrL%)53`ymXX~_;#r${G`4Q(&7=m7b#jN%wdLlS0lb~r9RMdSuU zJ{~>>zGA5N`^QmrzaqDJ(=9y*?@HZyE!yLFONJO!8q5Up#2v>fR6CkquE$PEcvw5q zC8FZX!15JgSn{Gqft&>A9r0e#be^C<%)psE*nyW^e>tsc8s4Q}OIm})rOhuc{3o)g1r>Q^w5mas) zDlZQyjQefhl0PmH%cK05*&v{-M1QCiK=rAP%c#pdCq_StgDW}mmw$S&K6ASE=`u4+ z5wcmtrP27nAlQCc4qazffZoFV7*l2=Va}SVJD6CgRY^=5Ul=VYLGqR7H^LHA;H^1g}ekn=4K8SPRCT+pel*@jUXnLz+AIePjz@mUsslCN2 z({jl?BWf&DS+FlE5Xwp%5zXC7{!C=k9oQLP5B;sLQxd`pg+B@qPRqZ6FU(k~QkQu{ zF~5P=kLhs+D}8qqa|CQo2=cv$wkqAzBRmz_HL9(HRBj&73T@+B{(zZahlkkJ>EQmQ zenp59dy+L;sSWYde!z_W+I~-+2Xnm;c;wI_wH=RTgxpMlCW@;Us*0}L74J#E z8XbDWJGpBscw?W$&ZxZNxUq(*DKDwNzW7_}AIw$HF6Ix|;AJ3t6lN=v(c9=?n9;Y0 zK9A0uW4Ib9|Mp-itnzS#5in=Ny+XhGO8#(1_H4%Z6yEBciBiHfn*h;^r9gWb^$UB4 zJtN8^++GfT`1!WfQt#3sXGi-p<~gIVdMM<#ZZ0e_kdPG%Q5s20NNt3Jj^t$(?5cJ$ zGZ#FT(Lt>-0fP4b5V3az4_byF12k%}Spc$WsRydi&H|9H5u1RbfPC#lq=z#a9W(r1 z!*}KST!Yhsem0tO#r!z`znSL-=NnP~f(pw-sE+Z$e7i7t9nBP^5ts1~WFmW+j+<@7 zIh@^zKO{1%Lpx^$w8-S+T_59v;%N;EZtJzcfN%&@(Ux5 z@YzX^MwbbXESD*d(&qT7-eOHD6iaH-^N>p2sVdq&(`C$;?#mgBANIc5$r| z^A$r)@c{Z}N%sbfo?T`tTHz9-YpiMW?6>kr&W9t$Cuk{q^g1<$I~L zo++o2!!$;|U93cI#p4hyc!_Mv2QKXxv419}Ej#w#%N+YIBDdnn8;35!f2QZkUG?8O zpP47Wf9rnoI^^!9!dy~XsZ&!DU4bVTAi3Fc<9$_krGR&3TI=Az9uMgYU5dd~ksx+} zP+bs9y+NgEL>c@l>H1R%@>5SWg2k&@QZL(qNUI4XwDl6(=!Q^U%o984{|0e|mR$p+ z9BcwttR#7?As?@Q{+j?K6H7R71PuiA^Dl$=f47nUKL|koCwutc_P<-m{|Al3C~o7w z=4S=}s5LcJFT1zjS)+10X_r$74`K78pz!nGGH%JV%w75!YSIt#hT7}}K>+@{{a+Im z5p#6%^X*txY?}|T17xWW*sa^?G2QHt#@tlcw0GIcy;|NR2vaCBDvn=`h)1il7E5Rx z%)mA4$`$OZx)NF5vXZnaJ1)*cA6ryx6Ll~t!LzhxvcTedxT;>JS&e=?-&DXUPaQ2~ zH*69ezE`hgV{K-|0z|m~ld}=X^-Ob={wpex&}*+Rz{gx)G}gn!C_VN{UN=>^EV=Xc zr$-HO09cW&p4^M}V3yBjTP_xrVcc8iU_^Y-JD~(bgw*@GXGB1gYKz5DWO+O`>})|N zWrC)MR93yA)3{&27-M)TJB6Ml3~?zZg#mYsF=#OSTaw&K z@hBftpt+2l@)YK@|3DvTjl(8wZtpLp9Ik!6G$CSL_idZ$Ti?R)4toe8bb)l|)lNb}?K;O2K9vyn1QG zd=v#y-Ld49UVkmfRU>Egc+(Y$^-;6vW;3Lcu*6~etz}0|@+b|+!UCal)DEYGLbHWJ zll5Wi^$Y<6@S%^y%hdjRh6&{!z1Py|lZ|q&Wub3l41uN2zEF8E&5H5?PL*&V}?*a}Lp% zCYi{ghjpRNT^^B+_U59No50Ghih5qn(W5`RkrsDWr{~A1dgtv{sRkH4RU2^A{jb&0 zxVRnrm|u<;$iI;M6A>$POP)TWGU-gSjAERk*EGmVT(aw$!XUSe~7Ql-oRA54^4V(JWS6Q1mG?!vZ zx+pE!FEtvqr|Xrcb3oR`%LHFLmU_&{=p%mGy6MRe2Yz_5WJ8p@IgU2 zdVvvhhQtiQkChK%*&PsiPCBL9oDOoJX8!$S(V>R}+1M}wzK*U*A{KJ`r=lM;mPrKU zQDqqN(W*u-5-?$(SIk<6A0E}34y&@-IVC%S!a1F4kz<3bIKjlyD)ooO_7ftl%S_(6w`!vX&1PZ!K`@D@L6JR)6zO@Dl!YF{RY}d3HZ7?Q5E>w=$ ze)H_)48Ds*Ov4?zoGb2fe3}{!5Ooc|KCIni1o)(Gj+CO?`*7jsV`hIv@8J(22o4Q? zu?Bvi)zDG(me?7XKeL|iF9ZRgZdT*}Ffsl62Cu;{Gv9j6dO zPt*H2GqC)-C`V`ceuu=tM{7!2yTEj=*5+T~5DYiZ)Hy)*PARYI6R2lZXoOj;v8M4W z*O-NX(7_~Q&A3>Oaw&1lBH_H%SwmISX-i3)HfHvBOeVwTT{LUM3}ZuZmg<(>)KE;d zbs2!0v6>J;1nQ0UJkUxnkE@Ibi~Q}M=-=Rk;hcOnxO$luOKEVxZc|!XECgex(2`}T z3Y;Q_6rL)e+SrOZhQj5_e}Lv>w7n*Pep$yWZNQl>ubBgb_NIWWDn3kNpn+MPQXV;8 zV|_Ba5jsQ(w&Ey^IM|@|y!AqcJ#3m0#Q6_qvgCG~eoF#mnGmbO(;DP+bW%_aOs1R_ z@9p#7X2UA^--#Nwx_Hvk2l1`eO{P*#j@q2UELtH|Uh6hxR`h_847wIJo0=5CQQ`6it|%a-I$^&a@we1rc&*;QIu5Ck^?) zx*5eSd*mG#=6Hi(5!;5uUi&{HfnT1S8X-)?gE5CZ6KWoqM5|CyrULmuFBKOU8SOp* z{IB1$OCcq`S-k*xs;4fmhKsIGZ;GYAY*%(@875NxhMq|j*m4CNLI(Vho|N|F);!E0cS5y^$H^Izje?z}oTgyr`9x9G&rlJZw&uqIoBMtz zzhU0(9;w02?m#0!)cFi*r+8YvooQ;(s2lLVvyLqAE%Xqe!vtWbIs!l1Bpp(FIht-Z zPn#CN-2C|J*GhA2fuHqYQ2mJiXlGTzD}mkr2;ia8Wp}h^;OS7+N^Mw|en!1${vN6 z-x{8N*4UekA~`IV2&K-GzhAqau|}d*pEQ$1MH$cFi03OG^1NetZ_jW^STaEzr&Xho zB452St%v3ez2#TFm~`gZh$vi=in+y2d!z<{OZ~Kty-5bQ;0O=k_ESi8Nx9{*T`LJy6jqR>&|+>OZ;+=0hA04 zE25t^sE9HG)3^KKR_A5WDkqispweP9!I-@dCO&N!JrD@i{WBHnfQ z95o8;d$`AFnca3;N-0iX-CmbbAp5yQ!GoH;h7Cn?m{ammZJI8igP{U73lFnl2&gCs zqJ4(Vo~^j`{zOAzScL5B_Sm?Mjtek1d(A6X5ObcZi$;aOYy|g$}BY z$GEP3#i60Ju_&3SHzryH!gUFwC9-295u??cf+aYRQ1$+!rc#42YNattd6mZEFI@?C zqFM>6+zxEunIHDZ>{Z15u##>N(28Dw!>G(k*dB{NHvip@aP}f`@=Q;!o;zRMWo{Cx zo?kyzh8n7#f1g0&g>Cd>O-2g?uPwy8sy8hZbHSsXPmU;@l=HL=zm7mN(=@*|D$i+u zs~TllkCTvD$f&-#b9B?}#Lg*-ibK13R_a$RyoN3m5`10tdhAq{+VW)K#Bht-ra1*J z+n$N%V>u0rVtx`aKJDwXXrxaD7nS<>$=c82v7@KVx^S@vT;h=SZE37K>iahpx3;VDzEr9GY=2(%uaqM;^76eSP0QLzo4sI z>p_Eei*T$K;|qK`sq;?Hesp}(@VvX2Q4sAMYAJ}b&d$htDMC{FG-$o4k9ApECi1$a zXdamjiOGKHBh(4M<3(2x6n-CrmZMCknkQxdSS!qlis#I}btfX;J`JU3RlvtLdrymP zG0ZzrsGXVFiq+Wk1=BFay&9ZiCE#(`h~CL+c-Hs@iGTU@YxM%vlg;)`Tf~IknA^02 zXkN#Txo6aR{j$wP5T#|UH#5AP2{rSY8p?jKFv zG3kn3y`FaV!*Jq%m39_TQEhD>M@l*bhEPGe1{ft3q#K5AknT=F2_=T^l#ou5ln@D# z5Tzs(kRG@qNDa~HLNvfv7Z0g=bSlb?`QAx|Gfoni|iHJ%K0cy z;~Nsaa+{8HP_qrb{nj+xzkdYhSI@W4N_1`z(eSGIkbDP)!Ko|M%}Rqp(~KI2hl~eE zvJ!j4m6iwMgKy>fkCLC)`M$z9EV}B+sq1}}kVf$(ig0pWTY?rHz1Sm=4srTGNb^JG z=2$9wz-C@aZZZ2!HY#HNejqZRmE=pN(D$Kui$NpfhU`!y_s{@MIxiJdHb1|{6xb`> zE74_@QtgtG{4=3P1$^vn&m}7Aw8!1DnT$2thO#~44wl(N#ao8S0@t@m+Z!KD2CfK; z)n5DAPKV_etmH1aLDK$?`;sL91iVt$D z*SG}=-LIAg(*+JON!-5ivqOMQ1S!OQUgHglDsKik&Mwg;vva523`JwQH6SRz9eTY# zTIi23145~kc3r1mSWC_RzD%hs$S#!pkI9!BU80jJCJcwo*FZolQG$q`8C1d9pP@ND zG^&-ZraIvhg_FDVSfKGwkcI=avIan%2sK4coUs~Nr8jC*&!G0#?}_^s3r-c}-uAqi zM-Lw>Y}I``T;IS%Y|qH;s{F*ZefM!4{I5awr!K+T@uPd*Vu*iPWI}>(-D{zxsN>LG z=@747a_Rb2>q?y8xYf?dq2HM5tFO8Y5e4N;Y=xy8yAhI zsm>oy%R5;7)7T3V_b2%`aH^tNlsQpFxIFW#iV#8?{6{^cGr{A0@1bA)|K z>MMTuZD(pd2t|7vmHtywGXb%%=)S<`OG~}U+jm#xd%H8 z$v8-C%F?ah3$;hn?{G3(LT!SgvCVi$vwsZssAQvUwT`Q%qSw!LSd!(I!64w1=%Sc1Mck)q1@pZ@)=SY zoX}d+L3-RA|c?G3_BQNm&( z!i$AZ7cI(z7q|e9VM##6T3Xorj1JG(9os$;(I$y%mBy(#8{|3l4|x*oBAQL^XhZ0g zy1FR1teRrpKq{uLAibTLx#n({qwjlkOvR{OdSAeT5ah4-sNN)n4Clg1T9lzF)&yj; zyal1%+s4n1IG;^VPWJ;#olpk8Z42Gj-tjFeQ&PlxB)`oCNoUYKj4U$AeG8rYiD{pK zndDf&2;2;)D|KvOZP+e7fcPU9k4M2sfhr@vC~Ly0?S-4dz)ZGAYpCsAhChgbxLd4g zhTrbIPkO5SEp_kD>Ha0m12h5n3s;mE8kn515&nzSf+^D= zyE{JnJ;43l&BH55CL<=W%CF;6iUI)V5C*6!`**KqvzR2=Fj*3Y4`HYwx}TYD445(K z-QtXwtL?m*(F=LVH*H4oM>dXHBW=38q_dZ-_Vr&qpEPxd9Fs95P5W~@Z|Rt+WZP6l zPSQ}~Dh4V?Pp1g&Hk*Px?lm16C@X6M29Vrk%Rw@E||E-v~$ zb_E~{z<}#8i`Mx9mkqtd#Z1lZ-E_J8I+2oumc#x1)jdvh{W76NKm6x-RYpM~v!P8$ zw3e|YVf|}Hse9~oC@N7^j}Fi$hNpyaYnu1}bdXsD=^oI*%WKvbme|BI}$G3>smu#6y)ls|j? zF7Bhu9Z)j)C;3cZb+I>0stSK^WLOYV^U{pUYkgv>?+Nt^5j*CUB=eGw-CvU&40>y~ zGoHLXxY^7k5Xgv62{iQy|5jJQuq0|LU`}lE@flQ2Z*Zn*VWcQjm4FTb>LSVox^S4q zLn`LfS@mrjKCmg$nb^af?d?0&$aX6#2u(JyzIJvuJ*lwPrh|0~aEnSACCTezSdG%h zmSQg`17j@$Iq)r1&?+eR@1nlX|H`<}_!?BQSF&N+QQnvEAqZe+mIFui!0V49R?|9*$ zv!K1A01{8xq;L()Tv*Qk0-$Oj6+vCT*TUD{HvxO@3JjxBwM!4g3ydy&eaJw4CoQBF zJtULJ!YxgNR7_Ls%LmogyI7uIs=!B&?=MYY^yX+v;j@D_xGeZg>eZk0C;4e|HRNSi z6KlD9>q=3v-$4Zik&^ZDhNm1X)+7LCH1k!s+T3tn zUn@={1U&NJLq@K?~w|(=Y<4W{ucX}FdRr6pLw(l2$iK)At%t3gYBMlJz#(K0Nqm;=KAML!&MMSNz=%k=j*zh77r34Rs37iCY` z=_kva_41bdrj(b=4Wc5MO0~q^z#pIWJ>)vDSgIQF=3JVJe1iDy%h)8oNy{s_r&;m` zL{DYKSB_5xRb9xKNOS{qAY3qv5sSXVrrf%~*q5HO|CQ&lbKMePa$M5D{vlJcoGrCZ zD?fKbZN$6rWwz)w7`9h4DAmh1ij2}EO|bO#A9L0_RW6l*$sPPUJrUbhLC75L9%W5iO$Iw5~Yut-qBeu~hF|xD7-eQ%l z412vpq_;t%^F*pYDk%Q35c-erK|6Ve=FxQbAv~ikZ4c9$Y4;ee#ciOD9{yRqf55Qk zumv}#+JciT|Gj$uFOxBUze)=?l{B}qaC0_7m`t82<$K53!4Xvi9Tr)ADp3Off?O8o zVDG0Yx|tfn@r((m?Nxrh(b0DGjg)$;DfO&$6uY;4&F!4jnxkhP}Y3x zS?WFFt>=HWzqlQhffVfvM$Ta8Sg*r3j!Eo&rUOW7SCL2~lG7<+XZ;+{&8h5g8ElI+P>>yR2U%S93NN!Xhm|C682t6ysH-=o1=Bd*N*VlnG%l+KZFtjG`UkL;%65qn0UYQ`h zh0{9jDQx(`aBe7J0Aj3Z)4}`A|4OMM0a;?{j}qkYwi)~O8$9D}ITiMH2buiU>ixYp zhL${nwj6X($*OwmpVG`y5b6v45tX*J8?og}Qju6eJ9H}`X87iEd%BUo7<`2q(HJx+ zMR}d-J4oAf{V1W^a2~`M-YAdZ81dd4o6NPO{cmZaAS@RS4ir#Sr zfFZO-VIL|VN<%nEXr2` z$0FK2L#8O_f1w~c@G70JrB@N}r(gJ!Vmkk6{r68w!o$qO?HrFcjeU0_3F5;*!E2%( zTx>4?gP8w z1B?3UVZmz^%d_dIps>>0{cB~mp3{9UoPR6uQFecVq&} zY{ebB?AlPAD_}(ll{fK99;Wh1cgRbnw)maD^F>*J!R}eHM*W0VYN1TADWMy9H=$00 z5bHY${oDgwX7(W9LZw?}{!8(_{JB~Xkje6{0x4fgC4kUmpfJ+LT1DYD*TWu4#h{Y7 zFLronmc=hS=W=j1ar3r1JNjQoWo2hMWsqW*e?TF%#&{GpsaLp}iN~$)ar+7Ti}E&X z-nq~+Gkp(`qF0F_4A22>VZn-x>I$?PDZSeG8h_ifoWf^DxIb5%T7UytYo3}F|4#RC zUHpg$=)qVqD~=m(!~?XwocuxU1u}9qhhM7d^eqmJPi_e-!IO`*{u7A zbu*?L$Mbj-X9n3G2>+Kc#l`@d8}Xb9{l*IN{#M*d;s+3Pdr8FO$EBELR=8{ zd?LJbSv9fI`{OqTH)5{b?WulgMb)psp+W|@cSp=jtl-&5C}9lw@*0H+gEW(}mAWNz zf{~U;;N}|wdSaphgqnH{FWUy!{y3^=AC*c?RJ5Eb<^ zCgH_v7^axIUVmHSFL^zlj2R$zow$|y#7>%#U7d#Vp_ezcp3lefMyd5ES=q$>4pWyA zp_Zso^^NP~lu2=S6nD(3Z5u=Uy&B&F1i$J*3;3KhEkD_lgscHGR*;T;U!9vgQa(hI}oh9IzEf_PU_8F+i77t-~gDX z490Sb)LyVZmf18N6w{+37$aO<2!Av0 ztLaPOv^J<2@p{WnMiDudoghX_`luFZt_4eNU}*~cF5i%eEcNLs;D>QVIwr8mH;=dc z09`}JV;aaF;13@&iS(w>Jc=k~|d_1hcpM(l|O zu>!@}me%isTT$xT#hNUvh(ATd0wT4fbv=6htcHNEZIw9%E6wlYmwfu2{j0kh1y=$;Yf!|NldgB9ul zB{dbE&LfRnr8ITm@;-68wo#VV?8lG3ed&9k1}QBS3}WGV9%26?A1rBkkDR9Z3o+g+ z)eQg8BY3y(Dh5&z?VLLNdDV`C=muUvCPpGg!oYxIgOI3^%4>5d7jTh~ni!Fg2;fhx z(*c%H6Je84kmQh;5tC3*l~7khLxK-e|Cz?FLh!yYe7g|*LwqU?2wv^_ZyKT$fYVkGJo@AK0$+ml?}zJeB~deT2WL1vz}dxB z)y??t!}%M@)u$_IyW~)6u1SttJ!awd6N5lx|xBrmyrBh>tb&D*=C+Z3nPfq$1%WgY0bY*?PZ#Hk|=xn zGM#0*w4CaB^y0G(J4q=;5NeM@m-P}#mv7QZNF)M!dK^w{mk_!n0`+Y3PQutu-%NBt zzgPXug?JLEbUL{e_dk;Vd896&yPe(hliVK!lj%5+@BKdcrEZ2Nc_*i@ve*2lB>u~{ zFozd2FM|_0+nAGR4TLNHanQn_Oeb!JrUcvzJ?7p9TTNB}ocO3j$7ij!li8#k6 z@2tSd1>K03K9A#_-MIq)S;T#oE^;>U$)&}okIvDf3lm?kI{d80$>~xKUoS!%q1Pi?WpsUUt(tI ztjNjY*y&Rm9(S(DC2GuPHBJs@5M{RGm`c1z<6nwyN^)rMo-AS{M2$oM9|y%fM|}G~ DHx0+F diff --git a/motimo-api/gradle/wrapper/gradle-wrapper.properties b/motimo-api/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 37f853b1..00000000 --- a/motimo-api/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists From d9241fab81ace77d17f4d4e798b0849af8a7eb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EC=9D=80?= Date: Thu, 29 May 2025 11:48:48 +0900 Subject: [PATCH 18/26] =?UTF-8?q?bootjar=20=EC=95=84=EB=8B=8C=20build=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b88a8d76..e720afc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: - name: Set up Gradle with cache uses: gradle/actions/setup-gradle@v4 - - name: Build bootJar without tests - run: ./gradlew bootJar -x test + - name: Build without tests + run: ./gradlew clean build -x test dependency-submission: From e1c7f76810d30df3c1451d656cfe704e6024430d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EC=9D=80?= Date: Thu, 29 May 2025 11:53:13 +0900 Subject: [PATCH 19/26] =?UTF-8?q?cache=20disabled=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e720afc0..d9eb6689 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,13 @@ jobs: java-version: '21' distribution: 'temurin' - - name: Set up Gradle with cache + - name: Set up Gradle without cache uses: gradle/actions/setup-gradle@v4 + with: + cache-disabled: true - name: Build without tests - run: ./gradlew clean build -x test + run: ./gradlew bootJar -x test dependency-submission: From 345485ce41a432a798641294b20fcc1d54314424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EC=9D=80?= Date: Thu, 29 May 2025 11:59:05 +0900 Subject: [PATCH 20/26] =?UTF-8?q?cache=20disabled=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9eb6689..c6f7f32a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,8 @@ jobs: java-version: '21' distribution: 'temurin' - - name: Set up Gradle without cache + - name: Set up Gradle cache uses: gradle/actions/setup-gradle@v4 - with: - cache-disabled: true - name: Build without tests run: ./gradlew bootJar -x test From f27684916c9ccd23386bd62464e64ef4bf16cdb1 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 11:59:14 +0900 Subject: [PATCH 21/26] =?UTF-8?q?fix:=20Rs=20Controller=EC=97=90=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/goal/GoalController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index 84b753d7..10fb0a75 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -1,9 +1,9 @@ package kr.co.api.goal; -import kr.co.api.common.rs.CreateIdRs; import kr.co.api.goal.docs.GoalControllerSwagger; import kr.co.api.goal.rqrs.GoalCreateRq; -import kr.co.api.goal.rqrs.GoalListReadRs; +import kr.co.api.goal.rqrs.GoalIdRs; +import kr.co.api.goal.rqrs.GoalListRs; import kr.co.api.goal.rqrs.GoalUpdateRq; import kr.co.api.security.annotation.AuthUser; import org.springframework.http.HttpStatus; @@ -17,8 +17,8 @@ public class GoalController implements GoalControllerSwagger { @ResponseStatus(HttpStatus.CREATED) @PostMapping - public CreateIdRs create(@RequestBody GoalCreateRq rq) { - return null; + public GoalIdRs create(@RequestBody GoalCreateRq rq) { + return new GoalIdRs(UUID.randomUUID().toString()); } @PutMapping("/{id}") @@ -26,7 +26,7 @@ public void update(@PathVariable String id, GoalUpdateRq rq) { } @GetMapping - public GoalListReadRs readList(@AuthUser UUID userId) { + public GoalListRs readList(@AuthUser UUID userId) { return null; } } From 763eea7d367d86cdc15c65c4b349639c095a14d7 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 12:14:39 +0900 Subject: [PATCH 22/26] =?UTF-8?q?#18=20feat:=20=EB=8D=94=EB=AF=B8=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kr/co/api/cheer/CheerController.java | 2 +- .../main/java/kr/co/api/goal/GoalController.java | 16 +++++++++++----- .../java/kr/co/api/point/PointController.java | 2 +- .../co/api/user/controller/UserController.java | 6 +++++- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java index c9c45583..bb508abb 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java @@ -12,6 +12,6 @@ public class CheerController implements CheerControllerSwagger { @GetMapping public CheerPhraseRs readCheerPhrase() { - return null; + return new CheerPhraseRs("오늘도 파이팅이에요!"); } } diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index 10fb0a75..25c3e68c 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -1,14 +1,14 @@ package kr.co.api.goal; import kr.co.api.goal.docs.GoalControllerSwagger; -import kr.co.api.goal.rqrs.GoalCreateRq; -import kr.co.api.goal.rqrs.GoalIdRs; -import kr.co.api.goal.rqrs.GoalListRs; -import kr.co.api.goal.rqrs.GoalUpdateRq; +import kr.co.api.goal.rqrs.*; import kr.co.api.security.annotation.AuthUser; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; @RestController @@ -27,6 +27,12 @@ public void update(@PathVariable String id, GoalUpdateRq rq) { @GetMapping public GoalListRs readList(@AuthUser UUID userId) { - return null; + List items = new ArrayList<>(); + items.add(new GoalItemRs("첫번째 목표", LocalDate.now(), 50)); + items.add(new GoalItemRs("자격증 따기", LocalDate.of(2026, 2, 10), 20)); + items.add(new GoalItemRs("노래 만들기", LocalDate.now(), 100)); + return new GoalListRs( + items + ); } } diff --git a/motimo-api/src/main/java/kr/co/api/point/PointController.java b/motimo-api/src/main/java/kr/co/api/point/PointController.java index 97f3450c..b4e6e4f5 100644 --- a/motimo-api/src/main/java/kr/co/api/point/PointController.java +++ b/motimo-api/src/main/java/kr/co/api/point/PointController.java @@ -15,6 +15,6 @@ public class PointController implements PointControllerSwagger { @GetMapping public PointRs read(@AuthUser UUID userId) { - return null; + return new PointRs(3000); } } diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java index 3d370a44..32f3aca4 100644 --- a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java +++ b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java @@ -6,12 +6,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDate; +import java.time.temporal.ChronoUnit; + @RestController @RequestMapping("/v1/users") public class UserController implements UserControllerSwagger { @GetMapping("/me/joined-date") public UserJoinedDateRs readJoinedDate() { - return null; + LocalDate joinedDate = LocalDate.of(2025, 5, 20); + return new UserJoinedDateRs(joinedDate, (int) ChronoUnit.DAYS.between(joinedDate, LocalDate.now())); } } From dde37cdf100707a33be93e62d453d24970b1967b Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 12:15:49 +0900 Subject: [PATCH 23/26] refactor: isMonthSetting -> isPeriodByMonth --- motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java index d419273c..1803f71a 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java +++ b/motimo-api/src/main/java/kr/co/api/goal/rqrs/GoalCreateRq.java @@ -17,7 +17,7 @@ public record GoalCreateRq( @NotNull @Schema(description = "개월 수로 기간 설정 여부") - boolean isMonthSetting, + boolean isPeriodByMonth, @Size(min = 1, max = 12) @Schema(description = "목표 개월 수") From 19f720343e3ea7ea1d14d34723c111be09cd5d6f Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 12:26:43 +0900 Subject: [PATCH 24/26] =?UTF-8?q?#3=20fix:=20Docker=20file=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 16 +++++++++++++++- Dockerfile | 3 ++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 4465ed7c..85f20fce 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,18 @@ build/ **/build/ out/ -!api/build/libs/ \ No newline at end of file +!api/build/libs/ + +# Gradle +.gradle + +# IDE +.idea +*.iml + +# OS +.DS_Store + +# Git +.git +.gitignore diff --git a/Dockerfile b/Dockerfile index 2c70912e..e3cb257c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,9 @@ RUN ls -la /app FROM openjdk:21-jdk WORKDIR /app +COPY ./motimo-api/build/libs/motimo-api-*.jar app.jar -COPY --from=builder /app/motimo-api/build/libs/motimo-api-*.jar app.jar +#COPY --from=builder /app/motimo-api/build/libs/motimo-api-*.jar app.jar EXPOSE 8080 From 6f1362eb59592214582ba7c092151f95de340d97 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 13:14:27 +0900 Subject: [PATCH 25/26] =?UTF-8?q?delete:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EA=B0=80=EC=9E=85=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20API=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/api/user/controller/UserController.java | 10 ---------- .../api/user/controller/rqrs/UserJoinedDateRs.java | 14 -------------- .../kr/co/api/user/docs/UserControllerSwagger.java | 4 ---- 3 files changed, 28 deletions(-) delete mode 100644 motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java index 32f3aca4..c148ae88 100644 --- a/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java +++ b/motimo-api/src/main/java/kr/co/api/user/controller/UserController.java @@ -1,21 +1,11 @@ package kr.co.api.user.controller; -import kr.co.api.user.controller.rqrs.UserJoinedDateRs; import kr.co.api.user.docs.UserControllerSwagger; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; -import java.time.temporal.ChronoUnit; - @RestController @RequestMapping("/v1/users") public class UserController implements UserControllerSwagger { - @GetMapping("/me/joined-date") - public UserJoinedDateRs readJoinedDate() { - LocalDate joinedDate = LocalDate.of(2025, 5, 20); - return new UserJoinedDateRs(joinedDate, (int) ChronoUnit.DAYS.between(joinedDate, LocalDate.now())); - } } diff --git a/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java b/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java deleted file mode 100644 index 3a225b0b..00000000 --- a/motimo-api/src/main/java/kr/co/api/user/controller/rqrs/UserJoinedDateRs.java +++ /dev/null @@ -1,14 +0,0 @@ -package kr.co.api.user.controller.rqrs; - -import io.swagger.v3.oas.annotations.media.Schema; - -import java.time.LocalDate; - -public record UserJoinedDateRs( - @Schema(description = "가입일", type = "date") - LocalDate joinedDate, - - @Schema(description = "가입일로부터 날짜", example = "43") - int joinedDays -) { -} diff --git a/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java index 8fa46f71..64565a17 100644 --- a/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/user/docs/UserControllerSwagger.java @@ -1,11 +1,7 @@ package kr.co.api.user.docs; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import kr.co.api.user.controller.rqrs.UserJoinedDateRs; @Tag(name = "사용자 API", description = "사용자 관련 API 목록입니다") public interface UserControllerSwagger { - @Operation(summary = "사용자 가입일 조회 API", description = "사용자 가입일을 조회합니다.") - UserJoinedDateRs readJoinedDate(); } From dd3bb2e3600c9330775e1eeeb92e501fffdbb750 Mon Sep 17 00:00:00 2001 From: jongeuni Date: Thu, 29 May 2025 14:09:12 +0900 Subject: [PATCH 26/26] =?UTF-8?q?refactor:=20read=20->=20get=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9D=B4=EB=A6=84=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/co/api/cheer/CheerController.java | 2 +- .../java/kr/co/api/cheer/docs/CheerControllerSwagger.java | 2 +- motimo-api/src/main/java/kr/co/api/goal/GoalController.java | 6 +++--- .../java/kr/co/api/goal/docs/GoalControllerSwagger.java | 6 +++--- .../src/main/java/kr/co/api/point/PointController.java | 2 +- .../java/kr/co/api/point/docs/PointControllerSwagger.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java index bb508abb..cdd0b814 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/CheerController.java @@ -11,7 +11,7 @@ public class CheerController implements CheerControllerSwagger { @GetMapping - public CheerPhraseRs readCheerPhrase() { + public CheerPhraseRs getCheerPhrase() { return new CheerPhraseRs("오늘도 파이팅이에요!"); } } diff --git a/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java index 76e0a033..96aa79c4 100644 --- a/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/cheer/docs/CheerControllerSwagger.java @@ -7,5 +7,5 @@ @Tag(name = "응원 API", description = "응원 관련 API 목록입니다") public interface CheerControllerSwagger { @Operation(summary = "응원 문구 조회 API", description = "응원 문구를 랜덤 조회합니다.") - CheerPhraseRs readCheerPhrase(); + CheerPhraseRs getCheerPhrase(); } diff --git a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java index 25c3e68c..eaa5cfcc 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/GoalController.java +++ b/motimo-api/src/main/java/kr/co/api/goal/GoalController.java @@ -17,16 +17,16 @@ public class GoalController implements GoalControllerSwagger { @ResponseStatus(HttpStatus.CREATED) @PostMapping - public GoalIdRs create(@RequestBody GoalCreateRq rq) { + public GoalIdRs createGoal(@RequestBody GoalCreateRq rq) { return new GoalIdRs(UUID.randomUUID().toString()); } @PutMapping("/{id}") - public void update(@PathVariable String id, GoalUpdateRq rq) { + public void updateGoal(@PathVariable String id, GoalUpdateRq rq) { } @GetMapping - public GoalListRs readList(@AuthUser UUID userId) { + public GoalListRs getGoalList(@AuthUser UUID userId) { List items = new ArrayList<>(); items.add(new GoalItemRs("첫번째 목표", LocalDate.now(), 50)); items.add(new GoalItemRs("자격증 따기", LocalDate.of(2026, 2, 10), 20)); diff --git a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java index 1623a445..4aa81923 100644 --- a/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/goal/docs/GoalControllerSwagger.java @@ -12,11 +12,11 @@ @Tag(name = "목표 API", description = "목표 관련 API 목록입니다") public interface GoalControllerSwagger { @Operation(summary = "목표 생성 API", description = "목표를 생성합니다.") - GoalIdRs create(GoalCreateRq rq); + GoalIdRs createGoal(GoalCreateRq rq); @Operation(summary = "목표 수정 API", description = "목표를 수정합니다.") - void update(String id, GoalUpdateRq rq); + void updateGoal(String id, GoalUpdateRq rq); @Operation(summary = "목표 목록 API", description = "목표 목록을 조회합니다.") - GoalListRs readList(UUID userId); + GoalListRs getGoalList(UUID userId); } diff --git a/motimo-api/src/main/java/kr/co/api/point/PointController.java b/motimo-api/src/main/java/kr/co/api/point/PointController.java index b4e6e4f5..a9c4da90 100644 --- a/motimo-api/src/main/java/kr/co/api/point/PointController.java +++ b/motimo-api/src/main/java/kr/co/api/point/PointController.java @@ -14,7 +14,7 @@ public class PointController implements PointControllerSwagger { @GetMapping - public PointRs read(@AuthUser UUID userId) { + public PointRs getPoint(@AuthUser UUID userId) { return new PointRs(3000); } } diff --git a/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java index 73e37f83..736a6d98 100644 --- a/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java +++ b/motimo-api/src/main/java/kr/co/api/point/docs/PointControllerSwagger.java @@ -11,5 +11,5 @@ public interface PointControllerSwagger { @Operation(summary = "현재 획득한 포인트 조회 API", description = "사용자가 획득한 포인트를 조회합니다.") - PointRs read(@AuthUser UUID userId); + PointRs getPoint(@AuthUser UUID userId); }