From deda0be41ec3fb5ccd4c6a7e8827d78fcefbf476 Mon Sep 17 00:00:00 2001 From: gomster Date: Tue, 27 Sep 2022 18:45:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix[#4]=20:=20domain=20entity=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 --- .../java/com/server/hispath/activity/domain/Activity.java | 5 ----- .../hispath/student/domain/participate/Participant.java | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/server/hispath/activity/domain/Activity.java b/src/main/java/com/server/hispath/activity/domain/Activity.java index b21b85d..46596a9 100644 --- a/src/main/java/com/server/hispath/activity/domain/Activity.java +++ b/src/main/java/com/server/hispath/activity/domain/Activity.java @@ -40,9 +40,6 @@ public class Activity extends BaseEntity { private int requestStatus; - @NotNull - private String data; - @OneToMany(mappedBy = "activity") private List participants = new ArrayList<>(); @@ -52,7 +49,6 @@ public static Activity from(Category category, ActivityContentDto dto) { .semester(dto.getSemester()) .personal(dto.isPersonal()) .requestStatus(dto.getRequestStatus()) - .data(dto.getData()) .build(); } @@ -61,6 +57,5 @@ public void update(Category category, ActivityContentDto dto){ this.semester = dto.getSemester(); this.personal = dto.isPersonal(); this.requestStatus = dto.getRequestStatus(); - this.data = dto.getData(); } } diff --git a/src/main/java/com/server/hispath/student/domain/participate/Participant.java b/src/main/java/com/server/hispath/student/domain/participate/Participant.java index 9bcbfec..f0b4533 100644 --- a/src/main/java/com/server/hispath/student/domain/participate/Participant.java +++ b/src/main/java/com/server/hispath/student/domain/participate/Participant.java @@ -27,4 +27,6 @@ public class Participant extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) private Activity activity; + + String data; } From eb04035bf7b6e3731d723c3cb561c7dde8a7f244 Mon Sep 17 00:00:00 2001 From: gomster Date: Tue, 27 Sep 2022 18:46:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix[#4]=20:=20data=20=EB=A5=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=ED=95=98=EB=A9=B0=20=EA=B8=B0=EC=A1=B4=EC=97=90=20?= =?UTF-8?q?=EB=A7=8C=EB=93=A4=EC=97=88=EB=8D=98=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hispath/activity/application/dto/ActivityContentDto.java | 3 +-- .../server/hispath/activity/application/dto/ActivityDto.java | 3 +-- .../activity/presentation/request/ActivityCURequest.java | 1 - .../activity/presentation/response/ActivityResponse.java | 4 +--- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java b/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java index b5a8c3e..e6432cd 100644 --- a/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java +++ b/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java @@ -16,9 +16,8 @@ public class ActivityContentDto { private String semester; private boolean personal; private int requestStatus; - private String data; public static ActivityContentDto from(ActivityCURequest request){ - return new ActivityContentDto(request.getSemester(), request.isPersonal(), request.getRequestStatus(), request.getData()); + return new ActivityContentDto(request.getSemester(), request.isPersonal(), request.getRequestStatus()); } } diff --git a/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java b/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java index 74f6df7..57b7017 100644 --- a/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java +++ b/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java @@ -15,10 +15,9 @@ public class ActivityDto { private CategoryDto categoryDto; private String semester; private boolean personal; - private String data; public static ActivityDto from(Activity activity) { return new ActivityDto(activity.getId(), CategoryDto.from(activity.getCategory()), - activity.getSemester(), activity.isPersonal(), activity.getData()); + activity.getSemester(), activity.isPersonal()); } } diff --git a/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java b/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java index 9e61e43..021d195 100644 --- a/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java +++ b/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java @@ -12,5 +12,4 @@ public class ActivityCURequest { private String semester; private boolean personal; private int requestStatus; - private String data; } diff --git a/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java b/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java index 07985bf..9ac6d16 100644 --- a/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java +++ b/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @NoArgsConstructor @@ -16,10 +15,9 @@ public class ActivityResponse { private String categoryName; private String semester; private boolean personal; - private String data; public static ActivityResponse from(ActivityDto dto) { return new ActivityResponse(dto.getId(), dto.getCategoryDto().getId(), dto.getCategoryDto().getName(), - dto.getSemester(), dto.isPersonal(), dto.getData()); + dto.getSemester(), dto.isPersonal()); } } From dacd7c0f0275917a9238fe8106c6e74d35d6e010 Mon Sep 17 00:00:00 2001 From: gomster Date: Tue, 27 Sep 2022 19:48:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat[#4]=20:=20entity=EC=9D=98=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=98?= =?UTF-8?q?=EA=B3=A0=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/ActivityContentDto.java | 11 +++++++++-- .../activity/application/dto/ActivityDto.java | 10 ++++++++-- .../hispath/activity/domain/Activity.java | 19 ++++++++++++++++++- .../request/ActivityCURequest.java | 6 ++++++ .../response/ActivityResponse.java | 8 +++++++- .../application/dto/CategoryCUDto.java | 4 +--- .../category/application/dto/CategoryDto.java | 4 +--- .../hispath/category/domain/ActivityType.java | 5 ----- .../hispath/category/domain/Category.java | 4 ---- .../request/CategoryCURequest.java | 1 - 10 files changed, 50 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/com/server/hispath/category/domain/ActivityType.java diff --git a/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java b/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java index e6432cd..2c3b7e7 100644 --- a/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java +++ b/src/main/java/com/server/hispath/activity/application/dto/ActivityContentDto.java @@ -1,5 +1,7 @@ package com.server.hispath.activity.application.dto; +import java.time.LocalDateTime; + import com.server.hispath.activity.presentation.request.ActivityCURequest; import lombok.AllArgsConstructor; @@ -16,8 +18,13 @@ public class ActivityContentDto { private String semester; private boolean personal; private int requestStatus; + private String name; + private int weight; + private LocalDateTime startDate; + private LocalDateTime endDate; - public static ActivityContentDto from(ActivityCURequest request){ - return new ActivityContentDto(request.getSemester(), request.isPersonal(), request.getRequestStatus()); + public static ActivityContentDto from(ActivityCURequest request) { + return new ActivityContentDto(request.getSemester(), request.isPersonal(), request.getRequestStatus(), + request.getName(), request.getWeight(), request.getStartDate(), request.getEndDate()); } } diff --git a/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java b/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java index 57b7017..2d7c230 100644 --- a/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java +++ b/src/main/java/com/server/hispath/activity/application/dto/ActivityDto.java @@ -1,5 +1,7 @@ package com.server.hispath.activity.application.dto; +import java.time.LocalDateTime; + import com.server.hispath.activity.domain.Activity; import com.server.hispath.category.application.dto.CategoryDto; @@ -15,9 +17,13 @@ public class ActivityDto { private CategoryDto categoryDto; private String semester; private boolean personal; + private String name; + private int weight; + private LocalDateTime startDate; + private LocalDateTime endDate; public static ActivityDto from(Activity activity) { - return new ActivityDto(activity.getId(), CategoryDto.from(activity.getCategory()), - activity.getSemester(), activity.isPersonal()); + return new ActivityDto(activity.getId(), CategoryDto.from(activity.getCategory()), activity.getSemester(), + activity.isPersonal(), activity.getName(), activity.getWeight(), activity.getStartDate(), activity.getEndDate()); } } diff --git a/src/main/java/com/server/hispath/activity/domain/Activity.java b/src/main/java/com/server/hispath/activity/domain/Activity.java index 46596a9..e5ae620 100644 --- a/src/main/java/com/server/hispath/activity/domain/Activity.java +++ b/src/main/java/com/server/hispath/activity/domain/Activity.java @@ -1,5 +1,6 @@ package com.server.hispath.activity.domain; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import javax.persistence.*; @@ -40,6 +41,14 @@ public class Activity extends BaseEntity { private int requestStatus; + private String name; + + private LocalDateTime startDate; + + private LocalDateTime endDate; + + int weight; + @OneToMany(mappedBy = "activity") private List participants = new ArrayList<>(); @@ -49,13 +58,21 @@ public static Activity from(Category category, ActivityContentDto dto) { .semester(dto.getSemester()) .personal(dto.isPersonal()) .requestStatus(dto.getRequestStatus()) + .name(dto.getName()) + .weight(dto.getWeight()) + .startDate(dto.getStartDate()) + .endDate(dto.getEndDate()) .build(); } - public void update(Category category, ActivityContentDto dto){ + public void update(Category category, ActivityContentDto dto) { this.category = category; this.semester = dto.getSemester(); this.personal = dto.isPersonal(); this.requestStatus = dto.getRequestStatus(); + this.name = dto.getName(); + this.weight = dto.getWeight(); + this.startDate = dto.getStartDate(); + this.endDate = dto.getEndDate(); } } diff --git a/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java b/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java index 021d195..69969cd 100644 --- a/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java +++ b/src/main/java/com/server/hispath/activity/presentation/request/ActivityCURequest.java @@ -1,5 +1,7 @@ package com.server.hispath.activity.presentation.request; +import java.time.LocalDateTime; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -12,4 +14,8 @@ public class ActivityCURequest { private String semester; private boolean personal; private int requestStatus; + private String name; + private int weight; + private LocalDateTime startDate; + private LocalDateTime endDate; } diff --git a/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java b/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java index 9ac6d16..11a838f 100644 --- a/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java +++ b/src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java @@ -1,5 +1,7 @@ package com.server.hispath.activity.presentation.response; +import java.time.LocalDateTime; + import com.server.hispath.activity.application.dto.ActivityDto; import lombok.AllArgsConstructor; @@ -15,9 +17,13 @@ public class ActivityResponse { private String categoryName; private String semester; private boolean personal; + private String name; + private int weight; + private LocalDateTime startDate; + private LocalDateTime endDate; public static ActivityResponse from(ActivityDto dto) { return new ActivityResponse(dto.getId(), dto.getCategoryDto().getId(), dto.getCategoryDto().getName(), - dto.getSemester(), dto.isPersonal()); + dto.getSemester(), dto.isPersonal(), dto.getName(), dto.getWeight(), dto.getStartDate(), dto.getEndDate()); } } diff --git a/src/main/java/com/server/hispath/category/application/dto/CategoryCUDto.java b/src/main/java/com/server/hispath/category/application/dto/CategoryCUDto.java index 31c5e82..48cf416 100644 --- a/src/main/java/com/server/hispath/category/application/dto/CategoryCUDto.java +++ b/src/main/java/com/server/hispath/category/application/dto/CategoryCUDto.java @@ -1,6 +1,5 @@ package com.server.hispath.category.application.dto; -import com.server.hispath.category.domain.ActivityType; import com.server.hispath.category.presentation.request.CategoryCURequest; import lombok.AllArgsConstructor; @@ -11,10 +10,9 @@ @NoArgsConstructor @AllArgsConstructor public class CategoryCUDto { - private ActivityType type; private String name; public static CategoryCUDto of(CategoryCURequest request) { - return new CategoryCUDto(ActivityType.valueOf(request.getType()), request.getName()); + return new CategoryCUDto(request.getName()); } } diff --git a/src/main/java/com/server/hispath/category/application/dto/CategoryDto.java b/src/main/java/com/server/hispath/category/application/dto/CategoryDto.java index 2f96fa6..af853c1 100644 --- a/src/main/java/com/server/hispath/category/application/dto/CategoryDto.java +++ b/src/main/java/com/server/hispath/category/application/dto/CategoryDto.java @@ -1,6 +1,5 @@ package com.server.hispath.category.application.dto; -import com.server.hispath.category.domain.ActivityType; import com.server.hispath.category.domain.Category; import lombok.AllArgsConstructor; @@ -12,10 +11,9 @@ @AllArgsConstructor public class CategoryDto { private Long id; - private String type; private String name; public static CategoryDto from(Category category) { - return new CategoryDto(category.getId(), category.getType().name(), category.getName()); + return new CategoryDto(category.getId(), category.getName()); } } diff --git a/src/main/java/com/server/hispath/category/domain/ActivityType.java b/src/main/java/com/server/hispath/category/domain/ActivityType.java deleted file mode 100644 index 78d1e50..0000000 --- a/src/main/java/com/server/hispath/category/domain/ActivityType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.server.hispath.category.domain; - -public enum ActivityType { - MILEAGE_ACTIVITY, PROJECT -} diff --git a/src/main/java/com/server/hispath/category/domain/Category.java b/src/main/java/com/server/hispath/category/domain/Category.java index 8aab04f..8c41863 100644 --- a/src/main/java/com/server/hispath/category/domain/Category.java +++ b/src/main/java/com/server/hispath/category/domain/Category.java @@ -33,17 +33,13 @@ public class Category extends BaseEntity { @OneToMany(mappedBy = "category") private List activities = new ArrayList<>(); - @Enumerated(EnumType.STRING) - private ActivityType type; public void update(CategoryCUDto dto) { - this.type = dto.getType(); this.name = dto.getName(); } public static Category from(CategoryCUDto dto) { return Category.builder() - .type(dto.getType()) .name(dto.getName()) .build(); } diff --git a/src/main/java/com/server/hispath/category/presentation/request/CategoryCURequest.java b/src/main/java/com/server/hispath/category/presentation/request/CategoryCURequest.java index 000540b..d791bca 100644 --- a/src/main/java/com/server/hispath/category/presentation/request/CategoryCURequest.java +++ b/src/main/java/com/server/hispath/category/presentation/request/CategoryCURequest.java @@ -8,6 +8,5 @@ @Setter @NoArgsConstructor public class CategoryCURequest { - private String type; private String name; }