diff --git a/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java b/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLink.java similarity index 68% rename from src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java rename to src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLink.java index 000cd27..786b1e3 100644 --- a/src/main/java/com/seong/shoutlink/domain/link/LinkWithLinkBundle.java +++ b/src/main/java/com/seong/shoutlink/domain/link/LinkBundleAndLink.java @@ -3,12 +3,12 @@ import lombok.Getter; @Getter -public class LinkWithLinkBundle { +public class LinkBundleAndLink { private final Link link; private final LinkBundle linkBundle; - public LinkWithLinkBundle(Link link, LinkBundle linkBundle) { + public LinkBundleAndLink(Link link, LinkBundle linkBundle) { this.link = link; this.linkBundle = linkBundle; } 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 e5b4fcf..d5371b9 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 @@ -3,7 +3,7 @@ import com.seong.shoutlink.domain.common.BaseEntity; 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.link.LinkBundleAndLink; import com.seong.shoutlink.domain.link.LinkBundle; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -35,9 +35,9 @@ private LinkEntity(String url, String description, Long linkBundleId) { this.linkBundleId = linkBundleId; } - public static LinkEntity create(LinkWithLinkBundle linkWithLinkBundle) { - Link link = linkWithLinkBundle.getLink(); - LinkBundle linkBundle = linkWithLinkBundle.getLinkBundle(); + public static LinkEntity create(LinkBundleAndLink linkBundleAndLink) { + Link link = linkBundleAndLink.getLink(); + LinkBundle linkBundle = linkBundleAndLink.getLinkBundle(); return new LinkEntity( link.getUrl(), link.getDescription(), 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 ad9c5de..bc20943 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 @@ -3,7 +3,7 @@ import com.seong.shoutlink.domain.domain.Domain; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.link.Link; -import com.seong.shoutlink.domain.link.LinkWithLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundleAndLink; import com.seong.shoutlink.domain.link.service.LinkRepository; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; import com.seong.shoutlink.domain.link.LinkBundle; @@ -24,8 +24,8 @@ public class LinkRepositoryImpl implements LinkRepository { private final LinkJpaRepository linkJpaRepository; @Override - public Long save(LinkWithLinkBundle linkWithLinkBundle) { - LinkEntity linkEntity = linkJpaRepository.save(LinkEntity.create(linkWithLinkBundle)); + public Long save(LinkBundleAndLink linkBundleAndLink) { + LinkEntity linkEntity = linkJpaRepository.save(LinkEntity.create(linkBundleAndLink)); return linkEntity.getLinkId(); } @@ -58,7 +58,7 @@ public Optional findById(Long linkId) { } @Override - public List findAllByLinkBundlesIn(List linkBundles) { + public List findAllByLinkBundlesIn(List linkBundles) { List linkBundleIds = linkBundles.stream() .map(LinkBundle::getLinkBundleId) .toList(); @@ -66,7 +66,7 @@ public List findAllByLinkBundlesIn(List linkBund Map linkBundleIdAndLinkBundle = linkBundles.stream() .collect(Collectors.toMap(LinkBundle::getLinkBundleId, linkBundle -> linkBundle)); return linkEntities.stream() - .map(linkEntity -> new LinkWithLinkBundle(linkEntity.toDomain(), + .map(linkEntity -> new LinkBundleAndLink(linkEntity.toDomain(), linkBundleIdAndLinkBundle.get(linkEntity.getLinkBundleId()))) .toList(); } 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 8651ba5..53779e2 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 @@ -3,7 +3,7 @@ import com.seong.shoutlink.domain.domain.Domain; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.link.Link; -import com.seong.shoutlink.domain.link.LinkWithLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundleAndLink; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.member.Member; @@ -12,7 +12,7 @@ public interface LinkRepository { - Long save(LinkWithLinkBundle linkWithLinkBundle); + Long save(LinkBundleAndLink linkBundleAndLink); LinkPaginationResult findLinks(LinkBundle linkBundle, int page, int size); @@ -20,7 +20,7 @@ public interface LinkRepository { Optional findById(Long linkId); - List findAllByLinkBundlesIn(List linkBundles); + List findAllByLinkBundlesIn(List linkBundles); Optional findMemberLink(Long linkId, 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 443ce4d..dfbe00e 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 @@ -7,7 +7,7 @@ import com.seong.shoutlink.domain.hub.service.HubRepository; 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.LinkBundleAndLink; import com.seong.shoutlink.domain.link.service.event.CreateHubLinkEvent; import com.seong.shoutlink.domain.link.service.event.CreateMemberLinkEvent; import com.seong.shoutlink.domain.link.service.request.CreateHubLinkCommand; @@ -47,8 +47,8 @@ public CreateLinkResponse createLink(CreateLinkCommand command) { Member member = getMember(command.memberId()); LinkBundle linkBundle = getLinkBundle(command.linkBundleId(), member); Link link = new Link(command.url(), command.description()); - LinkWithLinkBundle linkWithLinkBundle = new LinkWithLinkBundle(link, linkBundle); - Long linkId = linkRepository.save(linkWithLinkBundle); + LinkBundleAndLink linkBundleAndLink = new LinkBundleAndLink(link, linkBundle); + Long linkId = linkRepository.save(linkBundleAndLink); eventPublisher.publishEvent( new CreateMemberLinkEvent(linkId, link.getUrl(), member.getMemberId())); return new CreateLinkResponse(linkId); @@ -85,7 +85,7 @@ public CreateHubLinkResponse createHubLink(CreateHubLinkCommand command) { LinkBundle hubLinkBundle = getHubLinkBundle(command.linkBundleId(), hub); Link link = new Link(command.url(), command.description()); - Long linkId = linkRepository.save(new LinkWithLinkBundle(link, hubLinkBundle)); + Long linkId = linkRepository.save(new LinkBundleAndLink(link, hubLinkBundle)); eventPublisher.publishEvent(new CreateHubLinkEvent(linkId, link.getUrl(), hub.getHubId())); return new CreateHubLinkResponse(linkId); } 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 f08a1cc..6165cb2 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 @@ -9,7 +9,7 @@ import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.hub.service.HubRepository; import com.seong.shoutlink.domain.link.LinkBundleAndLinks; -import com.seong.shoutlink.domain.link.LinkWithLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundleAndLink; import com.seong.shoutlink.domain.link.service.LinkRepository; import com.seong.shoutlink.domain.link.LinkBundle; import com.seong.shoutlink.domain.link.service.LinkBundleRepository; @@ -48,7 +48,7 @@ public CreateTagResponse autoCreateHubTags(AutoCreateHubTagCommand command) { Hub hub = getHub(command.hubId()); checkHubTagIsCreatedWithinADay(hub); List hubLinkBundles = linkBundleRepository.findHubLinkBundles(hub); - List links = linkRepository.findAllByLinkBundlesIn(hubLinkBundles); + List links = linkRepository.findAllByLinkBundlesIn(hubLinkBundles); List linkBundlesAndLinks = groupingLinks(links); int generateTagCount = calculateNumberOfTag(links); @@ -79,7 +79,7 @@ public CreateTagResponse autoCreateMemberTags(AutoCreateMemberTagCommand command Member member = getMember(command.memberId()); checkMemberTagIsCreatedWithinADay(member); List linkBundles = linkBundleRepository.findLinkBundlesThatMembersHave(member); - List links = linkRepository.findAllByLinkBundlesIn(linkBundles); + List links = linkRepository.findAllByLinkBundlesIn(linkBundles); List linkBundleAndLinks = groupingLinks(links); int generateTagCount = calculateNumberOfTag(links); @@ -106,17 +106,17 @@ private void checkMemberTagIsCreatedWithinADay(Member member) { }); } - private List groupingLinks(List links) { + private List groupingLinks(List links) { return links.stream() .collect(groupingBy( - LinkWithLinkBundle::getLinkBundle, - mapping(LinkWithLinkBundle::getLink, toList()))) + LinkBundleAndLink::getLinkBundle, + mapping(LinkBundleAndLink::getLink, toList()))) .entrySet().stream() .map(entry -> new LinkBundleAndLinks(entry.getKey(), entry.getValue())) .toList(); } - private int calculateNumberOfTag(List links) { + private int calculateNumberOfTag(List links) { int totalLinkCount = links.size(); if (totalLinkCount < MINIMUM_TAG_CONDITION || totalLinkCount % MINIMUM_TAG_CONDITION != ZERO) { 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 4953065..fec99a9 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 @@ -3,7 +3,7 @@ import com.seong.shoutlink.domain.domain.Domain; import com.seong.shoutlink.domain.hub.Hub; import com.seong.shoutlink.domain.link.Link; -import com.seong.shoutlink.domain.link.LinkWithLinkBundle; +import com.seong.shoutlink.domain.link.LinkBundleAndLink; import com.seong.shoutlink.domain.link.service.LinkRepository; import com.seong.shoutlink.domain.link.service.result.LinkPaginationResult; import com.seong.shoutlink.domain.link.LinkBundle; @@ -33,9 +33,9 @@ public int count() { } @Override - public Long save(LinkWithLinkBundle linkWithLinkBundle) { + public Long save(LinkBundleAndLink linkBundleAndLink) { long nextId = getNextId(); - memory.put(nextId, linkWithLinkBundle.getLink()); + memory.put(nextId, linkBundleAndLink.getLink()); return nextId; } @@ -63,12 +63,12 @@ public Optional findById(Long linkId) { } @Override - public List findAllByLinkBundlesIn(List linkBundles) { - List result = new ArrayList<>(); + public List findAllByLinkBundlesIn(List linkBundles) { + List result = new ArrayList<>(); List links = memory.values().stream().toList(); for(int i=0; i