Skip to content

Commit

Permalink
refactor: linkbundle, link 패키지를 하나로 통합
Browse files Browse the repository at this point in the history
  • Loading branch information
hseong3243 committed Apr 28, 2024
1 parent 28a3521 commit 5b2fbd8
Show file tree
Hide file tree
Showing 42 changed files with 109 additions and 112 deletions.
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.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;
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 @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
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.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 5b2fbd8

Please sign in to comment.