[BE] issue469: 패키지 순환 구조 제거 및 정리

backend/src/main/java/com/woowacourse/moamoa/alarm/SlackAlarmSender.java

@@ -12,7 +12,6 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 

backend/src/main/java/com/woowacourse/moamoa/auth/config/AuthConfig.java

@@ -1,9 +1,8 @@
 package com.woowacourse.moamoa.auth.config;
 
-import com.woowacourse.moamoa.auth.controller.AuthenticatedMemberResolver;
-import com.woowacourse.moamoa.auth.controller.interceptor.AuthenticationInterceptor;
-import com.woowacourse.moamoa.auth.controller.interceptor.PathMatcherContainer;
-import com.woowacourse.moamoa.auth.controller.interceptor.PathMatcherInterceptor;
+import com.woowacourse.moamoa.auth.config.interceptor.AuthenticationInterceptor;
+import com.woowacourse.moamoa.auth.config.interceptor.PathMatcherContainer;
+import com.woowacourse.moamoa.auth.config.interceptor.PathMatcherInterceptor;
 import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

backend/src/main/java/com/woowacourse/moamoa/auth/controller/AuthenticatedMemberResolver.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/AuthenticatedMemberResolver.java

@@ -1,7 +1,5 @@
-package com.woowacourse.moamoa.auth.controller;
+package com.woowacourse.moamoa.auth.config;
 
-import com.woowacourse.moamoa.auth.config.AuthenticatedMemberId;
-import com.woowacourse.moamoa.auth.config.AuthenticationExtractor;
 import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
 import javax.servlet.http.HttpServletRequest;

backend/src/main/java/com/woowacourse/moamoa/auth/controller/interceptor/AuthenticationInterceptor.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/interceptor/AuthenticationInterceptor.java

@@ -1,4 +1,4 @@
-package com.woowacourse.moamoa.auth.controller.interceptor;
+package com.woowacourse.moamoa.auth.config.interceptor;
 
 import com.woowacourse.moamoa.auth.config.AuthenticationExtractor;
 import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;

backend/src/main/java/com/woowacourse/moamoa/auth/controller/interceptor/PathMatcherContainer.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/interceptor/PathMatcherContainer.java

@@ -1,4 +1,4 @@
-package com.woowacourse.moamoa.auth.controller.interceptor;
+package com.woowacourse.moamoa.auth.config.interceptor;
 
 import java.util.ArrayList;
 import java.util.List;

backend/src/main/java/com/woowacourse/moamoa/auth/controller/interceptor/PathMatcherInterceptor.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/interceptor/PathMatcherInterceptor.java

@@ -1,4 +1,4 @@
-package com.woowacourse.moamoa.auth.controller.interceptor;
+package com.woowacourse.moamoa.auth.config.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

backend/src/main/java/com/woowacourse/moamoa/auth/controller/interceptor/PathRequestMatcher.java → backend/src/main/java/com/woowacourse/moamoa/auth/config/interceptor/PathRequestMatcher.java

@@ -1,4 +1,4 @@
-package com.woowacourse.moamoa.auth.controller.interceptor;
+package com.woowacourse.moamoa.auth.config.interceptor;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

backend/src/main/java/com/woowacourse/moamoa/member/query/data/ParticipatingMemberData.java

@@ -1,6 +1,5 @@
 package com.woowacourse.moamoa.member.query.data;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.LocalDate;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

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

@@ -6,8 +6,8 @@
 import static lombok.AccessLevel.PROTECTED;
 
 import com.woowacourse.moamoa.common.exception.UnauthorizedException;
-import com.woowacourse.moamoa.study.domain.exception.NotParticipatedMemberException;
 import com.woowacourse.moamoa.study.domain.exception.InvalidPeriodException;
+import com.woowacourse.moamoa.study.domain.exception.NotParticipatedMemberException;
 import com.woowacourse.moamoa.study.service.exception.FailureKickOutException;
 import com.woowacourse.moamoa.study.service.exception.FailureParticipationException;
 import com.woowacourse.moamoa.study.service.exception.InvalidUpdatingException;
@@ -85,15 +85,6 @@ public Study(
         updatePlanners(createdAt.toLocalDate(), maxMemberCount, enrollmentEndDate, startDate, endDate);
     }
 
-    private StudyPlanner makeStudyPlanner(final LocalDateTime createdAt,
-                                         final LocalDate startDate,
-                                         final LocalDate endDate) {
-        if (startDate.equals(createdAt.toLocalDate())) {
-            return new StudyPlanner(startDate, endDate, IN_PROGRESS);
-        }
-        return new StudyPlanner(startDate, endDate, PREPARE);
-    }
-
     public boolean isParticipant(final Long memberId) {
         return participants.isParticipation(memberId);
     }
@@ -133,27 +124,6 @@ public void leave(final Participant participant, final LocalDate now) {
         }
     }
 
-    private boolean isRecruitingAfterEndStudy(final RecruitPlanner recruitPlanner, final StudyPlanner studyPlanner) {
-        return recruitPlanner.hasEnrollmentEndDate() && studyPlanner
-                .isEndBeforeThan(recruitPlanner.getEnrollmentEndDate());
-    }
-
-    private boolean isRecruitedOrStartStudyBeforeCreatedAt(
-            final RecruitPlanner recruitPlanner, final StudyPlanner studyPlanner, final LocalDateTime createdAt
-    ) {
-        return studyPlanner.isStartBeforeThan(createdAt.toLocalDate()) ||
-                recruitPlanner.isRecruitedBeforeThan(createdAt.toLocalDate());
-    }
-
-    private void verifyCanLeave(final Participant participant) {
-        if (participants.isOwner(participant.getMemberId())) {
-            throw new OwnerCanNotLeaveException();
-        }
-        if (!participants.isParticipation(participant.getMemberId())) {
-            throw new NotParticipatedMemberException();
-        }
-    }
-
     public boolean isProgressStatus() {
         return studyPlanner.isProgress();
     }
@@ -162,10 +132,6 @@ public boolean isCloseStudy() {
         return studyPlanner.isCloseStudy();
     }
 
-    private boolean isFullOfCapacity() {
-        return recruitPlanner.hasCapacity() && recruitPlanner.getCapacity() == participants.getSize();
-    }
-
     public MemberRole getRole(final Long memberId) {
         if (participants.isOwner(memberId)) {
             return MemberRole.OWNER;
@@ -213,6 +179,49 @@ public void updatePlanners(final LocalDate requestNow,
         throw new RuntimeException("스터디 모집 상태에서 오류가 발생했습니다.");
     }
 
+    public void updateContent(Long memberId, Content content, AttachedTags attachedTags) {
+        if (!participants.isOwner(memberId)) {
+            throw new UnauthorizedException("스터디 방장만이 스터디를 수정할 수 있습니다.");
+        }
+
+        this.content = content;
+        this.attachedTags = attachedTags;
+    }
+
+    private StudyPlanner makeStudyPlanner(final LocalDateTime createdAt,
+                                          final LocalDate startDate,
+                                          final LocalDate endDate) {
+        if (startDate.equals(createdAt.toLocalDate())) {
+            return new StudyPlanner(startDate, endDate, IN_PROGRESS);
+        }
+        return new StudyPlanner(startDate, endDate, PREPARE);
+    }
+
+    private boolean isRecruitingAfterEndStudy(final RecruitPlanner recruitPlanner, final StudyPlanner studyPlanner) {
+        return recruitPlanner.hasEnrollmentEndDate() && studyPlanner
+                .isEndBeforeThan(recruitPlanner.getEnrollmentEndDate());
+    }
+
+    private boolean isRecruitedOrStartStudyBeforeCreatedAt(
+            final RecruitPlanner recruitPlanner, final StudyPlanner studyPlanner, final LocalDateTime createdAt
+    ) {
+        return studyPlanner.isStartBeforeThan(createdAt.toLocalDate()) ||
+                recruitPlanner.isRecruitedBeforeThan(createdAt.toLocalDate());
+    }
+
+    private void verifyCanLeave(final Participant participant) {
+        if (participants.isOwner(participant.getMemberId())) {
+            throw new OwnerCanNotLeaveException();
+        }
+        if (!participants.isParticipation(participant.getMemberId())) {
+            throw new NotParticipatedMemberException();
+        }
+    }
+
+    private boolean isFullOfCapacity() {
+        return recruitPlanner.hasCapacity() && recruitPlanner.getCapacity() == participants.getSize();
+    }
+
     private boolean isNotMaxMemberCount(final RecruitPlanner recruitPlanner) {
         return recruitPlanner.getMaxMemberCount() == null || !participants.isParticipantsMaxCount(
                 recruitPlanner.getMaxMemberCount());
@@ -252,13 +261,4 @@ private void setPlanner(final StudyPlanner studyPlanner, final RecruitPlanner re
         this.studyPlanner = studyPlanner;
         this.recruitPlanner = recruitPlanner;
     }
-
-    public void updateContent(Long memberId, Content content, AttachedTags attachedTags) {
-        if (!participants.isOwner(memberId)) {
-            throw new UnauthorizedException("스터디 방장만이 스터디를 수정할 수 있습니다.");
-        }
-
-        this.content = content;
-        this.attachedTags = attachedTags;
-    }
 }

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

@@ -1,7 +1,6 @@
 package com.woowacourse.moamoa.study.service;
 
 import com.woowacourse.moamoa.common.utils.DateTimeSystem;
-import com.woowacourse.moamoa.member.domain.Member;
 import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
 import com.woowacourse.moamoa.member.service.exception.MemberNotFoundException;
 import com.woowacourse.moamoa.study.domain.Participant;

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

@@ -7,9 +7,7 @@
 import com.woowacourse.moamoa.study.domain.AttachedTags;
 import com.woowacourse.moamoa.study.domain.Content;
 import com.woowacourse.moamoa.study.domain.Participants;
-import com.woowacourse.moamoa.study.domain.RecruitPlanner;
 import com.woowacourse.moamoa.study.domain.Study;
-import com.woowacourse.moamoa.study.domain.StudyPlanner;
 import com.woowacourse.moamoa.study.domain.repository.StudyRepository;
 import com.woowacourse.moamoa.study.service.exception.StudyNotFoundException;
 import com.woowacourse.moamoa.study.service.request.StudyRequest;

backend/src/main/java/com/woowacourse/moamoa/studyroom/service/ArticleService.java

@@ -2,15 +2,15 @@
 
 import com.woowacourse.moamoa.study.service.exception.StudyNotFoundException;
 import com.woowacourse.moamoa.studyroom.domain.Accessor;
-import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
 import com.woowacourse.moamoa.studyroom.domain.article.Article;
 import com.woowacourse.moamoa.studyroom.domain.article.ArticleType;
 import com.woowacourse.moamoa.studyroom.domain.article.Content;
-import com.woowacourse.moamoa.studyroom.service.exception.ArticleNotFoundException;
 import com.woowacourse.moamoa.studyroom.domain.article.repository.ArticleRepository;
+import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
 import com.woowacourse.moamoa.studyroom.domain.studyroom.repository.StudyRoomRepository;
 import com.woowacourse.moamoa.studyroom.query.ArticleDao;
 import com.woowacourse.moamoa.studyroom.query.data.ArticleData;
+import com.woowacourse.moamoa.studyroom.service.exception.ArticleNotFoundException;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleResponse;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleSummariesResponse;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleSummaryResponse;

backend/src/main/java/com/woowacourse/moamoa/studyroom/service/LinkArticleService.java

@@ -2,14 +2,14 @@
 
 import com.woowacourse.moamoa.study.service.exception.StudyNotFoundException;
 import com.woowacourse.moamoa.studyroom.domain.Accessor;
-import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
 import com.woowacourse.moamoa.studyroom.domain.link.LinkArticle;
 import com.woowacourse.moamoa.studyroom.domain.link.LinkContent;
-import com.woowacourse.moamoa.studyroom.service.exception.ArticleNotFoundException;
 import com.woowacourse.moamoa.studyroom.domain.link.repository.LinkArticleRepository;
+import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
 import com.woowacourse.moamoa.studyroom.domain.studyroom.repository.StudyRoomRepository;
 import com.woowacourse.moamoa.studyroom.query.LinkArticleDao;
 import com.woowacourse.moamoa.studyroom.query.data.LinkArticleData;
+import com.woowacourse.moamoa.studyroom.service.exception.ArticleNotFoundException;
 import com.woowacourse.moamoa.studyroom.service.response.LinksResponse;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;

backend/src/main/java/com/woowacourse/moamoa/studyroom/service/ReviewService.java

@@ -2,10 +2,10 @@
 
 import com.woowacourse.moamoa.study.service.exception.StudyNotFoundException;
 import com.woowacourse.moamoa.studyroom.domain.Accessor;
-import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
+import com.woowacourse.moamoa.studyroom.domain.review.Review;
 import com.woowacourse.moamoa.studyroom.domain.review.repository.ReviewRepository;
+import com.woowacourse.moamoa.studyroom.domain.studyroom.StudyRoom;
 import com.woowacourse.moamoa.studyroom.domain.studyroom.repository.StudyRoomRepository;
-import com.woowacourse.moamoa.studyroom.domain.review.Review;
 import com.woowacourse.moamoa.studyroom.service.exception.ReviewNotFoundException;
 import com.woowacourse.moamoa.studyroom.service.request.ReviewRequest;
 import lombok.RequiredArgsConstructor;

backend/src/test/java/com/woowacourse/acceptance/test/studyroom/NoticeAcceptanceTest.java

@@ -8,36 +8,21 @@
 import static com.woowacourse.acceptance.steps.LoginSteps.그린론이;
 import static com.woowacourse.acceptance.steps.LoginSteps.베루스가;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
-import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
-import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders;
-import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
-import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
-import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
-import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
-import static org.springframework.restdocs.request.RequestDocumentation.requestParameters;
-import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.woowacourse.acceptance.AcceptanceTest;
-import com.woowacourse.moamoa.studyroom.service.request.ArticleRequest;
 import com.woowacourse.moamoa.member.service.response.MemberResponse;
+import com.woowacourse.moamoa.studyroom.service.request.ArticleRequest;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleResponse;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleSummariesResponse;
 import com.woowacourse.moamoa.studyroom.service.response.ArticleSummaryResponse;
 import com.woowacourse.moamoa.studyroom.service.response.AuthorResponse;
-import io.restassured.RestAssured;
 import java.time.LocalDate;
 import java.util.List;
-import org.apache.http.HttpHeaders;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.restdocs.payload.JsonFieldType;
 
-public class NoticeAcceptanceTest extends AcceptanceTest {
+class NoticeAcceptanceTest extends AcceptanceTest {
 
     @DisplayName("스터디에 공지사항을 작성한다.")
     @Test

backend/src/test/java/com/woowacourse/acceptance/test/studyroom/TempCommunityArticleAcceptanceTest.java

@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 @DisplayName("임시 게시글 관련 인수 테스트")
-public class TempCommunityArticleAcceptanceTest extends AcceptanceTest {
+class TempCommunityArticleAcceptanceTest extends AcceptanceTest {
 
     private LocalDate 지금;
 
@@ -117,7 +117,7 @@ void getTempArticles() {
                     expectedArticleIds.next(), expectedTitles.next(), expectedContents.next(), expectedStudyId.next());
         }
 
-        assertThat(responses.getCurrentPage()).isEqualTo(0);
+        assertThat(responses.getCurrentPage()).isZero();
         assertThat(responses.getLastPage()).isEqualTo(1);
         assertThat(responses.getTotalCount()).isEqualTo(6);
     }

backend/src/test/java/com/woowacourse/acceptance/test/studyroom/TempNoticeArticleAcceptanceTest.java

@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 
 @DisplayName("임시 공지글 관련 인수 테스트")
-public class TempNoticeArticleAcceptanceTest extends AcceptanceTest {
+class TempNoticeArticleAcceptanceTest extends AcceptanceTest {
 
     private LocalDate 지금;
 
@@ -108,7 +108,7 @@ void getTempArticles() {
             );
         }
 
-        assertThat(responses.getCurrentPage()).isEqualTo(0);
+        assertThat(responses.getCurrentPage()).isZero();
         assertThat(responses.getLastPage()).isEqualTo(1);
         assertThat(responses.getTotalCount()).isEqualTo(6);
     }

backend/src/test/java/com/woowacourse/concurrent/ConcurrentParticipateAcceptanceTest.java

@@ -94,7 +94,7 @@ void concurrentlyLeaveStudy() {
 
         // assert
         assertThat(requester.getSuccessUser()).isEqualTo(100);
-        assertThat(requester.getFailUser()).isEqualTo(0);
+        assertThat(requester.getFailUser()).isZero();
         assertThat(getCurrentMemberCount(스터디_ID)).isEqualTo(1);
     }
 
@@ -136,7 +136,7 @@ void concurrentlyParticipateOrLeaveStudy() {
 
         // assert
         assertThat(requester.getSuccessUser()).isEqualTo(100);
-        assertThat(requester.getFailUser()).isEqualTo(0);
+        assertThat(requester.getFailUser()).isZero();
         assertThat(getCurrentMemberCount(스터디_ID)).isEqualTo(52);
     }
 

backend/src/test/java/com/woowacourse/moamoa/auth/controller/interceptor/PathMatcherContainerTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.woowacourse.moamoa.auth.config.interceptor.PathMatcherContainer;
 import com.woowacourse.moamoa.common.WebMVCTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;

backend/src/test/java/com/woowacourse/moamoa/auth/controller/interceptor/PathRequestMatcherTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.woowacourse.moamoa.auth.config.interceptor.PathRequestMatcher;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;