Merge pull request #23 from f-lab-edu/feature/21

[#21] member 패키지 생성 리팩토링
f-lab-edu · Jun 19, 2023 · 13f4b70 · 13f4b70
2 parents 75cc28d + 9e3bbeb
commit 13f4b70
Show file tree

Hide file tree

Showing 28 changed files with 65 additions and 54 deletions.
diff --git a/src/main/java/com/flab/goodchoice/coupon/application/CouponUseHistoryQuery.java b/src/main/java/com/flab/goodchoice/coupon/application/CouponUseHistoryQuery.java
@@ -2,7 +2,7 @@
 
 import com.flab.goodchoice.coupon.domain.Coupon;
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
-import com.flab.goodchoice.coupon.domain.Member;
+import com.flab.goodchoice.member.domain.model.Member;
 
 public interface CouponUseHistoryQuery {
     CouponUseHistory findByMemberIdAndCouponEntityId(Member member, Coupon coupon);

diff --git a/src/main/java/com/flab/goodchoice/coupon/application/CouponUseService.java b/src/main/java/com/flab/goodchoice/coupon/application/CouponUseService.java
@@ -8,6 +8,8 @@
 import com.flab.goodchoice.coupon.exception.CouponError;
 import com.flab.goodchoice.coupon.exception.CouponException;
 import com.flab.goodchoice.coupon.infrastructure.repositories.AppliedUserRepository;
+import com.flab.goodchoice.member.application.MemberQuery;
+import com.flab.goodchoice.member.domain.model.Member;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/src/main/java/com/flab/goodchoice/coupon/application/MemberCommand.java b/src/main/java/com/flab/goodchoice/coupon/application/MemberCommand.java
diff --git a/src/main/java/com/flab/goodchoice/coupon/application/MemberQuery.java b/src/main/java/com/flab/goodchoice/coupon/application/MemberQuery.java
diff --git a/src/main/java/com/flab/goodchoice/coupon/domain/CouponPublish.java b/src/main/java/com/flab/goodchoice/coupon/domain/CouponPublish.java
@@ -1,5 +1,6 @@
 package com.flab.goodchoice.coupon.domain;
 
+import com.flab.goodchoice.member.domain.model.Member;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/flab/goodchoice/coupon/domain/CouponUseHistory.java b/src/main/java/com/flab/goodchoice/coupon/domain/CouponUseHistory.java
@@ -1,5 +1,6 @@
 package com.flab.goodchoice.coupon.domain;
 
+import com.flab.goodchoice.member.domain.model.Member;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponPublishCommandImpl.java b/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponPublishCommandImpl.java
@@ -4,7 +4,7 @@
 import com.flab.goodchoice.coupon.domain.CouponPublish;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponEntity;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponPublishEntity;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponPublishRepository;
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponUseHistoryCommandImpl.java b/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponUseHistoryCommandImpl.java
@@ -4,7 +4,7 @@
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponEntity;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponUseHistoryEntity;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponUseHistoryRepository;
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponUseHistoryQueryImpl.java b/src/main/java/com/flab/goodchoice/coupon/infrastructure/CouponUseHistoryQueryImpl.java
@@ -3,7 +3,7 @@
 import com.flab.goodchoice.coupon.application.CouponUseHistoryQuery;
 import com.flab.goodchoice.coupon.domain.Coupon;
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
-import com.flab.goodchoice.coupon.domain.Member;
+import com.flab.goodchoice.member.domain.model.Member;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponUseHistoryEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponUseHistoryRepository;
 import org.springframework.stereotype.Component;

diff --git a/src/main/java/com/flab/goodchoice/coupon/infrastructure/entity/CouponPublishEntity.java b/src/main/java/com/flab/goodchoice/coupon/infrastructure/entity/CouponPublishEntity.java
@@ -1,6 +1,7 @@
 package com.flab.goodchoice.coupon.infrastructure.entity;
 
 import com.flab.goodchoice.coupon.domain.CouponPublish;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/flab/goodchoice/coupon/infrastructure/entity/CouponUseHistoryEntity.java b/src/main/java/com/flab/goodchoice/coupon/infrastructure/entity/CouponUseHistoryEntity.java
@@ -2,6 +2,7 @@
 
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
 import com.flab.goodchoice.coupon.domain.UseState;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/main/java/com/flab/goodchoice/member/application/MemberCommand.java b/src/main/java/com/flab/goodchoice/member/application/MemberCommand.java
@@ -0,0 +1,7 @@
+package com.flab.goodchoice.member.application;
+
+import com.flab.goodchoice.member.domain.model.Member;
+
+public interface MemberCommand {
+    Member save(Member member);
+}
diff --git a/src/main/java/com/flab/goodchoice/member/application/MemberQuery.java b/src/main/java/com/flab/goodchoice/member/application/MemberQuery.java
@@ -0,0 +1,7 @@
+package com.flab.goodchoice.member.application;
+
+import com.flab.goodchoice.member.domain.model.Member;
+
+public interface MemberQuery {
+    Member findById(Long memberId);
+}
diff --git a/...flab/goodchoice/coupon/domain/Member.java → ...oodchoice/member/domain/model/Member.java b/...flab/goodchoice/coupon/domain/Member.java → ...oodchoice/member/domain/model/Member.java
@@ -1,4 +1,4 @@
-package com.flab.goodchoice.coupon.domain;
+package com.flab.goodchoice.member.domain.model;
 
 import lombok.AccessLevel;
 import lombok.Builder;

diff --git a/...ure/repositories/JpaMemberRepository.java → ...ain/repositories/JpaMemberRepository.java b/...ure/repositories/JpaMemberRepository.java → ...ain/repositories/JpaMemberRepository.java
@@ -1,6 +1,6 @@
-package com.flab.goodchoice.coupon.infrastructure.repositories;
+package com.flab.goodchoice.member.domain.repositories;
 
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface JpaMemberRepository extends MemberRepository, JpaRepository<MemberEntity, Long> {

diff --git a/...ucture/repositories/MemberRepository.java → ...domain/repositories/MemberRepository.java b/...ucture/repositories/MemberRepository.java → ...domain/repositories/MemberRepository.java
@@ -1,6 +1,6 @@
-package com.flab.goodchoice.coupon.infrastructure.repositories;
+package com.flab.goodchoice.member.domain.repositories;
 
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 
 import java.util.Optional;
 

diff --git a/...dchoice/coupon/exception/MemberError.java → ...dchoice/member/exception/MemberError.java b/...dchoice/coupon/exception/MemberError.java → ...dchoice/member/exception/MemberError.java
@@ -1,4 +1,4 @@
-package com.flab.goodchoice.coupon.exception;
+package com.flab.goodchoice.member.exception;
 
 import lombok.Getter;
 

diff --git a/...ice/coupon/exception/MemberException.java → ...ice/member/exception/MemberException.java b/...ice/coupon/exception/MemberException.java → ...ice/member/exception/MemberException.java
@@ -1,4 +1,4 @@
-package com.flab.goodchoice.coupon.exception;
+package com.flab.goodchoice.member.exception;
 
 import com.flab.goodchoice.common.exception.BaseException;
 

diff --git a/...pon/infrastructure/MemberCommandImpl.java → ...ber/infrastructure/MemberCommandImpl.java b/...pon/infrastructure/MemberCommandImpl.java → ...ber/infrastructure/MemberCommandImpl.java
@@ -1,9 +1,9 @@
-package com.flab.goodchoice.coupon.infrastructure;
+package com.flab.goodchoice.member.infrastructure;
 
-import com.flab.goodchoice.coupon.application.MemberCommand;
-import com.flab.goodchoice.coupon.domain.Member;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
-import com.flab.goodchoice.coupon.infrastructure.repositories.MemberRepository;
+import com.flab.goodchoice.member.application.MemberCommand;
+import com.flab.goodchoice.member.domain.model.Member;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 import org.springframework.stereotype.Component;
 
 @Component

diff --git a/...oupon/infrastructure/MemberQueryImpl.java → ...ember/infrastructure/MemberQueryImpl.java b/...oupon/infrastructure/MemberQueryImpl.java → ...ember/infrastructure/MemberQueryImpl.java
@@ -1,11 +1,11 @@
-package com.flab.goodchoice.coupon.infrastructure;
+package com.flab.goodchoice.member.infrastructure;
 
-import com.flab.goodchoice.coupon.application.MemberQuery;
-import com.flab.goodchoice.coupon.domain.Member;
-import com.flab.goodchoice.coupon.exception.MemberError;
-import com.flab.goodchoice.coupon.exception.MemberException;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
-import com.flab.goodchoice.coupon.infrastructure.repositories.MemberRepository;
+import com.flab.goodchoice.member.application.MemberQuery;
+import com.flab.goodchoice.member.domain.model.Member;
+import com.flab.goodchoice.member.exception.MemberError;
+import com.flab.goodchoice.member.exception.MemberException;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 import org.springframework.stereotype.Component;
 
 @Component

diff --git a/...n/infrastructure/entity/MemberEntity.java → ...r/infrastructure/entity/MemberEntity.java b/...n/infrastructure/entity/MemberEntity.java → ...r/infrastructure/entity/MemberEntity.java
@@ -1,6 +1,6 @@
-package com.flab.goodchoice.coupon.infrastructure.entity;
+package com.flab.goodchoice.member.infrastructure.entity;
 
-import com.flab.goodchoice.coupon.domain.Member;
+import com.flab.goodchoice.member.domain.model.Member;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;

diff --git a/src/test/java/com/flab/goodchoice/coupon/application/CouponUseServiceTest.java b/src/test/java/com/flab/goodchoice/coupon/application/CouponUseServiceTest.java
@@ -5,10 +5,14 @@
 import com.flab.goodchoice.coupon.dto.CouponUsedInfoResponse;
 import com.flab.goodchoice.coupon.dto.MemberSpecificCouponResponse;
 import com.flab.goodchoice.coupon.exception.CouponException;
-import com.flab.goodchoice.coupon.exception.MemberException;
+import com.flab.goodchoice.member.exception.MemberException;
 import com.flab.goodchoice.coupon.infrastructure.*;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.*;
+import com.flab.goodchoice.member.application.MemberCommand;
+import com.flab.goodchoice.member.application.MemberQuery;
+import com.flab.goodchoice.member.domain.model.Member;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponPublishCommand.java b/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponPublishCommand.java
@@ -4,7 +4,7 @@
 import com.flab.goodchoice.coupon.domain.CouponPublish;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponEntity;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponPublishEntity;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponPublishRepository;
 
 public class FakeCouponPublishCommand implements CouponPublishCommand {

diff --git a/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponUseHistoryCommand.java b/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponUseHistoryCommand.java
@@ -4,7 +4,7 @@
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponEntity;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponUseHistoryEntity;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponUseHistoryRepository;
 
 public class FakeCouponUseHistoryCommand implements CouponUseHistoryCommand {

diff --git a/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponUseHistoryQuery.java b/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeCouponUseHistoryQuery.java
@@ -3,7 +3,7 @@
 import com.flab.goodchoice.coupon.application.CouponUseHistoryQuery;
 import com.flab.goodchoice.coupon.domain.Coupon;
 import com.flab.goodchoice.coupon.domain.CouponUseHistory;
-import com.flab.goodchoice.coupon.domain.Member;
+import com.flab.goodchoice.member.domain.model.Member;
 import com.flab.goodchoice.coupon.infrastructure.entity.CouponUseHistoryEntity;
 import com.flab.goodchoice.coupon.infrastructure.repositories.CouponUseHistoryRepository;
 

diff --git a/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeMemberCommand.java b/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeMemberCommand.java
@@ -1,9 +1,9 @@
 package com.flab.goodchoice.coupon.infrastructure;
 
-import com.flab.goodchoice.coupon.application.MemberCommand;
-import com.flab.goodchoice.coupon.domain.Member;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
-import com.flab.goodchoice.coupon.infrastructure.repositories.MemberRepository;
+import com.flab.goodchoice.member.application.MemberCommand;
+import com.flab.goodchoice.member.domain.model.Member;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 
 public class FakeMemberCommand implements MemberCommand {
 

diff --git a/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeMemberQuery.java b/src/test/java/com/flab/goodchoice/coupon/infrastructure/FakeMemberQuery.java
@@ -1,11 +1,11 @@
 package com.flab.goodchoice.coupon.infrastructure;
 
-import com.flab.goodchoice.coupon.application.MemberQuery;
-import com.flab.goodchoice.coupon.domain.Member;
-import com.flab.goodchoice.coupon.exception.MemberError;
-import com.flab.goodchoice.coupon.exception.MemberException;
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
-import com.flab.goodchoice.coupon.infrastructure.repositories.MemberRepository;
+import com.flab.goodchoice.member.application.MemberQuery;
+import com.flab.goodchoice.member.domain.model.Member;
+import com.flab.goodchoice.member.exception.MemberError;
+import com.flab.goodchoice.member.exception.MemberException;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 
 public class FakeMemberQuery implements MemberQuery {
 

diff --git a/...java/com/flab/goodchoice/coupon/infrastructure/repositories/InMemoryMemberRepository.java b/...java/com/flab/goodchoice/coupon/infrastructure/repositories/InMemoryMemberRepository.java
@@ -1,6 +1,7 @@
 package com.flab.goodchoice.coupon.infrastructure.repositories;
 
-import com.flab.goodchoice.coupon.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.infrastructure.entity.MemberEntity;
+import com.flab.goodchoice.member.domain.repositories.MemberRepository;
 
 import java.util.HashMap;
 import java.util.Map;