From b4acd24cabc133e7b786fc015151bd490bf6f3ae Mon Sep 17 00:00:00 2001 From: "Choi, Minwoo" Date: Sat, 12 Jul 2025 02:27:23 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20MemberCategory=20=EB=B3=80=ED=99=98?= =?UTF-8?q?=20=EB=B0=8F=20Member=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20=EB=B6=84=EB=A6=AC(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: MemberService에서 parseCategory, validateMemberNickname, validateNewMember 메서드 삭제 * refactor: MemberCategory에 from 정적 팩토리 메서드 구현 * refactor: member.domain.entity 패키지 -> model.domain.model 패키지 이름 변경 * feat: MemberPolicy 구현 * feat: MemberRepository에 existsBySocialProviderAndSocialId 메서드 구현 * feat: MemberErrorCode에 INVALID_MEMBER_CATEGORY 에러 메시지 추가 * test: shouldThrowExceptionWhenCategoryIsBlank 메서드 추가 --- .../auth/application/facade/AuthFacade.java | 4 +- .../application/service/MemberService.java | 43 ++++++------------- .../member/domain/entity/MemberCategory.java | 8 ---- .../member/domain/error/MemberErrorCode.java | 2 +- .../domain/{entity => model}/Member.java | 2 +- .../member/domain/model/MemberCategory.java | 26 +++++++++++ .../domain/{entity => model}/MemberRole.java | 2 +- .../{entity => model}/SocialProvider.java | 2 +- .../member/domain/policy/MemberPolicy.java | 24 +++++++++++ .../domain/repository/MemberRepository.java | 6 ++- .../member/factory/MemberFactory.java | 8 ++-- .../member/infra/jpa/MemberJpaRepository.java | 6 ++- .../infra/jpa/MemberRepositoryAdapter.java | 10 ++++- .../trip/application/facade/TripFacade.java | 2 +- .../trip/application/service/TripService.java | 2 +- .../trip/domain/factory/TripFactory.java | 2 +- .../studytrip/trip/domain/model/Trip.java | 2 +- .../service/MemberServiceTest.java | 28 +++++++----- .../member/fixture/MemberFixture.java | 8 ++-- .../member/helper/MemberTestHelper.java | 2 +- .../application/service/StampServiceTest.java | 2 +- .../application/service/TripServiceTest.java | 2 +- .../studytrip/trip/fixture/TripFixture.java | 2 +- .../studytrip/trip/helper/TripTestHelper.java | 2 +- .../TripControllerIntegrationTest.java | 2 +- 25 files changed, 119 insertions(+), 80 deletions(-) delete mode 100644 src/main/java/com/ject/studytrip/member/domain/entity/MemberCategory.java rename src/main/java/com/ject/studytrip/member/domain/{entity => model}/Member.java (96%) create mode 100644 src/main/java/com/ject/studytrip/member/domain/model/MemberCategory.java rename src/main/java/com/ject/studytrip/member/domain/{entity => model}/MemberRole.java (60%) rename src/main/java/com/ject/studytrip/member/domain/{entity => model}/SocialProvider.java (52%) create mode 100644 src/main/java/com/ject/studytrip/member/domain/policy/MemberPolicy.java diff --git a/src/main/java/com/ject/studytrip/auth/application/facade/AuthFacade.java b/src/main/java/com/ject/studytrip/auth/application/facade/AuthFacade.java index 00dfaa2..40099ed 100644 --- a/src/main/java/com/ject/studytrip/auth/application/facade/AuthFacade.java +++ b/src/main/java/com/ject/studytrip/auth/application/facade/AuthFacade.java @@ -6,8 +6,8 @@ import com.ject.studytrip.auth.presentation.dto.request.KakaoSignupRequest; import com.ject.studytrip.auth.presentation.dto.response.TokenResponse; import com.ject.studytrip.member.application.service.MemberService; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.SocialProvider; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ject/studytrip/member/application/service/MemberService.java b/src/main/java/com/ject/studytrip/member/application/service/MemberService.java index 40e920d..a4dae22 100644 --- a/src/main/java/com/ject/studytrip/member/application/service/MemberService.java +++ b/src/main/java/com/ject/studytrip/member/application/service/MemberService.java @@ -1,12 +1,11 @@ package com.ject.studytrip.member.application.service; -import static io.jsonwebtoken.lang.Strings.hasText; - import com.ject.studytrip.global.exception.CustomException; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.MemberCategory; -import com.ject.studytrip.member.domain.entity.SocialProvider; import com.ject.studytrip.member.domain.error.MemberErrorCode; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.MemberCategory; +import com.ject.studytrip.member.domain.model.SocialProvider; +import com.ject.studytrip.member.domain.policy.MemberPolicy; import com.ject.studytrip.member.domain.repository.MemberRepository; import com.ject.studytrip.member.factory.MemberFactory; import lombok.RequiredArgsConstructor; @@ -36,33 +35,15 @@ public Member getMemberBySocialProviderAndSocialId( @Transactional public Member createMemberFromKakao( String kakaoId, String email, String profileImage, String category, String nickname) { - validateNewMember(kakaoId); - MemberCategory parsedCategory = parseCategory(category); - validateMemberNickname(nickname); - Member member = - MemberFactory.fromKakao(kakaoId, email, profileImage, nickname, parsedCategory); - return memberRepository.save(member); - } + boolean exists = + memberRepository.existsBySocialProviderAndSocialId(SocialProvider.KAKAO, kakaoId); + MemberPolicy.validateNickname(nickname); + MemberPolicy.validateNewMember(exists); - private MemberCategory parseCategory(String category) { - try { - return MemberCategory.valueOf(category); - } catch (IllegalArgumentException | NullPointerException e) { - throw new CustomException(MemberErrorCode.MEMBER_CATEGORY_REQUIRED); - } - } - - private void validateNewMember(String socialId) { - if (memberRepository - .findBySocialProviderAndSocialId(SocialProvider.KAKAO, socialId) - .isPresent()) { - throw new CustomException(MemberErrorCode.MEMBER_ALREADY_EXISTS); - } - } + MemberCategory memberCategory = MemberCategory.from(category); + Member member = + MemberFactory.fromKakao(kakaoId, email, profileImage, nickname, memberCategory); - private void validateMemberNickname(String nickname) { - if (!hasText(nickname)) { - throw new CustomException(MemberErrorCode.MEMBER_NICKNAME_REQUIRED); - } + return memberRepository.save(member); } } diff --git a/src/main/java/com/ject/studytrip/member/domain/entity/MemberCategory.java b/src/main/java/com/ject/studytrip/member/domain/entity/MemberCategory.java deleted file mode 100644 index baad004..0000000 --- a/src/main/java/com/ject/studytrip/member/domain/entity/MemberCategory.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ject.studytrip.member.domain.entity; - -public enum MemberCategory { - STUDENT, - WORKER, - FREELANCER, - JOBSEEKER -} diff --git a/src/main/java/com/ject/studytrip/member/domain/error/MemberErrorCode.java b/src/main/java/com/ject/studytrip/member/domain/error/MemberErrorCode.java index 9aa322d..2dea116 100644 --- a/src/main/java/com/ject/studytrip/member/domain/error/MemberErrorCode.java +++ b/src/main/java/com/ject/studytrip/member/domain/error/MemberErrorCode.java @@ -11,7 +11,7 @@ public enum MemberErrorCode implements ErrorCode { MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "멤버를 찾을 수 없습니다."), MEMBER_NEED_SIGNUP(HttpStatus.CONFLICT, "회원가입이 필요한 사용자입니다."), MEMBER_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 가입된 사용자입니다."), - ; + INVALID_MEMBER_CATEGORY(HttpStatus.BAD_REQUEST, "유효하지 않은 멤버 카테고리입니다."); private final HttpStatus status; private final String message; diff --git a/src/main/java/com/ject/studytrip/member/domain/entity/Member.java b/src/main/java/com/ject/studytrip/member/domain/model/Member.java similarity index 96% rename from src/main/java/com/ject/studytrip/member/domain/entity/Member.java rename to src/main/java/com/ject/studytrip/member/domain/model/Member.java index 829d4c7..f26b40e 100644 --- a/src/main/java/com/ject/studytrip/member/domain/entity/Member.java +++ b/src/main/java/com/ject/studytrip/member/domain/model/Member.java @@ -1,4 +1,4 @@ -package com.ject.studytrip.member.domain.entity; +package com.ject.studytrip.member.domain.model; import com.ject.studytrip.global.common.entity.BaseTimeEntity; import jakarta.persistence.*; diff --git a/src/main/java/com/ject/studytrip/member/domain/model/MemberCategory.java b/src/main/java/com/ject/studytrip/member/domain/model/MemberCategory.java new file mode 100644 index 0000000..d9eedec --- /dev/null +++ b/src/main/java/com/ject/studytrip/member/domain/model/MemberCategory.java @@ -0,0 +1,26 @@ +package com.ject.studytrip.member.domain.model; + +import static org.springframework.util.StringUtils.hasText; + +import com.ject.studytrip.global.exception.CustomException; +import com.ject.studytrip.member.domain.error.MemberErrorCode; + +public enum MemberCategory { + STUDENT, + WORKER, + FREELANCER, + JOBSEEKER, + ; + + public static MemberCategory from(String category) { + if (!hasText(category)) { + throw new CustomException(MemberErrorCode.MEMBER_CATEGORY_REQUIRED); + } + + try { + return MemberCategory.valueOf(category); + } catch (IllegalArgumentException e) { + throw new CustomException(MemberErrorCode.INVALID_MEMBER_CATEGORY); + } + } +} diff --git a/src/main/java/com/ject/studytrip/member/domain/entity/MemberRole.java b/src/main/java/com/ject/studytrip/member/domain/model/MemberRole.java similarity index 60% rename from src/main/java/com/ject/studytrip/member/domain/entity/MemberRole.java rename to src/main/java/com/ject/studytrip/member/domain/model/MemberRole.java index c3aa7a1..55985e2 100644 --- a/src/main/java/com/ject/studytrip/member/domain/entity/MemberRole.java +++ b/src/main/java/com/ject/studytrip/member/domain/model/MemberRole.java @@ -1,4 +1,4 @@ -package com.ject.studytrip.member.domain.entity; +package com.ject.studytrip.member.domain.model; public enum MemberRole { ROLE_USER, diff --git a/src/main/java/com/ject/studytrip/member/domain/entity/SocialProvider.java b/src/main/java/com/ject/studytrip/member/domain/model/SocialProvider.java similarity index 52% rename from src/main/java/com/ject/studytrip/member/domain/entity/SocialProvider.java rename to src/main/java/com/ject/studytrip/member/domain/model/SocialProvider.java index 543a7d7..c7fff05 100644 --- a/src/main/java/com/ject/studytrip/member/domain/entity/SocialProvider.java +++ b/src/main/java/com/ject/studytrip/member/domain/model/SocialProvider.java @@ -1,4 +1,4 @@ -package com.ject.studytrip.member.domain.entity; +package com.ject.studytrip.member.domain.model; public enum SocialProvider { KAKAO, diff --git a/src/main/java/com/ject/studytrip/member/domain/policy/MemberPolicy.java b/src/main/java/com/ject/studytrip/member/domain/policy/MemberPolicy.java new file mode 100644 index 0000000..a700ae6 --- /dev/null +++ b/src/main/java/com/ject/studytrip/member/domain/policy/MemberPolicy.java @@ -0,0 +1,24 @@ +package com.ject.studytrip.member.domain.policy; + +import static io.jsonwebtoken.lang.Strings.hasText; + +import com.ject.studytrip.global.exception.CustomException; +import com.ject.studytrip.member.domain.error.MemberErrorCode; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class MemberPolicy { + + public static void validateNickname(String nickname) { + if (!hasText(nickname)) { + throw new CustomException(MemberErrorCode.MEMBER_NICKNAME_REQUIRED); + } + } + + public static void validateNewMember(boolean exists) { + if (exists) { + throw new CustomException(MemberErrorCode.MEMBER_ALREADY_EXISTS); + } + } +} diff --git a/src/main/java/com/ject/studytrip/member/domain/repository/MemberRepository.java b/src/main/java/com/ject/studytrip/member/domain/repository/MemberRepository.java index 2bf8f7e..194ea54 100644 --- a/src/main/java/com/ject/studytrip/member/domain/repository/MemberRepository.java +++ b/src/main/java/com/ject/studytrip/member/domain/repository/MemberRepository.java @@ -1,13 +1,15 @@ package com.ject.studytrip.member.domain.repository; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.SocialProvider; import java.util.Optional; public interface MemberRepository { Optional findBySocialProviderAndSocialId( SocialProvider socialProvider, String socialId); + boolean existsBySocialProviderAndSocialId(SocialProvider socialProvider, String socialId); + Optional findById(Long id); Member save(Member member); diff --git a/src/main/java/com/ject/studytrip/member/factory/MemberFactory.java b/src/main/java/com/ject/studytrip/member/factory/MemberFactory.java index af05776..53f2d3c 100644 --- a/src/main/java/com/ject/studytrip/member/factory/MemberFactory.java +++ b/src/main/java/com/ject/studytrip/member/factory/MemberFactory.java @@ -1,9 +1,9 @@ package com.ject.studytrip.member.factory; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.MemberCategory; -import com.ject.studytrip.member.domain.entity.MemberRole; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.MemberCategory; +import com.ject.studytrip.member.domain.model.MemberRole; +import com.ject.studytrip.member.domain.model.SocialProvider; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/ject/studytrip/member/infra/jpa/MemberJpaRepository.java b/src/main/java/com/ject/studytrip/member/infra/jpa/MemberJpaRepository.java index 22e15cd..32083f2 100644 --- a/src/main/java/com/ject/studytrip/member/infra/jpa/MemberJpaRepository.java +++ b/src/main/java/com/ject/studytrip/member/infra/jpa/MemberJpaRepository.java @@ -1,11 +1,13 @@ package com.ject.studytrip.member.infra.jpa; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.SocialProvider; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface MemberJpaRepository extends JpaRepository { Optional findBySocialProviderAndSocialId( SocialProvider socialProvider, String socialId); + + boolean existsBySocialProviderAndSocialId(SocialProvider socialProvider, String socialId); } diff --git a/src/main/java/com/ject/studytrip/member/infra/jpa/MemberRepositoryAdapter.java b/src/main/java/com/ject/studytrip/member/infra/jpa/MemberRepositoryAdapter.java index 829d72d..77b4a96 100644 --- a/src/main/java/com/ject/studytrip/member/infra/jpa/MemberRepositoryAdapter.java +++ b/src/main/java/com/ject/studytrip/member/infra/jpa/MemberRepositoryAdapter.java @@ -1,7 +1,7 @@ package com.ject.studytrip.member.infra.jpa; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.SocialProvider; import com.ject.studytrip.member.domain.repository.MemberRepository; import java.util.Optional; import lombok.RequiredArgsConstructor; @@ -18,6 +18,12 @@ public Optional findBySocialProviderAndSocialId( return memberJpaRepository.findBySocialProviderAndSocialId(socialProvider, socialId); } + @Override + public boolean existsBySocialProviderAndSocialId( + SocialProvider socialProvider, String socialId) { + return memberJpaRepository.existsBySocialProviderAndSocialId(socialProvider, socialId); + } + @Override public Optional findById(Long id) { return memberJpaRepository.findById(id); diff --git a/src/main/java/com/ject/studytrip/trip/application/facade/TripFacade.java b/src/main/java/com/ject/studytrip/trip/application/facade/TripFacade.java index f6b2e60..5d2b4bb 100644 --- a/src/main/java/com/ject/studytrip/trip/application/facade/TripFacade.java +++ b/src/main/java/com/ject/studytrip/trip/application/facade/TripFacade.java @@ -1,7 +1,7 @@ package com.ject.studytrip.trip.application.facade; import com.ject.studytrip.member.application.service.MemberService; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.stamp.application.dto.StampInfo; import com.ject.studytrip.stamp.application.service.StampService; import com.ject.studytrip.stamp.domain.model.Stamp; diff --git a/src/main/java/com/ject/studytrip/trip/application/service/TripService.java b/src/main/java/com/ject/studytrip/trip/application/service/TripService.java index 0bda191..fad633a 100644 --- a/src/main/java/com/ject/studytrip/trip/application/service/TripService.java +++ b/src/main/java/com/ject/studytrip/trip/application/service/TripService.java @@ -1,7 +1,7 @@ package com.ject.studytrip.trip.application.service; import com.ject.studytrip.global.exception.CustomException; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.trip.domain.error.TripErrorCode; import com.ject.studytrip.trip.domain.factory.TripFactory; import com.ject.studytrip.trip.domain.model.Trip; diff --git a/src/main/java/com/ject/studytrip/trip/domain/factory/TripFactory.java b/src/main/java/com/ject/studytrip/trip/domain/factory/TripFactory.java index 929f7f4..f64f170 100644 --- a/src/main/java/com/ject/studytrip/trip/domain/factory/TripFactory.java +++ b/src/main/java/com/ject/studytrip/trip/domain/factory/TripFactory.java @@ -1,6 +1,6 @@ package com.ject.studytrip.trip.domain.factory; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.trip.domain.model.Trip; import com.ject.studytrip.trip.domain.model.TripCategory; import java.time.LocalDate; diff --git a/src/main/java/com/ject/studytrip/trip/domain/model/Trip.java b/src/main/java/com/ject/studytrip/trip/domain/model/Trip.java index 45d87de..f6def08 100644 --- a/src/main/java/com/ject/studytrip/trip/domain/model/Trip.java +++ b/src/main/java/com/ject/studytrip/trip/domain/model/Trip.java @@ -3,7 +3,7 @@ import static org.springframework.util.StringUtils.hasText; import com.ject.studytrip.global.common.entity.BaseTimeEntity; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import jakarta.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/test/java/com/ject/studytrip/member/application/service/MemberServiceTest.java b/src/test/java/com/ject/studytrip/member/application/service/MemberServiceTest.java index d777857..b0d482b 100644 --- a/src/test/java/com/ject/studytrip/member/application/service/MemberServiceTest.java +++ b/src/test/java/com/ject/studytrip/member/application/service/MemberServiceTest.java @@ -5,9 +5,9 @@ import com.ject.studytrip.BaseUnitTest; import com.ject.studytrip.global.exception.CustomException; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.SocialProvider; import com.ject.studytrip.member.domain.error.MemberErrorCode; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.SocialProvider; import com.ject.studytrip.member.domain.repository.MemberRepository; import com.ject.studytrip.member.fixture.MemberFixture; import java.util.Optional; @@ -109,8 +109,10 @@ void shouldReturnMemberWhenSocialIdExists() { @DisplayName("이미 존재하는 멤버라면 예외가 발생한다.") void shouldThrowExceptionWhenMemberAlreadyExists() { // given - given(memberRepository.findBySocialProviderAndSocialId(SocialProvider.KAKAO, KAKAO_ID)) - .willReturn(Optional.of(member)); + given( + memberRepository.existsBySocialProviderAndSocialId( + SocialProvider.KAKAO, KAKAO_ID)) + .willReturn(true); // when & then assertThatThrownBy( @@ -127,13 +129,13 @@ void shouldThrowExceptionWhenMemberAlreadyExists() { class CreateMemberFromKakao { @Test - @DisplayName("카테고리가 유효하지 않으면 예외가 발생한다.") - void shouldThrowExceptionWhenCategoryIsInvalid() { + @DisplayName("카테고리가 비어 있으면 예외가 발생한다.") + void shouldThrowExceptionWhenCategoryIsBlank() { // when & then assertThatThrownBy( () -> memberService.createMemberFromKakao( - KAKAO_ID, EMAIL, PROFILE_IMAGE, "INVALID", NICKNAME)) + KAKAO_ID, EMAIL, PROFILE_IMAGE, " ", NICKNAME)) .isInstanceOf(CustomException.class) .hasMessage(MemberErrorCode.MEMBER_CATEGORY_REQUIRED.getMessage()); } @@ -154,8 +156,10 @@ void shouldThrowExceptionWhenNicknameIsBlank() { @DisplayName("모든 정보가 유효하면 Member를 생성하고 반환한다.") void shouldCreateMemberWhenAllDataIsValid() { // given - given(memberRepository.findBySocialProviderAndSocialId(SocialProvider.KAKAO, KAKAO_ID)) - .willReturn(Optional.empty()); + given( + memberRepository.existsBySocialProviderAndSocialId( + SocialProvider.KAKAO, KAKAO_ID)) + .willReturn(false); given(memberRepository.save(any(Member.class))).willReturn(member); // when @@ -171,8 +175,10 @@ void shouldCreateMemberWhenAllDataIsValid() { @DisplayName("프로필 이미지가 없어도 Member를 생성하고 반환한다.") void shouldCreateMemberWhenProfileImageIsNull() { // given - given(memberRepository.findBySocialProviderAndSocialId(SocialProvider.KAKAO, KAKAO_ID)) - .willReturn(Optional.empty()); + given( + memberRepository.existsBySocialProviderAndSocialId( + SocialProvider.KAKAO, KAKAO_ID)) + .willReturn(false); given(memberRepository.save(any(Member.class))).willReturn(memberWithoutProfileImage); // when diff --git a/src/test/java/com/ject/studytrip/member/fixture/MemberFixture.java b/src/test/java/com/ject/studytrip/member/fixture/MemberFixture.java index d4ba52b..04c2cc5 100644 --- a/src/test/java/com/ject/studytrip/member/fixture/MemberFixture.java +++ b/src/test/java/com/ject/studytrip/member/fixture/MemberFixture.java @@ -1,9 +1,9 @@ package com.ject.studytrip.member.fixture; -import com.ject.studytrip.member.domain.entity.Member; -import com.ject.studytrip.member.domain.entity.MemberCategory; -import com.ject.studytrip.member.domain.entity.MemberRole; -import com.ject.studytrip.member.domain.entity.SocialProvider; +import com.ject.studytrip.member.domain.model.Member; +import com.ject.studytrip.member.domain.model.MemberCategory; +import com.ject.studytrip.member.domain.model.MemberRole; +import com.ject.studytrip.member.domain.model.SocialProvider; import org.springframework.test.util.ReflectionTestUtils; public class MemberFixture { diff --git a/src/test/java/com/ject/studytrip/member/helper/MemberTestHelper.java b/src/test/java/com/ject/studytrip/member/helper/MemberTestHelper.java index 5835a39..4f3648c 100644 --- a/src/test/java/com/ject/studytrip/member/helper/MemberTestHelper.java +++ b/src/test/java/com/ject/studytrip/member/helper/MemberTestHelper.java @@ -1,6 +1,6 @@ package com.ject.studytrip.member.helper; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.member.domain.repository.MemberRepository; import com.ject.studytrip.member.fixture.MemberFixture; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/ject/studytrip/stamp/application/service/StampServiceTest.java b/src/test/java/com/ject/studytrip/stamp/application/service/StampServiceTest.java index 9adda95..8d303c1 100644 --- a/src/test/java/com/ject/studytrip/stamp/application/service/StampServiceTest.java +++ b/src/test/java/com/ject/studytrip/stamp/application/service/StampServiceTest.java @@ -9,7 +9,7 @@ import com.ject.studytrip.BaseUnitTest; import com.ject.studytrip.global.exception.CustomException; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.member.fixture.MemberFixture; import com.ject.studytrip.stamp.domain.error.StampErrorCode; import com.ject.studytrip.stamp.domain.factory.StampFactory; diff --git a/src/test/java/com/ject/studytrip/trip/application/service/TripServiceTest.java b/src/test/java/com/ject/studytrip/trip/application/service/TripServiceTest.java index df83d78..c3dd8c5 100644 --- a/src/test/java/com/ject/studytrip/trip/application/service/TripServiceTest.java +++ b/src/test/java/com/ject/studytrip/trip/application/service/TripServiceTest.java @@ -7,7 +7,7 @@ import com.ject.studytrip.BaseUnitTest; import com.ject.studytrip.global.exception.CustomException; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.member.fixture.MemberFixture; import com.ject.studytrip.trip.domain.error.TripErrorCode; import com.ject.studytrip.trip.domain.model.Trip; diff --git a/src/test/java/com/ject/studytrip/trip/fixture/TripFixture.java b/src/test/java/com/ject/studytrip/trip/fixture/TripFixture.java index 30bd278..e8900b4 100644 --- a/src/test/java/com/ject/studytrip/trip/fixture/TripFixture.java +++ b/src/test/java/com/ject/studytrip/trip/fixture/TripFixture.java @@ -1,6 +1,6 @@ package com.ject.studytrip.trip.fixture; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.trip.domain.factory.TripFactory; import com.ject.studytrip.trip.domain.model.Trip; import com.ject.studytrip.trip.domain.model.TripCategory; diff --git a/src/test/java/com/ject/studytrip/trip/helper/TripTestHelper.java b/src/test/java/com/ject/studytrip/trip/helper/TripTestHelper.java index ac8fabf..7d1e790 100644 --- a/src/test/java/com/ject/studytrip/trip/helper/TripTestHelper.java +++ b/src/test/java/com/ject/studytrip/trip/helper/TripTestHelper.java @@ -1,6 +1,6 @@ package com.ject.studytrip.trip.helper; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.trip.domain.model.Trip; import com.ject.studytrip.trip.domain.model.TripCategory; import com.ject.studytrip.trip.domain.repository.TripRepository; diff --git a/src/test/java/com/ject/studytrip/trip/presentation/controller/TripControllerIntegrationTest.java b/src/test/java/com/ject/studytrip/trip/presentation/controller/TripControllerIntegrationTest.java index 8b925c8..67eee71 100644 --- a/src/test/java/com/ject/studytrip/trip/presentation/controller/TripControllerIntegrationTest.java +++ b/src/test/java/com/ject/studytrip/trip/presentation/controller/TripControllerIntegrationTest.java @@ -10,7 +10,7 @@ import com.ject.studytrip.auth.helper.TokenTestHelper; import com.ject.studytrip.global.common.response.StandardResponse; import com.ject.studytrip.global.exception.error.CommonErrorCode; -import com.ject.studytrip.member.domain.entity.Member; +import com.ject.studytrip.member.domain.model.Member; import com.ject.studytrip.member.helper.MemberTestHelper; import com.ject.studytrip.stamp.domain.error.StampErrorCode; import com.ject.studytrip.stamp.fixture.CreateStampRequestFixture;