refactor: DTO 계층 리팩토링 및 분리 (DASOMBE-15)

Author: jucheonsu

src/main/java/dmu/dasom/api/domain/activity/dto/ActivityItemDto.java

@@ -0,0 +1,37 @@
+package dmu.dasom.api.domain.activity.dto;
+
+import dmu.dasom.api.domain.activity.entity.Activity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+import java.time.format.DateTimeFormatter;
+
+@Getter
+@Builder
+@Schema(name = "ActivityItemDto", description = "개별 활동 목록")
+public class ActivityItemDto {
+
+    @Schema(description = "활동 고유 ID", example = "1")
+    private final Long id;
+
+    @Schema(description = "활동 날짜", example = "05.10")
+    private final String monthDay; // 날짜 필드 추가
+
+    @Schema(description = "활동 제목", example = "컴퓨터 공학부 경진대회")
+    private final String title;
+
+    @Schema(description = "수상 내역", example = "최우수상")
+    private final String award;
+
+    public static ActivityItemDto of(Activity activity) {
+        String formattedMonthDay = activity.getActivityDate()
+                .format(DateTimeFormatter.ofPattern("MM.dd"));
+
+        return ActivityItemDto.builder()
+                .id(activity.getId())
+                .monthDay(formattedMonthDay)
+                .title(activity.getTitle())
+                .award(activity.getAward())
+                .build();
+    }
+}

src/main/java/dmu/dasom/api/domain/activity/dto/ActivityHistoryRequestDto.java renamed to src/main/java/dmu/dasom/api/domain/activity/dto/ActivityRequestDto.java

@@ -1,24 +1,25 @@
 package dmu.dasom.api.domain.activity.dto;
 
-import dmu.dasom.api.domain.activity.entity.ActivityHistory;
+import dmu.dasom.api.domain.activity.entity.Activity;
+import dmu.dasom.api.domain.activity.entity.Section;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDate;
+
 @Getter
+@Builder
 @Schema(name = "ActivityHistoryRequestDto", description = "활동 연혁 생성/수정 요청 DTO")
-public class ActivityHistoryRequestDto {
+public class ActivityRequestDto {
 
-    @NotNull(message = "연도는 필수입니다.")
-    @Min(value = 1992, message = "연도는 1992년 이상이어야 합니다.")
-    @Schema(description = "활동 연도", example = "2024", minimum = "1992", maximum = "2050")
-    private int year;
+    @NotNull(message = "활동 날짜는 필수입니다.")
+    @Schema(description = "활동 날짜", example = "2024-08-21")
+    private LocalDate activityDate;
 
-    @NotBlank(message = "섹션 제목은 필수입니다.")
-    @Size(max = 50, message = "섹션은 50자 이내로 입력해주세요.")
     @Schema(description = "활동 섹션", example = "교내 경진대회", maxLength = 50)
     private String section;
 
@@ -31,12 +32,4 @@ public class ActivityHistoryRequestDto {
     @Schema(description = "수상 내역 (선택 사항)", example = "최우수상", maxLength = 50)
     private String award;
 
-    public ActivityHistory toEntity() {
-        return ActivityHistory.builder()
-                .year(this.year)
-                .section(this.section)
-                .title(this.title)
-                .award(this.award)
-                .build();
-    }
 }

src/main/java/dmu/dasom/api/domain/activity/dto/ActivityResponseDto.java

@@ -0,0 +1,60 @@
+package dmu.dasom.api.domain.activity.dto;
+
+import dmu.dasom.api.domain.activity.entity.Activity;
+import dmu.dasom.api.domain.activity.entity.Section;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Getter
+@Builder
+public class ActivityResponseDto {
+
+    private final int year;
+    private final List<SectionItemDto> sections;
+
+    public static List<ActivityResponseDto> of(List<Activity> activities) {
+        return activities.stream()
+                .collect(Collectors.groupingBy(activity -> activity.getActivityDate().getYear()))
+                .entrySet().stream()
+                .sorted(Map.Entry.comparingByKey()) // 1. 연도 오름차순 정렬
+                .map(entryByYear -> {
+                    List<SectionItemDto> sectionDtos = groupAndSortSections(entryByYear.getValue());
+                    return ActivityResponseDto.builder()
+                            .year(entryByYear.getKey())
+                            .sections(sectionDtos)
+                            .build();
+                })
+                .collect(Collectors.toList());
+    }
+
+    private static List<SectionItemDto> groupAndSortSections(List<Activity> activitiesForYear) {
+        return activitiesForYear.stream()
+                .collect(Collectors.groupingBy(Activity::getSection))
+                .entrySet().stream()
+                .map(entryBySection -> {
+                    Section section = entryBySection.getKey();
+                    List<ActivityItemDto> activityDtos = mapAndSortActivities(entryBySection.getValue());
+                    return SectionItemDto.builder()
+                            .id(section.getId())
+                            .section(section.getName())
+                            .activities(activityDtos)
+                            .build();
+                })
+                // 2. 섹션 ID 오름차순 정렬
+                .sorted(Comparator.comparing(SectionItemDto::getId))
+                .collect(Collectors.toList());
+    }
+
+    private static List<ActivityItemDto> mapAndSortActivities(List<Activity> activitiesForSection) {
+        return activitiesForSection.stream()
+                // 3. 활동 날짜 오름차순 정렬
+                .sorted(Comparator.comparing(Activity::getActivityDate))
+                .map(ActivityItemDto::of)
+                .collect(Collectors.toList());
+    }
+}

src/main/java/dmu/dasom/api/domain/activity/dto/SectionItemDto.java

@@ -0,0 +1,31 @@
+package dmu.dasom.api.domain.activity.dto;
+
+import dmu.dasom.api.domain.activity.entity.Section;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@Builder
+@Schema(name = "SectionItemDto", description = "섹션별 활동 목록")
+public class SectionItemDto {
+
+    @Schema(description = "활동 섹션 고유 ID", example = "1")
+    private final Long id;
+
+    @Schema(description = "활동 섹션", example = "교내 경진대회")
+    private final String section;
+
+    @Schema(description = "활동 목록")
+    private final List<ActivityItemDto> activities;
+
+    public static SectionItemDto of(Section section, List<ActivityItemDto> activities) {
+        return SectionItemDto.builder()
+                .id(section.getId())
+                .section(section.getName())
+                .activities(activities)
+                .build();
+    }
+}