[DDING-000] 동아리 회차 타입 수정 (#335)

Author: KoSeonJe

src/main/java/ddingdong/ddingdongBE/domain/activityreport/controller/ClubActivityReportApiController.java

@@ -32,7 +32,7 @@ public class ClubActivityReportApiController implements ClubActivityReportApi {
     @Override
     public CurrentTermResponse getCurrentTerm() {
         LocalDateTime now = LocalDateTime.now();
-        String currentTerm = facadeClubActivityReportService.getCurrentTerm(now);
+        int currentTerm = facadeClubActivityReportService.getCurrentTerm(now);
         return CurrentTermResponse.from(currentTerm);
     }
 

src/main/java/ddingdong/ddingdongBE/domain/activityreport/controller/dto/request/CreateActivityReportRequest.java

@@ -8,7 +8,7 @@
 
 public record CreateActivityReportRequest(
     @Schema(description = "활동 보고서 회차 정보", example = "1")
-    String term,
+    int term,
 
     @Schema(description = "활동 보고서 내용", example = "세션을 진행하였습니다")
     String content,

src/main/java/ddingdong/ddingdongBE/domain/activityreport/controller/dto/response/CentralActivityReportListResponse.java

@@ -11,7 +11,7 @@ public record CentralActivityReportListResponse(
         String name,
 
         @Schema(description = "회차", example = "1")
-        String term,
+        int term,
 
         @Schema(description = "활동보고서 정보")
         List<ActivityReportDto> activityReports

src/main/java/ddingdong/ddingdongBE/domain/activityreport/controller/dto/response/CurrentTermResponse.java

@@ -6,10 +6,10 @@
 @Builder
 public record CurrentTermResponse(
     @Schema(description = "현재 활동 회차", example = "1")
-    String term
+    int term
 ) {
 
-    public static CurrentTermResponse from(String term) {
+    public static CurrentTermResponse from(int term) {
         return CurrentTermResponse.builder()
             .term(term)
             .build();

src/main/java/ddingdong/ddingdongBE/domain/activityreport/entity/ActivityReport.java

@@ -31,7 +31,7 @@ public class ActivityReport extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private String term;
+    private int term;
 
     @Column(length = 100)
     private String content;
@@ -54,7 +54,7 @@ public class ActivityReport extends BaseEntity {
 
     @Builder
     public ActivityReport(
-        String term,
+        int term,
         String content,
         String place,
         LocalDateTime startDate,

src/main/java/ddingdong/ddingdongBE/domain/activityreport/service/ActivityReportTermInfoService.java

@@ -11,5 +11,5 @@ public interface ActivityReportTermInfoService {
 
     void create(LocalDate startDate, int totalTermCount);
 
-    String getCurrentTerm(LocalDateTime now);
+    int getCurrentTerm(LocalDateTime now);
 }

src/main/java/ddingdong/ddingdongBE/domain/activityreport/service/ActivityReportTermInfoServiceImpl.java

@@ -44,15 +44,14 @@ public void create(LocalDate startDate, int totalTermCount) {
     }
 
     @Override
-    public String getCurrentTerm(LocalDateTime now) {
+    public int getCurrentTerm(LocalDateTime now) {
         List<ActivityReportTermInfo> allActivityReportTermInfo = activityReportTermInfoRepository.findAll();
-        Integer currentTerm = allActivityReportTermInfo.stream()
+        return allActivityReportTermInfo.stream()
                 .filter((activityReportTermInfo) -> isBelongingTerm(activityReportTermInfo.getStartDate(),
                         activityReportTermInfo.getEndDate(), now))
                 .map(ActivityReportTermInfo::getTerm)
                 .findFirst()
                 .orElse(NON_ACTIVITY_REPORT_TERM);
-        return String.valueOf(currentTerm);
     }
 
     private boolean isBelongingTerm(LocalDate startDate, LocalDate endDate, LocalDateTime now) {

src/main/java/ddingdong/ddingdongBE/domain/activityreport/service/FacadeClubActivityReportService.java

@@ -17,7 +17,7 @@ public interface FacadeClubActivityReportService {
 
     List<ActivityReportTermInfoQuery> getActivityReportTermInfos();
 
-    String getCurrentTerm(LocalDateTime now);
+    int getCurrentTerm(LocalDateTime now);
 
     void create(User user, List<CreateActivityReportCommand> commands);
 

src/main/java/ddingdong/ddingdongBE/domain/activityreport/service/FacadeClubActivityReportServiceImpl.java

@@ -63,7 +63,7 @@ public List<ActivityReportTermInfoQuery> getActivityReportTermInfos() {
     }
 
     @Override
-    public String getCurrentTerm(LocalDateTime now) {
+    public int getCurrentTerm(LocalDateTime now) {
         return activityReportTermInfoService.getCurrentTerm(now);
     }
 
@@ -132,7 +132,7 @@ private ActivityReportQuery parseToQuery(ActivityReport activityReport) {
 
     private List<CentralActivityReportListQuery> parseToListQuery(String clubName,
             List<ActivityReport> activityReports) {
-        Map<String, List<ActivityReport>> activityReportsGroupedByTerm = activityReports.stream()
+        Map<Integer, List<ActivityReport>> activityReportsGroupedByTerm = activityReports.stream()
                 .collect(Collectors.groupingBy(ActivityReport::getTerm));
 
         return activityReportsGroupedByTerm.entrySet().stream()

src/main/java/ddingdong/ddingdongBE/domain/activityreport/service/dto/command/CreateActivityReportCommand.java

@@ -9,7 +9,7 @@
 
 @Builder
 public record CreateActivityReportCommand(
-    String term,
+    int term,
     String content,
     String place,
     String startDate,