fix[#4] : 바뀐 ERD에 반영하여 기존에 만든 API 수정

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,9 +18,13 @@ public class ActivityContentDto {
     private String semester;
     private boolean personal;
     private int requestStatus;
-    private String data;
+    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(), request.getData());
+    public static ActivityContentDto from(ActivityCURequest request) {
+        return new ActivityContentDto(request.getSemester(), request.isPersonal(), request.getRequestStatus(),
+                request.getName(), request.getWeight(), request.getStartDate(), request.getEndDate());
     }
 }

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,10 +17,13 @@ public class ActivityDto {
     private CategoryDto categoryDto;
     private String semester;
     private boolean personal;
-    private String data;
+    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(), activity.getData());
+        return new ActivityDto(activity.getId(), CategoryDto.from(activity.getCategory()), activity.getSemester(),
+                activity.isPersonal(), activity.getName(), activity.getWeight(), activity.getStartDate(), activity.getEndDate());
     }
 }

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,8 +41,13 @@ public class Activity extends BaseEntity {
 
     private int requestStatus;
 
-    @NotNull
-    private String data;
+    private String name;
+
+    private LocalDateTime startDate;
+
+    private LocalDateTime endDate;
+
+    int weight;
 
     @OneToMany(mappedBy = "activity")
     private List<Participant> participants = new ArrayList<>();
@@ -52,15 +58,21 @@ public static Activity from(Category category, ActivityContentDto dto) {
                        .semester(dto.getSemester())
                        .personal(dto.isPersonal())
                        .requestStatus(dto.getRequestStatus())
-                       .data(dto.getData())
+                       .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.data = dto.getData();
+        this.name = dto.getName();
+        this.weight = dto.getWeight();
+        this.startDate = dto.getStartDate();
+        this.endDate = dto.getEndDate();
     }
 }

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,5 +14,8 @@ public class ActivityCURequest {
     private String semester;
     private boolean personal;
     private int requestStatus;
-    private String data;
+    private String name;
+    private int weight;
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
 }

src/main/java/com/server/hispath/activity/presentation/response/ActivityResponse.java

@@ -1,11 +1,12 @@
 package com.server.hispath.activity.presentation.response;
 
+import java.time.LocalDateTime;
+
 import com.server.hispath.activity.application.dto.ActivityDto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Getter
 @NoArgsConstructor
@@ -16,10 +17,13 @@ public class ActivityResponse {
     private String categoryName;
     private String semester;
     private boolean personal;
-    private String data;
+    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.getData());
+                dto.getSemester(), dto.isPersonal(), dto.getName(), dto.getWeight(), dto.getStartDate(), dto.getEndDate());
     }
 }

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());
     }
 }

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());
     }
 }

src/main/java/com/server/hispath/category/domain/Category.java

@@ -33,17 +33,13 @@ public class Category extends BaseEntity {
     @OneToMany(mappedBy = "category")
     private List<Activity> 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();
     }

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;
 }

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;
 }