[BE] issue241: 테스트 코드 리팩토링

backend/src/main/java/com/woowacourse/moamoa/common/entity/BaseEntity.java

@@ -1,6 +1,6 @@
 package com.woowacourse.moamoa.common.entity;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.MappedSuperclass;
@@ -16,9 +16,9 @@ public class BaseEntity {
 
     @CreatedDate
     @Column(updatable = false, nullable = false)
-    private Date createdDate;
+    private LocalDateTime createdDate;
 
     @LastModifiedDate
     @Column(nullable = false)
-    private Date lastModifiedDate;
+    private LocalDateTime lastModifiedDate;
 }

backend/src/main/java/com/woowacourse/moamoa/study/domain/AttachedTags.java

@@ -7,7 +7,9 @@
 import javax.persistence.ElementCollection;
 import javax.persistence.Embeddable;
 import javax.persistence.JoinColumn;
+import lombok.Getter;
 
+@Getter
 @Embeddable
 public class AttachedTags {
 

backend/src/main/java/com/woowacourse/moamoa/study/domain/Participants.java

@@ -57,7 +57,7 @@ public boolean isParticipate(Long memberId) {
         return participants.contains(new Participant(memberId));
     }
 
-    int getSize() {
+    public int getSize() {
         return size;
     }
 

backend/src/main/java/com/woowacourse/moamoa/study/domain/RecruitPlanner.java

@@ -9,8 +9,10 @@
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.Enumerated;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@Getter
 @Embeddable
 @NoArgsConstructor(access = PROTECTED)
 public class RecruitPlanner {
@@ -55,7 +57,7 @@ void closeRecruiting() {
         recruitStatus = RECRUITMENT_END;
     }
 
-    LocalDate getEnrollmentEndDate() {
+    public LocalDate getEnrollmentEndDate() {
         return enrollmentEndDate;
     }
 
@@ -74,7 +76,8 @@ boolean hasCapacity() {
         return max != null;
     }
 
-    public RecruitStatus getRecruitStatus() {
-        return recruitStatus;
+
+    public boolean isMemberMax(final String maxMemberCount, final int size) {
+        return maxMemberCount != null && size == this.getMax();
     }
 }

backend/src/main/java/com/woowacourse/moamoa/study/domain/Study.java

@@ -5,7 +5,6 @@
 
 import com.woowacourse.moamoa.study.domain.exception.InvalidPeriodException;
 import com.woowacourse.moamoa.study.service.exception.FailureParticipationException;
-import com.woowacourse.moamoa.study.service.response.MyRoleResponse;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;

backend/src/main/java/com/woowacourse/moamoa/study/domain/StudyPlanner.java

@@ -12,8 +12,10 @@
 import javax.persistence.Embeddable;
 import javax.persistence.Enumerated;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+@Getter
 @Embeddable
 @EqualsAndHashCode
 @NoArgsConstructor(access = PROTECTED)

backend/src/main/java/com/woowacourse/moamoa/study/service/StudyService.java

@@ -1,5 +1,7 @@
 package com.woowacourse.moamoa.study.service;
 
+import static com.woowacourse.moamoa.study.domain.RecruitStatus.RECRUITMENT_END;
+
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
 import com.woowacourse.moamoa.common.utils.DateTimeSystem;
 import com.woowacourse.moamoa.member.domain.Member;
@@ -41,14 +43,24 @@ public Study createStudy(final Long githubId, final CreatingStudyRequest request
         final Member owner = findMemberBy(githubId);
 
         final Participants participants = request.mapToParticipants(owner.getId());
-        final RecruitPlanner recruitPlanner = request.mapToRecruitPlan();
+        final RecruitPlanner recruitPlanner = getRecruitPlanner(request, participants);
+
         final StudyPlanner studyPlanner = request.mapToStudyPlanner(createdAt.toLocalDate());
         final AttachedTags attachedTags = request.mapToAttachedTags();
         final Content content = request.mapToContent();
 
         return studyRepository.save(new Study(content, participants, recruitPlanner, studyPlanner, attachedTags, createdAt));
     }
 
+    private RecruitPlanner getRecruitPlanner(final CreatingStudyRequest request, final Participants participants) {
+        final RecruitPlanner recruitPlanner = request.mapToRecruitPlan();
+        if (recruitPlanner.isMemberMax(request.getMaxMemberCount(), participants.getSize())) {
+            return new RecruitPlanner(recruitPlanner.getMax(), RECRUITMENT_END, recruitPlanner.getEnrollmentEndDate());
+        }
+
+        return recruitPlanner;
+    }
+
     public void participateStudy(final Long githubId, final Long studyId) {
         final Member member = findMemberBy(githubId);
         final Study study = findStudyBy(studyId);

backend/src/main/java/com/woowacourse/moamoa/study/service/request/CreatingStudyRequest.java

@@ -64,7 +64,7 @@ public String getEndDate() {
     }
 
     public String getMaxMemberCount() {
-        return maxMemberCount == null ? "" : String.valueOf(maxMemberCount);
+        return maxMemberCount == null ? null : String.valueOf(maxMemberCount);
     }
 
     public String getEnrollmentEndDate() {

backend/src/test/java/com/woowacourse/acceptance/test/review/ReviewsAcceptanceTest.java

@@ -32,7 +32,6 @@
 import io.restassured.RestAssured;
 import java.time.LocalDate;
 import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
@@ -129,10 +128,10 @@ public void getReviewsBySize() {
         디우가().로그인하고().스터디에(자바_스터디_ID).참여한다();
         베루스가().로그인하고().스터디에(자바_스터디_ID).참여한다();
 
-        long 짱구_리뷰_ID = 짱구가().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용1");
-        long 그린론_리뷰_ID = 그린론이().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용2");
         long 디우_리뷰_ID = 디우가().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용3");
         long 베루스_리뷰_ID = 베루스가().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용4");
+        짱구가().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용1");
+        그린론이().로그인하고().스터디에(자바_스터디_ID).리뷰를_작성한다("리뷰 내용2");
         짱구가().로그인하고().스터디에(리액트_스터디_ID).리뷰를_작성한다("리뷰 내용5");
 
         // act
@@ -156,7 +155,7 @@ public void getReviewsBySize() {
         final ReviewResponse 베루스_리뷰 = new ReviewResponse(베루스_리뷰_ID, 베루스, 리뷰_생성일, 리뷰_수정일, "리뷰 내용4");
 
         assertThat(reviewsResponse.getTotalCount()).isEqualTo(4);
-        assertThat(reviewsResponse.getReviews()).containsExactly(베루스_리뷰, 디우_리뷰);
+        assertThat(reviewsResponse.getReviews()).containsExactly(디우_리뷰, 베루스_리뷰);
     }
 
     @DisplayName("자신이 참여한 스터디에 작성한 리뷰를 삭제할 수 있다.")

backend/src/test/java/com/woowacourse/acceptance/test/tag/TagAcceptanceTest.java

@@ -8,12 +8,9 @@
 
 import com.woowacourse.acceptance.AcceptanceTest;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 public class TagAcceptanceTest extends AcceptanceTest {
 

backend/src/test/java/com/woowacourse/fixtures/MemberFixtures.java

@@ -11,7 +11,6 @@ public class MemberFixtures {
     public static final String 짱구_유저네임 = "jjanggu";
     public static final String 짱구_이미지 = "https://jjanggu.png";
     public static final String 짱구_프로필 = "https://jjanggu.com";
-    public static final Member 짱구 = new Member(짱구_깃허브_아이디, 짱구_유저네임, 짱구_이미지, 짱구_프로필);
     public static final MemberData 짱구_응답 = new MemberData(짱구_깃허브_아이디, 짱구_유저네임, 짱구_이미지, 짱구_프로필);
 
     /* 그린론 */
@@ -20,7 +19,6 @@ public class MemberFixtures {
     public static final String 그린론_유저네임 = "greenlawn";
     public static final String 그린론_이미지 = "https://greenlawn.png";
     public static final String 그린론_프로필 = "https://greenlawn.com";
-    public static final Member 그린론 = new Member(그린론_깃허브_아이디, 그린론_유저네임, 그린론_이미지, 그린론_프로필);
     public static final MemberData 그린론_응답 = new MemberData(그린론_깃허브_아이디, 그린론_유저네임, 그린론_이미지, 그린론_프로필);
 
     /* 디우 */
@@ -29,7 +27,6 @@ public class MemberFixtures {
     public static final String 디우_유저네임 = "dwoo";
     public static final String 디우_이미지 = "https://dwoo.png";
     public static final String 디우_프로필 = "https://dwoo.com";
-    public static final Member 디우 = new Member(디우_깃허브_아이디, 디우_유저네임, 디우_이미지, 디우_프로필);
     public static final MemberData 디우_응답 = new MemberData(디우_깃허브_아이디, 디우_유저네임, 디우_이미지, 디우_프로필);
 
     /* 베루스 */
@@ -38,24 +35,43 @@ public class MemberFixtures {
     public static final String 베루스_유저네임 = "verus";
     public static final String 베루스_이미지 = "https://verus.png";
     public static final String 베루스_프로필 = "https://verus.com";
-    public static final Member 베루스 = new Member(베루스_깃허브_아이디, 베루스_유저네임, 베루스_이미지, 베루스_프로필);
     public static final MemberData 베루스_응답 = new MemberData(베루스_깃허브_아이디, 베루스_유저네임, 베루스_이미지, 베루스_프로필);
 
     /* 병민 */
-    public static final Long 병민_아이디 = 5L;
     public static final Long 병민_깃허브_아이디 = 5L;
     public static final String 병민_유저네임 = "airman";
     public static final String 병민_이미지 = "https://airman.png";
     public static final String 병민_프로필 = "https://airman.com";
-    public static final Member 병민 = new Member(병민_깃허브_아이디, 병민_유저네임, 병민_이미지, 병민_프로필);
     public static final MemberData 병민_응답 = new MemberData(병민_깃허브_아이디, 병민_유저네임, 병민_이미지, 병민_프로필);
 
     /* 태태 */
-    public static final Long 태태_아이디 = 6L;
     public static final Long 태태_깃허브_아이디 = 6L;
     public static final String 태태_유저네임 = "nannoo";
     public static final String 태태_이미지 = "https://nannoo.png";
     public static final String 태태_프로필 = "https://nannoo.com";
-    public static final Member 태태 = new Member(태태_깃허브_아이디, 태태_유저네임, 태태_이미지, 태태_프로필);
     public static final MemberData 태태_응답 = new MemberData(태태_깃허브_아이디, 태태_유저네임, 태태_이미지, 태태_프로필);
+
+    public static Member 짱구() {
+        return new Member(짱구_깃허브_아이디, 짱구_유저네임, 짱구_이미지, 짱구_프로필);
+    }
+
+    public static Member 그린론() {
+        return new Member(그린론_깃허브_아이디, 그린론_유저네임, 그린론_이미지, 그린론_프로필);
+    }
+
+    public static Member 디우() {
+        return new Member(디우_깃허브_아이디, 디우_유저네임, 디우_이미지, 디우_프로필);
+    }
+
+    public static Member 베루스() {
+        return new Member(베루스_깃허브_아이디, 베루스_유저네임, 베루스_이미지, 베루스_프로필);
+    }
+
+    public static Member 병민() {
+        return new Member(병민_깃허브_아이디, 병민_유저네임, 병민_이미지, 병민_프로필);
+    }
+
+    public static Member 태태() {
+        return new Member(태태_깃허브_아이디, 태태_유저네임, 태태_이미지, 태태_프로필);
+    }
 }

backend/src/test/java/com/woowacourse/fixtures/ReviewFixtures.java

@@ -1,47 +1,50 @@
 package com.woowacourse.fixtures;
 
-import static com.woowacourse.fixtures.MemberFixtures.그린론_아이디;
-import static com.woowacourse.fixtures.MemberFixtures.그린론_응답;
-import static com.woowacourse.fixtures.MemberFixtures.디우_아이디;
-import static com.woowacourse.fixtures.MemberFixtures.디우_응답;
-import static com.woowacourse.fixtures.MemberFixtures.베루스_아이디;
-import static com.woowacourse.fixtures.MemberFixtures.베루스_응답;
-import static com.woowacourse.fixtures.MemberFixtures.짱구_아이디;
-import static com.woowacourse.fixtures.MemberFixtures.짱구_응답;
-import static com.woowacourse.fixtures.StudyFixtures.자바_스터디_아이디;
-
 import com.woowacourse.moamoa.review.domain.AssociatedStudy;
 import com.woowacourse.moamoa.review.domain.Review;
 import com.woowacourse.moamoa.review.domain.Reviewer;
-import com.woowacourse.moamoa.review.query.data.ReviewData;
-import java.time.LocalDate;
 
 public class ReviewFixtures {
 
     /* 자바 스터디 리뷰 */
-    public static final Long 자바_리뷰1_아이디 = 1L;
     public static final String 자바_리뷰1_내용 = "자바 스터디 첫 번째 리뷰입니다.";
-    public static final Review 자바_리뷰1 = new Review(new AssociatedStudy(자바_스터디_아이디), new Reviewer(짱구_아이디), 자바_리뷰1_내용);
-    public static final ReviewData 자바_리뷰1_데이터 = new ReviewData(자바_리뷰1_아이디, 짱구_응답,
-            LocalDate.of(2022, 10, 9), LocalDate.of(2022, 10, 9), 자바_리뷰1_내용);
-
-    public static final Long 자바_리뷰2_아이디 = 2L;
     public static final String 자바_리뷰2_내용 = "자바 스터디 두 번째 리뷰입니다.";
-    public static final Review 자바_리뷰2 = new Review(new AssociatedStudy(자바_스터디_아이디), new Reviewer(베루스_아이디), 자바_리뷰2_내용);
-    public static final ReviewData 자바_리뷰2_데이터 = new ReviewData(자바_리뷰2_아이디, 베루스_응답,
-            LocalDate.of(2022, 10, 9), LocalDate.of(2022, 10, 10), 자바_리뷰2_내용);
-
-    public static final Long 자바_리뷰3_아이디 = 3L;
     public static final String 자바_리뷰3_내용 = "자바 스터디 세 번째 리뷰입니다.";
-    public static final Review 자바_리뷰3 = new Review(new AssociatedStudy(자바_스터디_아이디), new Reviewer(그린론_아이디), 자바_리뷰3_내용);
-    public static final ReviewData 자바_리뷰3_데이터 = new ReviewData(자바_리뷰3_아이디, 그린론_응답,
-            LocalDate.of(2022, 10, 10), LocalDate.of(2022, 10, 10), 자바_리뷰3_내용);
-
-    public static final Long 자바_리뷰4_아이디 = 4L;
     public static final String 자바_리뷰4_내용 = "자바 스터디 네 번째 리뷰입니다.";
-    public static final Review 자바_리뷰4 = new Review(new AssociatedStudy(자바_스터디_아이디), new Reviewer(디우_아이디), 자바_리뷰4_내용);
-    public static final ReviewData 자바_리뷰4_데이터 = new ReviewData(자바_리뷰4_아이디, 디우_응답,
-            LocalDate.of(2022, 10, 14), LocalDate.of(2022, 10, 15), 자바_리뷰4_내용);
 
-    public static final int 자바_리뷰_총_개수 = 4;
+    public static final String 리액트_리뷰1_내용 = "리액트 스터디 첫 번째 리뷰입니다.";
+    public static final String 리액트_리뷰2_내용 = "리액트 스터디 두 번째 리뷰입니다.";
+    public static final String 리액트_리뷰3_내용 = "리액트 스터디 세 번째 리뷰입니다.";
+
+    public static Review 자바_리뷰1(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 자바_리뷰1_내용);
+    }
+
+    public static Review 자바_리뷰2(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 자바_리뷰2_내용);
+    }
+
+    public static Review 자바_리뷰3(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 자바_리뷰3_내용);
+    }
+
+    public static Review 자바_리뷰4(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 자바_리뷰4_내용);
+    }
+
+    public static Review 리액트_리뷰1(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 리액트_리뷰1_내용);
+    }
+
+    public static Review 리액트_리뷰2(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 리액트_리뷰2_내용);
+    }
+
+    public static Review 리액트_리뷰3(final Long studyId, final Long memberId) {
+        return 리뷰(studyId, memberId, 리액트_리뷰3_내용);
+    }
+
+    private static Review 리뷰(final Long studyId, final Long reviewerId, final String content) {
+        return new Review(new AssociatedStudy(studyId), new Reviewer(reviewerId), content);
+    }
 }