Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: 도메인 패키지를 연관된 것끼리 뭉칩니다. #103

Merged
merged 2 commits into from
Apr 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -13,24 +13,24 @@ public interface HubMemberJpaRepository extends JpaRepository<HubMemberEntity, L
@Query("select hm from HubMemberEntity hm "
+ "join hm.hubEntity h "
+ "where h.hubId = :hubId "
+ "and hm.hubMemberRole = com.seong.shoutlink.domain.hubmember.HubMemberRole.MASTER")
+ "and hm.hubMemberRole = com.seong.shoutlink.domain.hub.repository.HubMemberRole.MASTER")
Optional<HubMemberEntity> 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<HubMemberEntity> 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<HubMemberEntity> 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<HubMemberEntity> findHubsContainsTagIds(@Param("tagIds") List<Long> tagIds, PageRequest pageRequest);
}
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.seong.shoutlink.domain.hubmember;
package com.seong.shoutlink.domain.hub.repository;

public enum HubMemberRole {
MASTER, PARTICIPANTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.seong.shoutlink.domain.linkbundle;
package com.seong.shoutlink.domain.link;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.seong.shoutlink.domain.link;

import com.seong.shoutlink.domain.linkbundle.LinkBundle;
import lombok.Getter;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.seong.shoutlink.domain.linkbundle.controller.request;
package com.seong.shoutlink.domain.link.controller.request;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.hubmember.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.hub.service.HubMemberRepository;
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.seong.shoutlink.domain.linkbundle.service.request;
package com.seong.shoutlink.domain.link.service.request;

import jakarta.annotation.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.seong.shoutlink.domain.link.service.request;

public record FindLinkBundlesCommand(Long memberId) {

}
Original file line number Diff line number Diff line change
@@ -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) {

Expand Down
Original file line number Diff line number Diff line change
@@ -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) {

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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<FindLinkBundleResponse> linkBundles) {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AutoTagLinkBundle> linkBundles, int generateTagCount) {
Expand Down
Loading
Loading