Skip to content

Commit

Permalink
Merge pull request #214 from Team-TenTen/refactor
Browse files Browse the repository at this point in the history
Refactor
  • Loading branch information
young970 authored Jan 27, 2024
2 parents fa919f2 + 89fefc5 commit 0486296
Show file tree
Hide file tree
Showing 80 changed files with 273 additions and 238 deletions.
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
package com.tenten.linkhub.domain.space.controller;
package com.tenten.linkhub.domain.link.controller;

import com.tenten.linkhub.domain.auth.MemberDetails;
import com.tenten.linkhub.domain.space.controller.dto.like.LikeCreateApiResponse;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkCreateApiRequest;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkCreateApiResponse;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkUpdateApiRequest;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkUpdateApiResponse;
import com.tenten.linkhub.domain.space.controller.dto.link.LinksGetWithFilterApiRequest;
import com.tenten.linkhub.domain.space.controller.dto.link.LinksGetWithFilterApiResponses;
import com.tenten.linkhub.domain.space.controller.dto.link.PopularLinksGetApiResponses;
import com.tenten.linkhub.domain.space.controller.mapper.LinkApiMapper;
import com.tenten.linkhub.domain.space.facade.LinkFacade;
import com.tenten.linkhub.domain.space.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.space.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.space.service.LinkService;
import com.tenten.linkhub.domain.space.service.dto.link.LinkGetByQueryResponses;
import com.tenten.linkhub.domain.space.service.dto.link.LinksGetByQueryRequest;
import com.tenten.linkhub.domain.space.service.dto.link.PopularLinksGetByQueryResponses;
import com.tenten.linkhub.domain.link.controller.dto.LikeCreateApiResponse;
import com.tenten.linkhub.domain.link.controller.dto.LinkCreateApiRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinkCreateApiResponse;
import com.tenten.linkhub.domain.link.controller.dto.LinkUpdateApiRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinkUpdateApiResponse;
import com.tenten.linkhub.domain.link.controller.dto.LinksGetWithFilterApiRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinksGetWithFilterApiResponses;
import com.tenten.linkhub.domain.link.controller.dto.PopularLinksGetApiResponses;
import com.tenten.linkhub.domain.link.controller.mapper.LinkApiMapper;
import com.tenten.linkhub.domain.link.facade.LinkFacade;
import com.tenten.linkhub.domain.link.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.link.service.LinkService;
import com.tenten.linkhub.domain.link.service.dto.LinkGetByQueryResponses;
import com.tenten.linkhub.domain.link.service.dto.LinksGetByQueryRequest;
import com.tenten.linkhub.domain.link.service.dto.PopularLinksGetByQueryResponses;

import com.tenten.linkhub.global.response.ErrorResponse;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;

import jakarta.validation.Valid;

import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.http.MediaType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.like;
package com.tenten.linkhub.domain.link.controller.dto;

public record LikeCreateApiResponse(Boolean isLiked) {
public static LikeCreateApiResponse from(Boolean isLiked) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

public record LinkCreateApiResponse(
Long linkId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

public record LinkUpdateApiResponse(
Long linkId
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import io.swagger.v3.oas.annotations.media.Schema;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import com.tenten.linkhub.domain.space.repository.link.dto.LinkViewDto;
import com.tenten.linkhub.domain.link.repository.link.dto.LinkViewDto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import com.tenten.linkhub.domain.space.service.dto.link.LinkGetByQueryResponses;
import com.tenten.linkhub.domain.link.service.dto.LinkGetByQueryResponses;
import com.tenten.linkhub.global.util.PageMetaData;
import org.springframework.data.domain.Slice;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

public record PopularLinksGetApiResponse(
Long linkId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.controller.dto.link;
package com.tenten.linkhub.domain.link.controller.dto;

import com.tenten.linkhub.domain.space.service.dto.link.PopularLinksGetByQueryResponses;
import com.tenten.linkhub.domain.link.service.dto.PopularLinksGetByQueryResponses;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.tenten.linkhub.domain.space.controller.mapper;
package com.tenten.linkhub.domain.link.controller.mapper;

import com.tenten.linkhub.domain.space.controller.dto.link.LinkCreateApiRequest;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkCreateApiResponse;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkUpdateApiRequest;
import com.tenten.linkhub.domain.space.controller.dto.link.LinkUpdateApiResponse;
import com.tenten.linkhub.domain.space.controller.dto.link.LinksGetWithFilterApiRequest;
import com.tenten.linkhub.domain.space.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.space.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.space.service.dto.link.LinksGetByQueryRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinkCreateApiRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinkCreateApiResponse;
import com.tenten.linkhub.domain.link.controller.dto.LinkUpdateApiRequest;
import com.tenten.linkhub.domain.link.controller.dto.LinkUpdateApiResponse;
import com.tenten.linkhub.domain.link.controller.dto.LinksGetWithFilterApiRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.link.service.dto.LinksGetByQueryRequest;
import org.mapstruct.InjectionStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.exception;
package com.tenten.linkhub.domain.link.exception;

public class LinkViewHistoryException extends RuntimeException {
public LinkViewHistoryException(String message) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.tenten.linkhub.domain.space.facade;

import com.tenten.linkhub.domain.space.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.space.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.space.facade.mapper.LinkFacadeMapper;
import com.tenten.linkhub.domain.space.handler.dto.LinkDecreaseLikeCountEvent;
import com.tenten.linkhub.domain.space.handler.dto.LinkIncreaseLikeCountEvent;
import com.tenten.linkhub.domain.space.service.LinkService;
package com.tenten.linkhub.domain.link.facade;

import com.tenten.linkhub.domain.link.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.link.facade.mapper.LinkFacadeMapper;
import com.tenten.linkhub.domain.link.handler.dto.LinkDecreaseLikeCountEvent;
import com.tenten.linkhub.domain.link.handler.dto.LinkIncreaseLikeCountEvent;
import com.tenten.linkhub.domain.link.service.LinkService;
import com.tenten.linkhub.domain.space.service.SpaceService;
import com.tenten.linkhub.domain.space.service.dto.link.LinkCreateRequest;
import com.tenten.linkhub.domain.space.service.dto.link.LinkGetByQueryResponses;
import com.tenten.linkhub.domain.space.service.dto.link.LinkUpdateRequest;
import com.tenten.linkhub.domain.space.service.dto.link.LinksGetByQueryRequest;
import com.tenten.linkhub.domain.link.service.dto.LinkCreateRequest;
import com.tenten.linkhub.domain.link.service.dto.LinkGetByQueryResponses;
import com.tenten.linkhub.domain.link.service.dto.LinkUpdateRequest;
import com.tenten.linkhub.domain.link.service.dto.LinksGetByQueryRequest;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.facade.dto;
package com.tenten.linkhub.domain.link.facade.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.facade.dto;
package com.tenten.linkhub.domain.link.facade.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.tenten.linkhub.domain.space.facade.mapper;
package com.tenten.linkhub.domain.link.facade.mapper;

import com.tenten.linkhub.domain.space.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.space.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.space.service.dto.link.LinkCreateRequest;
import com.tenten.linkhub.domain.space.service.dto.link.LinkUpdateRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkCreateFacadeRequest;
import com.tenten.linkhub.domain.link.facade.dto.LinkUpdateFacadeRequest;
import com.tenten.linkhub.domain.link.service.dto.LinkCreateRequest;
import com.tenten.linkhub.domain.link.service.dto.LinkUpdateRequest;
import org.mapstruct.InjectionStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.tenten.linkhub.domain.space.handler;
package com.tenten.linkhub.domain.link.handler;

import com.tenten.linkhub.domain.space.handler.dto.LinkDecreaseLikeCountEvent;
import com.tenten.linkhub.domain.space.handler.dto.LinkIncreaseLikeCountEvent;
import com.tenten.linkhub.domain.space.repository.link.LinkRepository;
import com.tenten.linkhub.domain.link.handler.dto.LinkDecreaseLikeCountEvent;
import com.tenten.linkhub.domain.link.handler.dto.LinkIncreaseLikeCountEvent;
import com.tenten.linkhub.domain.link.repository.link.LinkRepository;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.handler.dto;
package com.tenten.linkhub.domain.link.handler.dto;

public record LinkDecreaseLikeCountEvent(Long linkId) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.handler.dto;
package com.tenten.linkhub.domain.link.handler.dto;

public record LinkIncreaseLikeCountEvent(Long linkId) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

public enum Color {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

import com.tenten.linkhub.domain.space.model.link.vo.Url;
import com.tenten.linkhub.domain.link.model.vo.Url;
import com.tenten.linkhub.domain.space.model.space.Space;
import com.tenten.linkhub.global.entity.BaseEntity;
import jakarta.persistence.CascadeType;
Expand All @@ -15,7 +15,6 @@
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.Version;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

import com.tenten.linkhub.global.entity.BaseEntity;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

import com.tenten.linkhub.global.entity.BaseTimeEntity;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link;
package com.tenten.linkhub.domain.link.model;

import com.tenten.linkhub.domain.space.model.space.Space;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.model.link.vo;
package com.tenten.linkhub.domain.link.model.vo;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.repository.like;
package com.tenten.linkhub.domain.link.repository.like;

import com.tenten.linkhub.domain.space.model.link.Like;
import com.tenten.linkhub.domain.link.model.Like;
import org.springframework.stereotype.Repository;

import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.repository.like;
package com.tenten.linkhub.domain.link.repository.like;

import com.tenten.linkhub.domain.space.model.link.Like;
import com.tenten.linkhub.domain.link.model.Like;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.repository.like;
package com.tenten.linkhub.domain.link.repository.like;

import com.tenten.linkhub.domain.space.model.link.Like;
import com.tenten.linkhub.domain.link.model.Like;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.tenten.linkhub.domain.space.repository.link;
package com.tenten.linkhub.domain.link.repository.link;

import com.tenten.linkhub.domain.space.model.link.Link;
import com.tenten.linkhub.domain.space.repository.link.dto.LinkGetDto;
import com.tenten.linkhub.domain.space.repository.link.dto.LinkGetQueryCondition;
import com.tenten.linkhub.domain.space.repository.link.dto.PopularLinkGetDto;
import com.tenten.linkhub.domain.space.repository.link.querydsl.LinkQueryDslRepository;
import com.tenten.linkhub.domain.link.model.Link;
import com.tenten.linkhub.domain.link.repository.link.dto.LinkGetDto;
import com.tenten.linkhub.domain.link.repository.link.dto.LinkGetQueryCondition;
import com.tenten.linkhub.domain.link.repository.link.querydsl.LinkQueryDslRepository;
import com.tenten.linkhub.domain.link.repository.link.dto.PopularLinkGetDto;
import com.tenten.linkhub.global.exception.DataNotFoundException;
import org.springframework.data.domain.Slice;
import org.springframework.stereotype.Repository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.repository.link;
package com.tenten.linkhub.domain.link.repository.link;

import com.tenten.linkhub.domain.space.model.link.Link;
import com.tenten.linkhub.domain.link.model.Link;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Repository;
Expand All @@ -9,7 +9,6 @@
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.IntStream;

@RequiredArgsConstructor
@Repository
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.tenten.linkhub.domain.space.repository.link;
package com.tenten.linkhub.domain.link.repository.link;

import com.tenten.linkhub.domain.space.model.link.Link;
import com.tenten.linkhub.domain.link.model.Link;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.tenten.linkhub.domain.space.repository.link;
package com.tenten.linkhub.domain.link.repository.link;

import com.tenten.linkhub.domain.space.model.link.Link;
import com.tenten.linkhub.domain.space.repository.link.dto.LinkGetDto;
import com.tenten.linkhub.domain.space.repository.link.dto.LinkGetQueryCondition;
import com.tenten.linkhub.domain.space.repository.link.dto.PopularLinkGetDto;
import com.tenten.linkhub.domain.link.model.Link;
import com.tenten.linkhub.domain.link.repository.link.dto.LinkGetDto;
import com.tenten.linkhub.domain.link.repository.link.dto.LinkGetQueryCondition;
import com.tenten.linkhub.domain.link.repository.link.dto.PopularLinkGetDto;
import org.springframework.data.domain.Slice;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.repository.link.dto;
package com.tenten.linkhub.domain.link.repository.link.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.repository.link.dto;
package com.tenten.linkhub.domain.link.repository.link.dto;

import org.springframework.data.domain.Pageable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.tenten.linkhub.domain.space.repository.link.dto;
package com.tenten.linkhub.domain.link.repository.link.dto;

import com.querydsl.core.annotations.QueryProjection;
import com.tenten.linkhub.domain.space.model.link.Color;
import com.tenten.linkhub.domain.link.model.Color;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.tenten.linkhub.domain.space.repository.link.dto;
package com.tenten.linkhub.domain.link.repository.link.dto;

import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Loading

0 comments on commit 0486296

Please sign in to comment.