From 28a35212536d078e82e30e5b72f2444f1de47f43 Mon Sep 17 00:00:00 2001 From: hseong3243 Date: Sun, 28 Apr 2024 19:54:28 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20hub,=20hubmember=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=EB=A5=BC=20=ED=95=98=EB=82=98=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{hubMember => hub}/repository/HubMemberEntity.java | 4 +--- .../repository/HubMemberJpaRepository.java | 10 +++++----- .../repository/HubMemberRepositoryImpl.java | 4 ++-- .../{hubMember => hub/repository}/HubMemberRole.java | 2 +- .../domain/hub/repository/HubRepositoryImpl.java | 2 -- .../service/HubMemberRepository.java | 2 +- .../shoutlink/domain/link/service/LinkService.java | 2 +- .../domain/linkbundle/service/LinkBundleService.java | 2 +- .../hubmember/repository/StubHubMemberRepository.java | 2 +- 9 files changed, 13 insertions(+), 17 deletions(-) rename src/main/java/com/seong/shoutlink/domain/{hubMember => hub}/repository/HubMemberEntity.java (90%) rename src/main/java/com/seong/shoutlink/domain/{hubMember => hub}/repository/HubMemberJpaRepository.java (88%) rename src/main/java/com/seong/shoutlink/domain/{hubMember => hub}/repository/HubMemberRepositoryImpl.java (71%) rename src/main/java/com/seong/shoutlink/domain/{hubMember => hub/repository}/HubMemberRole.java (52%) rename src/main/java/com/seong/shoutlink/domain/{hubMember => hub}/service/HubMemberRepository.java (77%) diff --git a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberEntity.java b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberEntity.java similarity index 90% rename from src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberEntity.java rename to src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberEntity.java index 2e86dc8..2ae12f2 100644 --- a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberEntity.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberEntity.java @@ -1,9 +1,7 @@ -package com.seong.shoutlink.domain.hubmember.repository; +package com.seong.shoutlink.domain.hub.repository; import com.seong.shoutlink.domain.common.BaseEntity; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.hub.repository.HubEntity; -import com.seong.shoutlink.domain.hubmember.HubMemberRole; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberJpaRepository.java b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberJpaRepository.java similarity index 88% rename from src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberJpaRepository.java rename to src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberJpaRepository.java index d3c6dd3..e152c6e 100644 --- a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberJpaRepository.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberJpaRepository.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.hubmember.repository; +package com.seong.shoutlink.domain.hub.repository; import java.util.List; import java.util.Optional; @@ -13,24 +13,24 @@ public interface HubMemberJpaRepository extends JpaRepository findHubWithMaster(@Param("hubId") Long hubId); @Query("select hm from HubMemberEntity hm " + "join fetch hm.hubEntity h " - + "where hm.hubMemberRole = com.seong.shoutlink.domain.hubmember.HubMemberRole.MASTER") + + "where hm.hubMemberRole = com.seong.shoutlink.domain.hub.repository.HubMemberRole.MASTER") Page findHubs(PageRequest pageRequest); @Query("select hm from HubMemberEntity hm " + "join fetch hm.hubEntity h " + "where hm.memberId=:memberId " - + "and hm.hubMemberRole = com.seong.shoutlink.domain.hubmember.HubMemberRole.MASTER") + + "and hm.hubMemberRole = com.seong.shoutlink.domain.hub.repository.HubMemberRole.MASTER") Page findMemberHubs(@Param("memberId") Long memberId, PageRequest pageRequest); @Query("select hm from HubTagEntity t " + "join HubMemberEntity hm on hm.hubEntity.hubId = t.hubId " + "join fetch hm.hubEntity " + "where t.tagId in :tagIds " - + "and hm.hubMemberRole = com.seong.shoutlink.domain.hubmember.HubMemberRole.MASTER") + + "and hm.hubMemberRole = com.seong.shoutlink.domain.hub.repository.HubMemberRole.MASTER") Page findHubsContainsTagIds(@Param("tagIds") List tagIds, PageRequest pageRequest); } diff --git a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberRepositoryImpl.java b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRepositoryImpl.java similarity index 71% rename from src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberRepositoryImpl.java rename to src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRepositoryImpl.java index d1fa21d..6454070 100644 --- a/src/main/java/com/seong/shoutlink/domain/hubMember/repository/HubMemberRepositoryImpl.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.seong.shoutlink.domain.hubmember.repository; +package com.seong.shoutlink.domain.hub.repository; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.hubmember.service.HubMemberRepository; +import com.seong.shoutlink.domain.hub.service.HubMemberRepository; import com.seong.shoutlink.domain.member.Member; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/seong/shoutlink/domain/hubMember/HubMemberRole.java b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRole.java similarity index 52% rename from src/main/java/com/seong/shoutlink/domain/hubMember/HubMemberRole.java rename to src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRole.java index 3ac2677..bce4b3e 100644 --- a/src/main/java/com/seong/shoutlink/domain/hubMember/HubMemberRole.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubMemberRole.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.hubmember; +package com.seong.shoutlink.domain.hub.repository; public enum HubMemberRole { MASTER, PARTICIPANTS diff --git a/src/main/java/com/seong/shoutlink/domain/hub/repository/HubRepositoryImpl.java b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubRepositoryImpl.java index a4504d9..03d7ff6 100644 --- a/src/main/java/com/seong/shoutlink/domain/hub/repository/HubRepositoryImpl.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/repository/HubRepositoryImpl.java @@ -5,8 +5,6 @@ import com.seong.shoutlink.domain.hub.service.HubRepository; import com.seong.shoutlink.domain.hub.service.result.HubPaginationResult; import com.seong.shoutlink.domain.hub.service.result.TagResult; -import com.seong.shoutlink.domain.hubmember.repository.HubMemberEntity; -import com.seong.shoutlink.domain.hubmember.repository.HubMemberJpaRepository; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.repository.MemberJpaRepository; import java.util.List; diff --git a/src/main/java/com/seong/shoutlink/domain/hubMember/service/HubMemberRepository.java b/src/main/java/com/seong/shoutlink/domain/hub/service/HubMemberRepository.java similarity index 77% rename from src/main/java/com/seong/shoutlink/domain/hubMember/service/HubMemberRepository.java rename to src/main/java/com/seong/shoutlink/domain/hub/service/HubMemberRepository.java index 3c81756..0baf0dc 100644 --- a/src/main/java/com/seong/shoutlink/domain/hubMember/service/HubMemberRepository.java +++ b/src/main/java/com/seong/shoutlink/domain/hub/service/HubMemberRepository.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.hubmember.service; +package com.seong.shoutlink.domain.hub.service; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.member.Member; diff --git a/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java index 72ea437..a86a510 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java @@ -5,7 +5,7 @@ import com.seong.shoutlink.domain.exception.ShoutLinkException; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.hub.service.HubRepository; -import com.seong.shoutlink.domain.hubmember.service.HubMemberRepository; +import com.seong.shoutlink.domain.hub.service.HubMemberRepository; import com.seong.shoutlink.domain.link.Link; import com.seong.shoutlink.domain.link.LinkWithLinkBundle; import com.seong.shoutlink.domain.link.service.event.CreateHubLinkEvent; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java b/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java index fdd88f7..f212fd2 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java +++ b/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java @@ -4,7 +4,7 @@ import com.seong.shoutlink.domain.exception.ShoutLinkException; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.hub.service.HubRepository; -import com.seong.shoutlink.domain.hubmember.service.HubMemberRepository; +import com.seong.shoutlink.domain.hub.service.HubMemberRepository; import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; import com.seong.shoutlink.domain.linkbundle.LinkBundle; import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; diff --git a/src/test/java/com/seong/shoutlink/domain/hubmember/repository/StubHubMemberRepository.java b/src/test/java/com/seong/shoutlink/domain/hubmember/repository/StubHubMemberRepository.java index bb7867a..a99eece 100644 --- a/src/test/java/com/seong/shoutlink/domain/hubmember/repository/StubHubMemberRepository.java +++ b/src/test/java/com/seong/shoutlink/domain/hubmember/repository/StubHubMemberRepository.java @@ -1,7 +1,7 @@ package com.seong.shoutlink.domain.hubmember.repository; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.hubmember.service.HubMemberRepository; +import com.seong.shoutlink.domain.hub.service.HubMemberRepository; import com.seong.shoutlink.domain.member.Member; import java.util.Arrays; import java.util.HashMap; From 5b2fbd80eb024f458110ac1c7731c3f86a88430a Mon Sep 17 00:00:00 2001 From: hseong3243 Date: Sun, 28 Apr 2024 19:56:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20linkbundle,=20link=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=EB=A5=BC=20=ED=95=98=EB=82=98=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{linkbundle => link}/HubLinkBundle.java | 2 +- .../{linkbundle => link}/LinkBundle.java | 2 +- .../domain/link/LinkBundleAndLinks.java | 2 -- .../domain/link/LinkWithLinkBundle.java | 1 - .../MemberLinkBundle.java | 2 +- .../controller/LinkBundleController.java | 18 ++++++++--------- .../request/CreateLinkBundleRequest.java | 2 +- .../repository/HubLinkBundleEntity.java | 2 +- .../repository/LinkBundleEntity.java | 8 ++++---- .../repository/LinkBundleJpaRepository.java | 2 +- .../repository/LinkBundleRepositoryImpl.java | 10 +++++----- .../domain/link/repository/LinkEntity.java | 2 +- .../link/repository/LinkRepositoryImpl.java | 2 +- .../repository/MemberLinkBundleEntity.java | 2 +- .../service/LinkBundleRepository.java | 8 ++++---- .../service/LinkBundleService.java | 20 +++++++++---------- .../link/service/LinkBundleUseCase.java | 19 ++++++++++++++++++ .../domain/link/service/LinkRepository.java | 2 +- .../domain/link/service/LinkService.java | 3 +-- .../request/CreateHubLinkBundleCommand.java | 2 +- .../request/FindHubLinkBundlesCommand.java | 2 +- .../request/FindLinkBundlesCommand.java | 5 +++++ .../response/CreateLinkBundleCommand.java | 2 +- .../response/CreateLinkBundleResponse.java | 2 +- .../response/FindLinkBundleResponse.java | 4 ++-- .../response/FindLinkBundlesResponse.java | 4 ++-- .../linkbundle/service/LinkBundleUseCase.java | 19 ------------------ .../request/FindLinkBundlesCommand.java | 5 ----- .../domain/tag/service/TagService.java | 4 ++-- .../service/ai/GenerateAutoTagCommand.java | 2 +- .../shoutlink/global/config/EventConfig.java | 2 +- .../global/event/LinkBundleEventListener.java | 6 +++--- .../shoutlink/base/BaseControllerTest.java | 2 +- .../link/repository/StubLinkRepository.java | 2 +- .../domain/link/service/LinkServiceTest.java | 2 +- .../controller/LinkBundleControllerTest.java | 8 ++++---- .../repository/StubLinkBundleRepository.java | 8 ++++---- .../service/LinkBundleServiceTest.java | 17 ++++++++-------- .../shoutlink/fixture/LinkBundleFixture.java | 2 +- .../global/client/GeminiClientTest.java | 2 +- .../global/event/DomainEventListenerTest.java | 8 ++++---- .../event/LinkBundleEventListenerTest.java | 2 +- 42 files changed, 109 insertions(+), 112 deletions(-) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/HubLinkBundle.java (86%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/LinkBundle.java (91%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/MemberLinkBundle.java (87%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/controller/LinkBundleController.java (77%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/controller/request/CreateLinkBundleRequest.java (82%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/repository/HubLinkBundleEntity.java (90%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/repository/LinkBundleEntity.java (89%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/repository/LinkBundleJpaRepository.java (96%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/repository/LinkBundleRepositoryImpl.java (87%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/repository/MemberLinkBundleEntity.java (91%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/LinkBundleRepository.java (73%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/LinkBundleService.java (83%) create mode 100644 src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleUseCase.java rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/request/CreateHubLinkBundleCommand.java (67%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/request/FindHubLinkBundlesCommand.java (67%) create mode 100644 src/main/java/com/seong/shoutlink/domain/link/service/request/FindLinkBundlesCommand.java rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/response/CreateLinkBundleCommand.java (60%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/response/CreateLinkBundleResponse.java (50%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/response/FindLinkBundleResponse.java (74%) rename src/main/java/com/seong/shoutlink/domain/{linkbundle => link}/service/response/FindLinkBundlesResponse.java (76%) delete mode 100644 src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleUseCase.java delete mode 100644 src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindLinkBundlesCommand.java diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/HubLinkBundle.java b/src/main/java/com/seong/shoutlink/domain/link/HubLinkBundle.java similarity index 86% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/HubLinkBundle.java rename to src/main/java/com/seong/shoutlink/domain/link/HubLinkBundle.java index c9404bb..8b88a48 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/HubLinkBundle.java +++ b/src/main/java/com/seong/shoutlink/domain/link/HubLinkBundle.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle; +package com.seong.shoutlink.domain.link; import com.seong.shoutlink.domain.hub.Hub; import lombok.Getter; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/LinkBundle.java b/src/main/java/com/seong/shoutlink/domain/link/LinkBundle.java similarity index 91% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/LinkBundle.java rename to src/main/java/com/seong/shoutlink/domain/link/LinkBundle.java index 76ce248..2ac3de0 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/LinkBundle.java +++ b/src/main/java/com/seong/shoutlink/domain/link/LinkBundle.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle; +package com.seong.shoutlink.domain.link; import lombok.Getter; diff --git a/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLinks.java b/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLinks.java index b74e2b0..45903c9 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLinks.java +++ b/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLinks.java @@ -1,7 +1,5 @@ package com.seong.shoutlink.domain.link; -import com.seong.shoutlink.domain.link.Link; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; import java.util.List; import lombok.Getter; diff --git a/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java b/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java index 40516b3..000cd27 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java +++ b/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java @@ -1,6 +1,5 @@ package com.seong.shoutlink.domain.link; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; import lombok.Getter; @Getter diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/MemberLinkBundle.java b/src/main/java/com/seong/shoutlink/domain/link/MemberLinkBundle.java similarity index 87% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/MemberLinkBundle.java rename to src/main/java/com/seong/shoutlink/domain/link/MemberLinkBundle.java index 64e216a..17e53db 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/MemberLinkBundle.java +++ b/src/main/java/com/seong/shoutlink/domain/link/MemberLinkBundle.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle; +package com.seong.shoutlink.domain.link; import com.seong.shoutlink.domain.member.Member; import lombok.Getter; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleController.java b/src/main/java/com/seong/shoutlink/domain/link/controller/LinkBundleController.java similarity index 77% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleController.java rename to src/main/java/com/seong/shoutlink/domain/link/controller/LinkBundleController.java index f1ec500..3004ff3 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleController.java +++ b/src/main/java/com/seong/shoutlink/domain/link/controller/LinkBundleController.java @@ -1,15 +1,15 @@ -package com.seong.shoutlink.domain.linkbundle.controller; +package com.seong.shoutlink.domain.link.controller; import com.seong.shoutlink.domain.auth.LoginUser; import com.seong.shoutlink.domain.auth.NullableUser; -import com.seong.shoutlink.domain.linkbundle.controller.request.CreateLinkBundleRequest; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleUseCase; -import com.seong.shoutlink.domain.linkbundle.service.request.CreateHubLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindHubLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundlesResponse; +import com.seong.shoutlink.domain.link.controller.request.CreateLinkBundleRequest; +import com.seong.shoutlink.domain.link.service.LinkBundleUseCase; +import com.seong.shoutlink.domain.link.service.request.CreateHubLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.request.FindHubLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.request.FindLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundlesResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/controller/request/CreateLinkBundleRequest.java b/src/main/java/com/seong/shoutlink/domain/link/controller/request/CreateLinkBundleRequest.java similarity index 82% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/controller/request/CreateLinkBundleRequest.java rename to src/main/java/com/seong/shoutlink/domain/link/controller/request/CreateLinkBundleRequest.java index 8292aec..4a91d38 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/controller/request/CreateLinkBundleRequest.java +++ b/src/main/java/com/seong/shoutlink/domain/link/controller/request/CreateLinkBundleRequest.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.controller.request; +package com.seong.shoutlink.domain.link.controller.request; import java.util.Objects; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/HubLinkBundleEntity.java b/src/main/java/com/seong/shoutlink/domain/link/repository/HubLinkBundleEntity.java similarity index 90% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/repository/HubLinkBundleEntity.java rename to src/main/java/com/seong/shoutlink/domain/link/repository/HubLinkBundleEntity.java index d8f3d79..dd76334 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/HubLinkBundleEntity.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/HubLinkBundleEntity.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.repository; +package com.seong.shoutlink.domain.link.repository; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleEntity.java b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleEntity.java similarity index 89% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleEntity.java rename to src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleEntity.java index 07357ec..cfd5c69 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleEntity.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleEntity.java @@ -1,10 +1,10 @@ -package com.seong.shoutlink.domain.linkbundle.repository; +package com.seong.shoutlink.domain.link.repository; import com.seong.shoutlink.domain.common.BaseEntity; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; +import com.seong.shoutlink.domain.link.HubLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; import com.seong.shoutlink.domain.member.Member; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.Entity; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleJpaRepository.java b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleJpaRepository.java similarity index 96% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleJpaRepository.java rename to src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleJpaRepository.java index ea86b37..12896d0 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleJpaRepository.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleJpaRepository.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.repository; +package com.seong.shoutlink.domain.link.repository; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleRepositoryImpl.java b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleRepositoryImpl.java similarity index 87% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleRepositoryImpl.java rename to src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleRepositoryImpl.java index 57141a8..7d330b5 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/LinkBundleRepositoryImpl.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkBundleRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.seong.shoutlink.domain.linkbundle.repository; +package com.seong.shoutlink.domain.link.repository; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleRepository; +import com.seong.shoutlink.domain.link.HubLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; +import com.seong.shoutlink.domain.link.service.LinkBundleRepository; import com.seong.shoutlink.domain.member.Member; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/seong/shoutlink/domain/link/repository/LinkEntity.java b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkEntity.java index 8ce3d92..e5b4fcf 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/repository/LinkEntity.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkEntity.java @@ -4,7 +4,7 @@ import com.seong.shoutlink.domain.domain.Domain; import com.seong.shoutlink.domain.link.Link; import com.seong.shoutlink.domain.link.LinkWithLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/seong/shoutlink/domain/link/repository/LinkRepositoryImpl.java b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkRepositoryImpl.java index 446df7a..ad9c5de 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/repository/LinkRepositoryImpl.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/LinkRepositoryImpl.java @@ -6,7 +6,7 @@ import com.seong.shoutlink.domain.link.LinkWithLinkBundle; import com.seong.shoutlink.domain.link.service.LinkRepository; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.member.Member; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/MemberLinkBundleEntity.java b/src/main/java/com/seong/shoutlink/domain/link/repository/MemberLinkBundleEntity.java similarity index 91% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/repository/MemberLinkBundleEntity.java rename to src/main/java/com/seong/shoutlink/domain/link/repository/MemberLinkBundleEntity.java index 435ee18..f21281c 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/repository/MemberLinkBundleEntity.java +++ b/src/main/java/com/seong/shoutlink/domain/link/repository/MemberLinkBundleEntity.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.repository; +package com.seong.shoutlink.domain.link.repository; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleRepository.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleRepository.java similarity index 73% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleRepository.java rename to src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleRepository.java index 4755b50..d5a1b79 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleRepository.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleRepository.java @@ -1,9 +1,9 @@ -package com.seong.shoutlink.domain.linkbundle.service; +package com.seong.shoutlink.domain.link.service; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; +import com.seong.shoutlink.domain.link.HubLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; import com.seong.shoutlink.domain.member.Member; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleService.java similarity index 83% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java rename to src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleService.java index f212fd2..fa8133b 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleService.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleService.java @@ -1,19 +1,19 @@ -package com.seong.shoutlink.domain.linkbundle.service; +package com.seong.shoutlink.domain.link.service; import com.seong.shoutlink.domain.exception.ErrorCode; import com.seong.shoutlink.domain.exception.ShoutLinkException; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.hub.service.HubRepository; import com.seong.shoutlink.domain.hub.service.HubMemberRepository; -import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; -import com.seong.shoutlink.domain.linkbundle.service.request.CreateHubLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindHubLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundlesResponse; +import com.seong.shoutlink.domain.link.HubLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; +import com.seong.shoutlink.domain.link.service.request.CreateHubLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.request.FindHubLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.request.FindLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundlesResponse; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.service.MemberRepository; import jakarta.annotation.Nullable; diff --git a/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleUseCase.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleUseCase.java new file mode 100644 index 0000000..d915eda --- /dev/null +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkBundleUseCase.java @@ -0,0 +1,19 @@ +package com.seong.shoutlink.domain.link.service; + +import com.seong.shoutlink.domain.link.service.request.CreateHubLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.request.FindHubLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.request.FindLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundlesResponse; + +public interface LinkBundleUseCase { + + CreateLinkBundleResponse createLinkBundle(CreateLinkBundleCommand command); + + FindLinkBundlesResponse findLinkBundles(FindLinkBundlesCommand command); + + CreateLinkBundleResponse createHubLinkBundle(CreateHubLinkBundleCommand command); + + FindLinkBundlesResponse findHubLinkBundles(FindHubLinkBundlesCommand command); +} diff --git a/src/main/java/com/seong/shoutlink/domain/link/service/LinkRepository.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkRepository.java index 7af98d1..8651ba5 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/service/LinkRepository.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkRepository.java @@ -5,7 +5,7 @@ import com.seong.shoutlink.domain.link.Link; import com.seong.shoutlink.domain.link.LinkWithLinkBundle; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.member.Member; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java b/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java index a86a510..443ce4d 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/LinkService.java @@ -21,8 +21,7 @@ import com.seong.shoutlink.domain.link.service.response.DeleteLinkResponse; import com.seong.shoutlink.domain.link.service.response.FindLinksResponse; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleRepository; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.service.MemberRepository; import jakarta.annotation.Nullable; diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/CreateHubLinkBundleCommand.java b/src/main/java/com/seong/shoutlink/domain/link/service/request/CreateHubLinkBundleCommand.java similarity index 67% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/CreateHubLinkBundleCommand.java rename to src/main/java/com/seong/shoutlink/domain/link/service/request/CreateHubLinkBundleCommand.java index 32ba7e8..3ed6ca7 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/CreateHubLinkBundleCommand.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/request/CreateHubLinkBundleCommand.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.service.request; +package com.seong.shoutlink.domain.link.service.request; public record CreateHubLinkBundleCommand( Long hubId, diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindHubLinkBundlesCommand.java b/src/main/java/com/seong/shoutlink/domain/link/service/request/FindHubLinkBundlesCommand.java similarity index 67% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindHubLinkBundlesCommand.java rename to src/main/java/com/seong/shoutlink/domain/link/service/request/FindHubLinkBundlesCommand.java index 85bc57b..6293240 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindHubLinkBundlesCommand.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/request/FindHubLinkBundlesCommand.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.service.request; +package com.seong.shoutlink.domain.link.service.request; import jakarta.annotation.Nullable; diff --git a/src/main/java/com/seong/shoutlink/domain/link/service/request/FindLinkBundlesCommand.java b/src/main/java/com/seong/shoutlink/domain/link/service/request/FindLinkBundlesCommand.java new file mode 100644 index 0000000..1c44a67 --- /dev/null +++ b/src/main/java/com/seong/shoutlink/domain/link/service/request/FindLinkBundlesCommand.java @@ -0,0 +1,5 @@ +package com.seong.shoutlink.domain.link.service.request; + +public record FindLinkBundlesCommand(Long memberId) { + +} diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleCommand.java b/src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleCommand.java similarity index 60% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleCommand.java rename to src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleCommand.java index 3d7ef6f..a6cc072 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleCommand.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleCommand.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.service.response; +package com.seong.shoutlink.domain.link.service.response; public record CreateLinkBundleCommand(Long memberId, String description, boolean isDefault) { diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleResponse.java b/src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleResponse.java similarity index 50% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleResponse.java rename to src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleResponse.java index a3551a3..8cc395b 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/CreateLinkBundleResponse.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/response/CreateLinkBundleResponse.java @@ -1,4 +1,4 @@ -package com.seong.shoutlink.domain.linkbundle.service.response; +package com.seong.shoutlink.domain.link.service.response; public record CreateLinkBundleResponse(Long linkBundleId) { diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundleResponse.java b/src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundleResponse.java similarity index 74% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundleResponse.java rename to src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundleResponse.java index a640f8b..8ffcd87 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundleResponse.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundleResponse.java @@ -1,6 +1,6 @@ -package com.seong.shoutlink.domain.linkbundle.service.response; +package com.seong.shoutlink.domain.link.service.response; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; public record FindLinkBundleResponse( Long linkBundleId, diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundlesResponse.java b/src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundlesResponse.java similarity index 76% rename from src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundlesResponse.java rename to src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundlesResponse.java index b4c0285..ff3edfc 100644 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/response/FindLinkBundlesResponse.java +++ b/src/main/java/com/seong/shoutlink/domain/link/service/response/FindLinkBundlesResponse.java @@ -1,6 +1,6 @@ -package com.seong.shoutlink.domain.linkbundle.service.response; +package com.seong.shoutlink.domain.link.service.response; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import java.util.List; public record FindLinkBundlesResponse(List linkBundles) { diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleUseCase.java b/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleUseCase.java deleted file mode 100644 index e40caf3..0000000 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleUseCase.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.seong.shoutlink.domain.linkbundle.service; - -import com.seong.shoutlink.domain.linkbundle.service.request.CreateHubLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindHubLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundlesResponse; - -public interface LinkBundleUseCase { - - CreateLinkBundleResponse createLinkBundle(CreateLinkBundleCommand command); - - FindLinkBundlesResponse findLinkBundles(FindLinkBundlesCommand command); - - CreateLinkBundleResponse createHubLinkBundle(CreateHubLinkBundleCommand command); - - FindLinkBundlesResponse findHubLinkBundles(FindHubLinkBundlesCommand command); -} diff --git a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindLinkBundlesCommand.java b/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindLinkBundlesCommand.java deleted file mode 100644 index 607e1a6..0000000 --- a/src/main/java/com/seong/shoutlink/domain/linkbundle/service/request/FindLinkBundlesCommand.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.seong.shoutlink.domain.linkbundle.service.request; - -public record FindLinkBundlesCommand(Long memberId) { - -} diff --git a/src/main/java/com/seong/shoutlink/domain/tag/service/TagService.java b/src/main/java/com/seong/shoutlink/domain/tag/service/TagService.java index 0b5a1fa..f08a1cc 100644 --- a/src/main/java/com/seong/shoutlink/domain/tag/service/TagService.java +++ b/src/main/java/com/seong/shoutlink/domain/tag/service/TagService.java @@ -11,8 +11,8 @@ import com.seong.shoutlink.domain.link.LinkBundleAndLinks; import com.seong.shoutlink.domain.link.LinkWithLinkBundle; import com.seong.shoutlink.domain.link.service.LinkRepository; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleRepository; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.service.LinkBundleRepository; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.service.MemberRepository; import com.seong.shoutlink.domain.tag.HubTag; diff --git a/src/main/java/com/seong/shoutlink/domain/tag/service/ai/GenerateAutoTagCommand.java b/src/main/java/com/seong/shoutlink/domain/tag/service/ai/GenerateAutoTagCommand.java index 2981b5f..c3f8f2e 100644 --- a/src/main/java/com/seong/shoutlink/domain/tag/service/ai/GenerateAutoTagCommand.java +++ b/src/main/java/com/seong/shoutlink/domain/tag/service/ai/GenerateAutoTagCommand.java @@ -2,7 +2,7 @@ import com.seong.shoutlink.domain.link.Link; import com.seong.shoutlink.domain.link.LinkBundleAndLinks; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import java.util.List; public record GenerateAutoTagCommand(List linkBundles, int generateTagCount) { diff --git a/src/main/java/com/seong/shoutlink/global/config/EventConfig.java b/src/main/java/com/seong/shoutlink/global/config/EventConfig.java index 3532b55..0e04c32 100644 --- a/src/main/java/com/seong/shoutlink/global/config/EventConfig.java +++ b/src/main/java/com/seong/shoutlink/global/config/EventConfig.java @@ -2,7 +2,7 @@ import com.seong.shoutlink.domain.common.EventPublisher; import com.seong.shoutlink.domain.domain.service.DomainUseCase; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleUseCase; +import com.seong.shoutlink.domain.link.service.LinkBundleUseCase; import com.seong.shoutlink.domain.tag.service.TagUseCase; import com.seong.shoutlink.global.event.DomainEventListener; import com.seong.shoutlink.global.event.LinkBundleEventListener; diff --git a/src/main/java/com/seong/shoutlink/global/event/LinkBundleEventListener.java b/src/main/java/com/seong/shoutlink/global/event/LinkBundleEventListener.java index 86057ee..df4153e 100644 --- a/src/main/java/com/seong/shoutlink/global/event/LinkBundleEventListener.java +++ b/src/main/java/com/seong/shoutlink/global/event/LinkBundleEventListener.java @@ -2,9 +2,9 @@ import com.seong.shoutlink.domain.member.service.event.CreateMemberEvent; import com.seong.shoutlink.domain.hub.service.event.CreateHubEvent; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleUseCase; -import com.seong.shoutlink.domain.linkbundle.service.request.CreateHubLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.LinkBundleUseCase; +import com.seong.shoutlink.domain.link.service.request.CreateHubLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleCommand; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/src/test/java/com/seong/shoutlink/base/BaseControllerTest.java b/src/test/java/com/seong/shoutlink/base/BaseControllerTest.java index 55fe20c..4f8acc2 100644 --- a/src/test/java/com/seong/shoutlink/base/BaseControllerTest.java +++ b/src/test/java/com/seong/shoutlink/base/BaseControllerTest.java @@ -9,7 +9,7 @@ import com.seong.shoutlink.domain.domain.service.DomainService; import com.seong.shoutlink.domain.hub.service.HubService; import com.seong.shoutlink.domain.link.service.LinkService; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleService; +import com.seong.shoutlink.domain.link.service.LinkBundleService; import com.seong.shoutlink.domain.member.MemberRole; import com.seong.shoutlink.domain.member.service.MemberService; import com.seong.shoutlink.fixture.AuthFixture; diff --git a/src/test/java/com/seong/shoutlink/domain/link/repository/StubLinkRepository.java b/src/test/java/com/seong/shoutlink/domain/link/repository/StubLinkRepository.java index 9b1064d..4953065 100644 --- a/src/test/java/com/seong/shoutlink/domain/link/repository/StubLinkRepository.java +++ b/src/test/java/com/seong/shoutlink/domain/link/repository/StubLinkRepository.java @@ -6,7 +6,7 @@ import com.seong.shoutlink.domain.link.LinkWithLinkBundle; import com.seong.shoutlink.domain.link.service.LinkRepository; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.member.Member; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/com/seong/shoutlink/domain/link/service/LinkServiceTest.java b/src/test/java/com/seong/shoutlink/domain/link/service/LinkServiceTest.java index 8498686..25470d2 100644 --- a/src/test/java/com/seong/shoutlink/domain/link/service/LinkServiceTest.java +++ b/src/test/java/com/seong/shoutlink/domain/link/service/LinkServiceTest.java @@ -20,7 +20,7 @@ import com.seong.shoutlink.domain.link.service.response.CreateLinkResponse; import com.seong.shoutlink.domain.link.service.response.DeleteLinkResponse; import com.seong.shoutlink.domain.link.service.response.FindLinksResponse; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.linkbundle.repository.StubLinkBundleRepository; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.MemberRole; diff --git a/src/test/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleControllerTest.java b/src/test/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleControllerTest.java index 86a3c58..38078cf 100644 --- a/src/test/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleControllerTest.java +++ b/src/test/java/com/seong/shoutlink/domain/linkbundle/controller/LinkBundleControllerTest.java @@ -14,10 +14,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.seong.shoutlink.base.BaseControllerTest; -import com.seong.shoutlink.domain.linkbundle.controller.request.CreateLinkBundleRequest; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundlesResponse; +import com.seong.shoutlink.domain.link.controller.request.CreateLinkBundleRequest; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundlesResponse; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/seong/shoutlink/domain/linkbundle/repository/StubLinkBundleRepository.java b/src/test/java/com/seong/shoutlink/domain/linkbundle/repository/StubLinkBundleRepository.java index 5aaf497..1106a9e 100644 --- a/src/test/java/com/seong/shoutlink/domain/linkbundle/repository/StubLinkBundleRepository.java +++ b/src/test/java/com/seong/shoutlink/domain/linkbundle/repository/StubLinkBundleRepository.java @@ -1,10 +1,10 @@ package com.seong.shoutlink.domain.linkbundle.repository; import com.seong.shoutlink.domain.hub.Hub; -import com.seong.shoutlink.domain.linkbundle.HubLinkBundle; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleRepository; +import com.seong.shoutlink.domain.link.HubLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; +import com.seong.shoutlink.domain.link.service.LinkBundleRepository; import com.seong.shoutlink.domain.member.Member; import java.util.HashMap; import java.util.List; diff --git a/src/test/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleServiceTest.java b/src/test/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleServiceTest.java index c7f7f9c..fceb95c 100644 --- a/src/test/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleServiceTest.java +++ b/src/test/java/com/seong/shoutlink/domain/linkbundle/service/LinkBundleServiceTest.java @@ -7,15 +7,16 @@ import com.seong.shoutlink.domain.exception.ShoutLinkException; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.hubmember.repository.StubHubMemberRepository; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.service.LinkBundleService; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.linkbundle.repository.StubLinkBundleRepository; -import com.seong.shoutlink.domain.linkbundle.service.request.CreateHubLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindHubLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.request.FindLinkBundlesCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleCommand; -import com.seong.shoutlink.domain.linkbundle.service.response.CreateLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundleResponse; -import com.seong.shoutlink.domain.linkbundle.service.response.FindLinkBundlesResponse; +import com.seong.shoutlink.domain.link.service.request.CreateHubLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.request.FindHubLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.request.FindLinkBundlesCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleCommand; +import com.seong.shoutlink.domain.link.service.response.CreateLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundleResponse; +import com.seong.shoutlink.domain.link.service.response.FindLinkBundlesResponse; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.MemberRole; import com.seong.shoutlink.domain.member.repository.StubMemberRepository; diff --git a/src/test/java/com/seong/shoutlink/fixture/LinkBundleFixture.java b/src/test/java/com/seong/shoutlink/fixture/LinkBundleFixture.java index c18a127..5e1bafe 100644 --- a/src/test/java/com/seong/shoutlink/fixture/LinkBundleFixture.java +++ b/src/test/java/com/seong/shoutlink/fixture/LinkBundleFixture.java @@ -1,6 +1,6 @@ package com.seong.shoutlink.fixture; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; public final class LinkBundleFixture { diff --git a/src/test/java/com/seong/shoutlink/global/client/GeminiClientTest.java b/src/test/java/com/seong/shoutlink/global/client/GeminiClientTest.java index 995f007..6d9aeba 100644 --- a/src/test/java/com/seong/shoutlink/global/client/GeminiClientTest.java +++ b/src/test/java/com/seong/shoutlink/global/client/GeminiClientTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.seong.shoutlink.domain.link.Link; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; +import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.tag.service.ai.GenerateAutoTagCommand; import com.seong.shoutlink.domain.link.LinkBundleAndLinks; import com.seong.shoutlink.domain.tag.service.ai.GeneratedTag; diff --git a/src/test/java/com/seong/shoutlink/global/event/DomainEventListenerTest.java b/src/test/java/com/seong/shoutlink/global/event/DomainEventListenerTest.java index e3f7c65..6541aa2 100644 --- a/src/test/java/com/seong/shoutlink/global/event/DomainEventListenerTest.java +++ b/src/test/java/com/seong/shoutlink/global/event/DomainEventListenerTest.java @@ -10,10 +10,10 @@ import com.seong.shoutlink.domain.link.service.LinkService; import com.seong.shoutlink.domain.link.service.request.CreateLinkCommand; import com.seong.shoutlink.domain.link.service.response.CreateLinkResponse; -import com.seong.shoutlink.domain.linkbundle.LinkBundle; -import com.seong.shoutlink.domain.linkbundle.MemberLinkBundle; -import com.seong.shoutlink.domain.linkbundle.repository.LinkBundleEntity; -import com.seong.shoutlink.domain.linkbundle.service.LinkBundleRepository; +import com.seong.shoutlink.domain.link.LinkBundle; +import com.seong.shoutlink.domain.link.MemberLinkBundle; +import com.seong.shoutlink.domain.link.repository.LinkBundleEntity; +import com.seong.shoutlink.domain.link.service.LinkBundleRepository; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.service.MemberRepository; import com.seong.shoutlink.fixture.DomainFixture.DomainFixture; diff --git a/src/test/java/com/seong/shoutlink/global/event/LinkBundleEventListenerTest.java b/src/test/java/com/seong/shoutlink/global/event/LinkBundleEventListenerTest.java index c6a1b03..7cef613 100644 --- a/src/test/java/com/seong/shoutlink/global/event/LinkBundleEventListenerTest.java +++ b/src/test/java/com/seong/shoutlink/global/event/LinkBundleEventListenerTest.java @@ -6,7 +6,7 @@ import com.seong.shoutlink.domain.hub.service.HubService; import com.seong.shoutlink.domain.hub.service.request.CreateHubCommand; import com.seong.shoutlink.domain.hub.service.response.CreateHubResponse; -import com.seong.shoutlink.domain.linkbundle.repository.LinkBundleEntity; +import com.seong.shoutlink.domain.link.repository.LinkBundleEntity; import com.seong.shoutlink.domain.member.Member; import com.seong.shoutlink.domain.member.service.MemberRepository; import com.seong.shoutlink.domain.member.service.MemberService;