Merge pull request #215 from DDD-Community/feat/211/goal

feat(goal): 목표 dto 수정

Author: JSL107

app/build.gradle.kts

@@ -66,7 +66,6 @@ dependencies {
   runtimeOnly(libs.h2)
   runtimeOnly(libs.postgresql)
 
-
   testImplementation(libs.spring.boot.starter.test)
   testImplementation(libs.spring.security.test)
 

app/src/main/java/com/growit/app/goal/domain/goal/Goal.java

@@ -95,7 +95,7 @@ public boolean getDeleted() {
 
   public Plan getPlanByDate(LocalDate date) {
     return plans.stream()
-        .filter(plan -> plan.getPlanDuration().includes(date))
+        .filter(plan -> plan.getDuration().includes(date))
         .findFirst()
         .orElseThrow(() -> new NotFoundException(GOAL_NOT_EXISTS_DATE.getCode()));
   }

app/src/main/java/com/growit/app/goal/domain/goal/plan/Plan.java

@@ -17,11 +17,11 @@ public class Plan {
   private int weekOfMonth;
   private String content;
 
-  @JsonIgnore private PlanDuration planDuration;
+  private PlanDuration duration;
 
   @JsonIgnore
   public boolean isCurrentWeek() {
-    return planDuration.includes(LocalDate.now());
+    return duration.includes(LocalDate.now());
   }
 
   public static Plan from(PlanDto dto, LocalDate goalStart) {
@@ -30,7 +30,7 @@ public static Plan from(PlanDto dto, LocalDate goalStart) {
         .id(IDGenerator.generateId())
         .weekOfMonth(dto.weekOfMonth())
         .content(dto.content())
-        .planDuration(duration)
+        .duration(duration)
         .build();
   }
 

app/src/main/java/com/growit/app/goal/infrastructure/persistence/goal/GoalDBMapper.java

@@ -32,8 +32,8 @@ public GoalEntity toEntity(Goal goal) {
                         plan.getId(),
                         plan.getWeekOfMonth(),
                         plan.getContent(),
-                        plan.getPlanDuration().startDate(),
-                        plan.getPlanDuration().endDate(),
+                        plan.getDuration().startDate(),
+                        plan.getDuration().endDate(),
                         entity))
             .toList());
     entity.setDeletedAt(goal.getDeleted() ? LocalDateTime.now() : null);
@@ -56,7 +56,7 @@ public Goal toDomain(GoalEntity entity) {
                         Plan.builder()
                             .id(planEntity.getUid())
                             .weekOfMonth(planEntity.getWeekOfMonth())
-                            .planDuration(
+                            .duration(
                                 new PlanDuration(
                                     planEntity.getStartDate(), planEntity.getEndDate()))
                             .content(planEntity.getContent())

app/src/main/resources/static/docs/swagger-spec.js

@@ -71,7 +71,7 @@ public Plan build() {
         .id(id)
         .weekOfMonth(weekOfMonth)
         .content(content)
-        .planDuration(planDuration)
+        .duration(planDuration)
         .build();
   }
 }

app/src/test/java/com/growit/app/fake/goal/PlanFixture.java

@@ -118,6 +118,13 @@ void getMyGoals() throws Exception {
                             fieldWithPath("data[].plans[].weekOfMonth")
                                 .type(NUMBER)
                                 .description("주차"),
+                            fieldWithPath("data[].plans[].duration").description("기간 정보 객체"),
+                            fieldWithPath("data[].plans[].duration.startDate")
+                                .type(STRING)
+                                .description("시작일 (yyyy-MM-dd)"),
+                            fieldWithPath("data[].plans[].duration.endDate")
+                                .type(STRING)
+                                .description("종료일 (yyyy-MM-dd)"),
                             fieldWithPath("data[].plans[].content")
                                 .type(STRING)
                                 .description("계획 내용"))
@@ -164,6 +171,13 @@ void getMyGoal() throws Exception {
                             fieldWithPath("data.plans[].weekOfMonth")
                                 .type(NUMBER)
                                 .description("주차"),
+                            fieldWithPath("data.plans[].duration").description("기간 정보 객체"),
+                            fieldWithPath("data.plans[].duration.startDate")
+                                .type(STRING)
+                                .description("시작일 (yyyy-MM-dd)"),
+                            fieldWithPath("data.plans[].duration.endDate")
+                                .type(STRING)
+                                .description("종료일 (yyyy-MM-dd)"),
                             fieldWithPath("data.plans[].content").type(STRING).description("계획 내용"))
                         .build())));
   }