[DDING-000] 최근 폼지 구하기 로직 위치 수정 (#301)

Co-authored-by: KoSeonJe <127813439+KoSeonJe@users.noreply.github.com>

Author: Seooooo24

src/main/java/ddingdong/ddingdongBE/domain/club/service/FacadeCentralClubServiceImpl.java

@@ -5,11 +5,10 @@
 import ddingdong.ddingdongBE.domain.club.service.dto.query.MyClubInfoQuery;
 import ddingdong.ddingdongBE.domain.filemetadata.entity.DomainType;
 import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService;
-import ddingdong.ddingdongBE.domain.form.entity.Form;
+import ddingdong.ddingdongBE.domain.form.entity.Forms;
 import ddingdong.ddingdongBE.domain.form.service.FormService;
 import ddingdong.ddingdongBE.file.service.S3FileService;
 import ddingdong.ddingdongBE.file.service.dto.query.UploadedFileUrlQuery;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,13 +26,10 @@ public class FacadeCentralClubServiceImpl implements FacadeCentralClubService {
     @Override
     public MyClubInfoQuery getMyClubInfo(Long userId) {
         Club club = clubService.getByUserId(userId);
-        List<Form> forms = formService.getAllByClub(club);
-        Form form = formService.findActiveForm(forms) != null
-                ? formService.findActiveForm(forms)
-                : formService.getNewestForm(forms);
+        Forms forms = formService.getAllByClub(club);
         return MyClubInfoQuery.of(
                 club,
-                form,
+                forms.getActiveOrNewest(),
                 getFileKey(DomainType.CLUB_PROFILE, club.getId()),
                 getFileKey(DomainType.CLUB_INTRODUCTION, club.getId())
         );

src/main/java/ddingdong/ddingdongBE/domain/club/service/FacadeUserClubServiceImpl.java

@@ -12,6 +12,7 @@
 import ddingdong.ddingdongBE.domain.filemetadata.entity.DomainType;
 import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
+import ddingdong.ddingdongBE.domain.form.entity.Forms;
 import ddingdong.ddingdongBE.domain.form.service.FormService;
 import ddingdong.ddingdongBE.file.service.S3FileService;
 import ddingdong.ddingdongBE.file.service.dto.query.UploadedFileUrlQuery;
@@ -42,10 +43,8 @@ public List<UserClubListQuery> findAllWithRecruitTimeCheckPoint(LocalDate now) {
     @Override
     public UserClubQuery getClub(Long clubId) {
         Club club = clubService.getById(clubId);
-        List<Form> forms = formService.getAllByClub(club);
-        Form form = formService.findActiveForm(forms) != null
-                ? formService.findActiveForm(forms)
-                : formService.getNewestForm(forms);
+        Forms forms = formService.getAllByClub(club);
+        Form form = forms.getActiveOrNewest();
         return UserClubQuery.of(
                 club,
                 form,

src/main/java/ddingdong/ddingdongBE/domain/form/entity/Form.java

@@ -125,11 +125,23 @@ public void updateEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 
-    public boolean isLargerSectionThan(int sectionSize) {
-        return this.sections.size() > sectionSize;
-    }
-
     public boolean isNotEqualClubId(Long clubId) {
         return !Objects.equals(club.getId(), clubId);
     }
+
+    public FormStatus getFormStatus(LocalDate localDate) {
+        return FormStatus.determineStatus(this, localDate);
+    }
+
+    public boolean isEqualStatusTo(FormStatus formStatus) {
+        return FormStatus.determineStatus(this, LocalDate.now()) == formStatus;
+    }
+
+    public boolean isAfterStartDateTo(LocalDate date) {
+        return date.isBefore(startDate);
+    }
+
+    public boolean isNotAfterEndDateTo(LocalDate date) {
+        return !date.isAfter(endDate);
+    }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/entity/FormStatus.java

@@ -13,16 +13,13 @@ public enum FormStatus {
 
     private final String description;
 
-
-    public static FormStatus getDescription(LocalDate now, LocalDate startDate, LocalDate endDate) {
-        if (now.isBefore(startDate)) {
-            return FormStatus.UPCOMING;
+    public static FormStatus determineStatus(Form form, LocalDate date) {
+        if (form.isAfterStartDateTo(date)) {
+            return UPCOMING;
         }
-
-        if (!now.isAfter(endDate)) {
-            return FormStatus.ONGOING;
+        if (form.isNotAfterEndDateTo(date)) {
+            return ONGOING;
         }
-
-        return FormStatus.CLOSED;
+        return CLOSED;
     }
 }

src/main/java/ddingdong/ddingdongBE/domain/form/entity/Forms.java

@@ -0,0 +1,41 @@
+package ddingdong.ddingdongBE.domain.form.entity;
+
+import static ddingdong.ddingdongBE.domain.form.entity.FormStatus.ONGOING;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+public class Forms {
+
+    private final List<Form> forms;
+
+    public Forms(List<Form> forms) {
+        this.forms = forms;
+    }
+
+    public Form getActiveOrNewest() {
+        Optional<Form> activeForm = findActiveForm();
+        if (activeForm.isPresent()) {
+            return activeForm.get();
+        }
+        Optional<Form> newestForm = findNewestForm();
+        return newestForm.orElse(null);
+    }
+
+    public List<Form> getForms() {
+        return new ArrayList<>(forms);
+    }
+
+    private Optional<Form> findNewestForm() {
+        return forms.stream()
+                .max(Comparator.comparing(Form::getId));
+    }
+
+    private Optional<Form> findActiveForm() {
+        return forms.stream()
+                .filter(form -> form.isEqualStatusTo(ONGOING))
+                .findFirst();
+    }
+}

src/main/java/ddingdong/ddingdongBE/domain/form/service/FacadeCentralFormServiceImpl.java

@@ -13,7 +13,7 @@
 import ddingdong.ddingdongBE.domain.filemetadata.service.FileMetaDataService;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
 import ddingdong.ddingdongBE.domain.form.entity.FormField;
-import ddingdong.ddingdongBE.domain.form.entity.FormStatus;
+import ddingdong.ddingdongBE.domain.form.entity.Forms;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.CreateFormCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.CreateFormCommand.CreateFormFieldCommand;
 import ddingdong.ddingdongBE.domain.form.service.dto.command.SendApplicationResultEmailCommand;
@@ -109,9 +109,9 @@ public void deleteForm(Long formId, User user) {
     @Override
     public List<FormListQuery> getAllMyForm(User user) {
         Club club = clubService.getByUserId(user.getId());
-        List<Form> forms = formService.getAllByClub(club);
-        return forms.stream()
-                .map(this::buildFormListQuery)
+        Forms forms = formService.getAllByClub(club);
+        return forms.getForms().stream()
+                .map(FormListQuery::from)
                 .toList();
     }
 
@@ -211,12 +211,6 @@ public void updateFormEndDate(UpdateFormEndDateCommand command) {
         form.updateEndDate(command.endDate());
     }
 
-    private FormListQuery buildFormListQuery(Form form) {
-        FormStatus formStatus = FormStatus.getDescription(LocalDate.now(), form.getStartDate(),
-                form.getEndDate());
-        return FormListQuery.from(form, formStatus);
-    }
-
     private void validateEqualsClub(Club club, Form form) {
         if (form.isNotEqualClubId(club.getId())) {
             throw new NonHaveFormAuthority();

src/main/java/ddingdong/ddingdongBE/domain/form/service/FormService.java

@@ -2,6 +2,7 @@
 
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
+import ddingdong.ddingdongBE.domain.form.entity.Forms;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -13,11 +14,8 @@ public interface FormService {
 
     void delete(Form form);
 
-    List<Form> getAllByClub(Club club);
+    Forms getAllByClub(Club club);
 
     List<Form> findOverlappingForms(Long id, LocalDate startDate, LocalDate endDate);
 
-    Form findActiveForm(List<Form> forms);
-
-    Form getNewestForm(List<Form> forms);
 }

src/main/java/ddingdong/ddingdongBE/domain/form/service/GeneralFormService.java

@@ -3,10 +3,9 @@
 import ddingdong.ddingdongBE.common.exception.PersistenceException.ResourceNotFound;
 import ddingdong.ddingdongBE.domain.club.entity.Club;
 import ddingdong.ddingdongBE.domain.form.entity.Form;
-import ddingdong.ddingdongBE.domain.form.entity.FormStatus;
+import ddingdong.ddingdongBE.domain.form.entity.Forms;
 import ddingdong.ddingdongBE.domain.form.repository.FormRepository;
 import java.time.LocalDate;
-import java.util.Comparator;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
@@ -48,28 +47,13 @@ public void delete(Form form) {
     }
 
     @Override
-    public List<Form> getAllByClub(Club club) {
-        return formRepository.findAllByClub(club);
+    public Forms getAllByClub(Club club) {
+        return new Forms(formRepository.findAllByClub(club));
     }
 
     @Override
     public List<Form> findOverlappingForms(Long id, LocalDate startDate, LocalDate endDate) {
         return formRepository.findOverlappingForms(id, startDate, endDate);
     }
 
-    @Override
-    public Form findActiveForm(List<Form> forms) {
-        return forms.stream()
-                .filter(f -> FormStatus.getDescription(LocalDate.now(), f.getStartDate(), f.getEndDate()) == FormStatus.ONGOING)
-                .findFirst()
-                .orElse(null);
-    }
-
-    @Override
-    public Form getNewestForm(List<Form> forms) {
-        return forms.stream()
-                .max(Comparator.comparing(Form::getId))
-                .orElse(null);
-    }
-
 }

src/main/java/ddingdong/ddingdongBE/domain/form/service/dto/query/FormListQuery.java

@@ -1,7 +1,6 @@
 package ddingdong.ddingdongBE.domain.form.service.dto.query;
 
 import ddingdong.ddingdongBE.domain.form.entity.Form;
-import ddingdong.ddingdongBE.domain.form.entity.FormStatus;
 import java.time.LocalDate;
 import lombok.Builder;
 
@@ -14,13 +13,13 @@ public record FormListQuery(
     String formStatus
 ) {
 
-  public static FormListQuery from(Form form, FormStatus formStatus) {
+  public static FormListQuery from(Form form) {
     return FormListQuery.builder()
         .formId(form.getId())
         .title(form.getTitle())
         .startDate(form.getStartDate())
         .endDate(form.getEndDate())
-        .formStatus(formStatus.getDescription())
+        .formStatus(form.getFormStatus(LocalDate.now()).getDescription())
         .build();
   }
 

src/main/java/ddingdong/ddingdongBE/domain/formapplication/service/FacadeCentralFormApplicationServiceImpl.java

@@ -46,7 +46,7 @@ public MyAllFormApplicationsQuery getAllFormApplication(Long formId, User user)
         Form form = formService.getById(formId);
         validateAuthority(club, form);
         List<FormApplication> formApplications = formApplicationService.getAllByForm(form);
-        FormStatus formStatus = FormStatus.getDescription(LocalDate.now(), form.getStartDate(), form.getEndDate());
+        FormStatus formStatus = form.getFormStatus(LocalDate.now());
         if (formApplications == null) {
             return MyAllFormApplicationsQuery.createEmpty(form, formStatus.getDescription());
         }