Skip to content

Commit

Permalink
refactor: DDD 준비를 위한 패키지 이름 변경 (#72)
Browse files Browse the repository at this point in the history
* refactor: 도메인 객체를 domain 패키지로 이동

* refactor: global 패키지를 infra로 변경

* refactor: support 패키지에서 util 클래스 분리

* refactor: controller 패키지를 presentation으로 변경

* refactor: service 패키지를 application으로 변경
  • Loading branch information
scv1702 committed Jul 11, 2024
1 parent 8d3569a commit b90f2b7
Show file tree
Hide file tree
Showing 221 changed files with 768 additions and 868 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package es.princip.getp.domain.auth.service;
package es.princip.getp.domain.auth.application;

import es.princip.getp.domain.auth.domain.entity.TokenVerification;
import es.princip.getp.domain.auth.domain.TokenVerification;
import es.princip.getp.domain.auth.dto.request.LoginRequest;
import es.princip.getp.domain.auth.dto.response.Token;
import es.princip.getp.domain.auth.exception.LoginErrorCode;
import es.princip.getp.domain.auth.exception.TokenErrorCode;
import es.princip.getp.domain.auth.repository.TokenVerificationRepository;
import es.princip.getp.domain.member.service.MemberService;
import es.princip.getp.global.exception.BusinessLogicException;
import es.princip.getp.global.security.details.PrincipalDetails;
import es.princip.getp.global.security.provider.JwtTokenProvider;
import es.princip.getp.domain.member.application.MemberService;
import es.princip.getp.infra.exception.BusinessLogicException;
import es.princip.getp.infra.security.details.PrincipalDetails;
import es.princip.getp.infra.security.provider.JwtTokenProvider;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.domain.auth.service;
package es.princip.getp.domain.auth.application;

public interface EmailService {
void sendEmail(String email, String title, String text);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.auth.service;
package es.princip.getp.domain.auth.application;

import es.princip.getp.domain.auth.exception.EmailErrorCode;
import es.princip.getp.global.exception.BusinessLogicException;
import es.princip.getp.infra.exception.BusinessLogicException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.mail.MailException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package es.princip.getp.domain.auth.service;
package es.princip.getp.domain.auth.application;

import es.princip.getp.domain.auth.domain.entity.EmailVerification;
import es.princip.getp.domain.auth.domain.EmailVerification;
import es.princip.getp.domain.auth.exception.EmailVerificationErrorCode;
import es.princip.getp.domain.auth.repository.EmailVerificationRepository;
import es.princip.getp.global.exception.BusinessLogicException;
import es.princip.getp.global.util.RandomUtil;
import es.princip.getp.infra.exception.BusinessLogicException;
import es.princip.getp.infra.util.RandomUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package es.princip.getp.domain.auth.service;
package es.princip.getp.domain.auth.application;

import es.princip.getp.domain.auth.dto.request.SignUpRequest;
import es.princip.getp.domain.auth.dto.response.SignUpResponse;
import es.princip.getp.domain.auth.exception.SignUpErrorCode;
import es.princip.getp.domain.member.application.MemberService;
import es.princip.getp.domain.member.dto.request.CreateMemberRequest;
import es.princip.getp.domain.member.service.MemberService;
import es.princip.getp.global.exception.BusinessLogicException;
import es.princip.getp.infra.exception.BusinessLogicException;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.domain.auth.domain.entity;
package es.princip.getp.domain.auth.domain;

import lombok.Getter;
import org.springframework.data.annotation.Id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.domain.auth.domain.entity;
package es.princip.getp.domain.auth.domain;

import lombok.Getter;
import org.springframework.data.annotation.Id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package es.princip.getp.domain.auth.dto.request;

import es.princip.getp.domain.auth.annotation.Password;
import es.princip.getp.domain.member.domain.enums.MemberType;
import es.princip.getp.domain.member.validator.annotation.UserMemberType;
import es.princip.getp.domain.member.annotation.UserMemberType;
import es.princip.getp.domain.member.domain.MemberType;
import es.princip.getp.domain.serviceTerm.dto.reqeust.ServiceTermAgreementRequest;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;

import java.util.List;

public record SignUpRequest(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.auth.dto.response;

import es.princip.getp.domain.member.domain.entity.Member;
import es.princip.getp.domain.member.domain.enums.MemberType;
import es.princip.getp.domain.member.domain.Member;
import es.princip.getp.domain.member.domain.MemberType;
import es.princip.getp.domain.serviceTerm.dto.response.ServiceTermAgreementResponse;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.auth.exception;

import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;
import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorCode;

public enum EmailErrorCode implements ErrorCode {
EMAIL_SERVER_UNAVAILABLE(HttpStatus.INTERNAL_SERVER_ERROR, "이메일 서버 문제로 인해 전송 실패");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.auth.exception;

import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;
import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorCode;

public enum EmailVerificationErrorCode implements ErrorCode {
INVALID_EMAIL_VERIFICATION(HttpStatus.NOT_FOUND, "유효하지 않은 이메일 인증"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.auth.exception;

import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;

public enum LoginErrorCode implements ErrorCode {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.auth.exception;

import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;

public enum SignUpErrorCode implements ErrorCode {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.auth.exception;

import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;

public enum TokenErrorCode implements ErrorCode {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package es.princip.getp.domain.auth.controller;
package es.princip.getp.domain.auth.presentation;

import es.princip.getp.domain.auth.application.AuthService;
import es.princip.getp.domain.auth.dto.request.LoginRequest;
import es.princip.getp.domain.auth.dto.response.Token;
import es.princip.getp.domain.auth.service.AuthService;
import es.princip.getp.global.util.ApiResponse;
import es.princip.getp.global.util.ApiResponse.ApiSuccessResult;
import es.princip.getp.infra.dto.response.ApiResponse;
import es.princip.getp.infra.dto.response.ApiResponse.ApiSuccessResult;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package es.princip.getp.domain.auth.controller;
package es.princip.getp.domain.auth.presentation;

import es.princip.getp.domain.auth.application.SignUpService;
import es.princip.getp.domain.auth.dto.request.EmailVerificationCodeRequest;
import es.princip.getp.domain.auth.dto.request.SignUpRequest;
import es.princip.getp.domain.auth.dto.response.SignUpResponse;
import es.princip.getp.domain.auth.service.SignUpService;
import es.princip.getp.global.util.ApiResponse;
import es.princip.getp.global.util.ApiResponse.ApiSuccessResult;
import es.princip.getp.infra.dto.response.ApiResponse;
import es.princip.getp.infra.dto.response.ApiResponse.ApiSuccessResult;
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,6 +1,6 @@
package es.princip.getp.domain.auth.repository;

import es.princip.getp.domain.auth.domain.entity.EmailVerification;
import es.princip.getp.domain.auth.domain.EmailVerification;
import org.springframework.data.keyvalue.repository.KeyValueRepository;

public interface EmailVerificationRepository extends KeyValueRepository<EmailVerification, String> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package es.princip.getp.domain.auth.repository;

import es.princip.getp.domain.auth.domain.entity.TokenVerification;
import es.princip.getp.domain.auth.domain.TokenVerification;
import org.springframework.data.keyvalue.repository.KeyValueRepository;

public interface TokenVerificationRepository extends KeyValueRepository<TokenVerification, Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package es.princip.getp.domain.client.service;
package es.princip.getp.domain.client.application;

import es.princip.getp.domain.client.domain.entity.Client;
import es.princip.getp.domain.client.domain.Client;
import es.princip.getp.domain.client.dto.request.CreateClientRequest;
import es.princip.getp.domain.client.dto.request.UpdateClientRequest;
import es.princip.getp.domain.client.exception.ClientErrorCode;
import es.princip.getp.domain.client.repository.ClientRepository;
import es.princip.getp.domain.member.application.MemberService;
import es.princip.getp.domain.member.dto.request.UpdateMemberRequest;
import es.princip.getp.domain.member.service.MemberService;
import es.princip.getp.global.exception.BusinessLogicException;
import es.princip.getp.infra.exception.BusinessLogicException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.global.domain.values;
package es.princip.getp.domain.client.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.global.domain.values;
package es.princip.getp.domain.client.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package es.princip.getp.domain.client.domain.entity;
package es.princip.getp.domain.client.domain;

import es.princip.getp.domain.base.BaseTimeEntity;
import es.princip.getp.domain.client.dto.request.CreateClientRequest;
import es.princip.getp.domain.client.dto.request.UpdateClientRequest;
import es.princip.getp.domain.member.domain.entity.Member;
import es.princip.getp.domain.people.domain.entity.PeopleLike;
import es.princip.getp.global.domain.values.Address;
import es.princip.getp.global.domain.values.BankAccount;
import es.princip.getp.domain.member.domain.Member;
import es.princip.getp.domain.people.domain.PeopleLike;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.client.dto.request;

import es.princip.getp.global.domain.values.Address;
import es.princip.getp.global.domain.values.BankAccount;
import es.princip.getp.global.validator.annotation.PhoneNumber;
import es.princip.getp.domain.client.domain.Address;
import es.princip.getp.domain.client.domain.BankAccount;
import es.princip.getp.domain.member.annotation.PhoneNumber;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.client.dto.request;

import es.princip.getp.global.domain.values.Address;
import es.princip.getp.global.domain.values.BankAccount;
import es.princip.getp.global.validator.annotation.PhoneNumber;
import es.princip.getp.domain.client.domain.Address;
import es.princip.getp.domain.client.domain.BankAccount;
import es.princip.getp.domain.member.annotation.PhoneNumber;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.client.dto.response;

import es.princip.getp.domain.client.domain.entity.Client;
import es.princip.getp.global.domain.values.Address;
import es.princip.getp.global.domain.values.BankAccount;
import es.princip.getp.domain.client.domain.Address;
import es.princip.getp.domain.client.domain.BankAccount;
import es.princip.getp.domain.client.domain.Client;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package es.princip.getp.domain.client.dto.response;

import es.princip.getp.domain.client.domain.entity.Client;
import es.princip.getp.domain.client.domain.Client;
import es.princip.getp.domain.member.dto.response.MemberResponse;

public record MyClientResponse(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.client.dto.response;

import es.princip.getp.domain.client.domain.entity.Client;
import es.princip.getp.global.domain.values.Address;
import es.princip.getp.domain.client.domain.Address;
import es.princip.getp.domain.client.domain.Client;

public record ProjectClientResponse(
Long clientId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package es.princip.getp.domain.client.exception;

import es.princip.getp.global.exception.ErrorDescription;
import es.princip.getp.infra.exception.ErrorDescription;
import org.springframework.http.HttpStatus;
import es.princip.getp.global.exception.ErrorCode;
import es.princip.getp.infra.exception.ErrorCode;

public enum ClientErrorCode implements ErrorCode {
CLIENT_NOT_FOUND(HttpStatus.NOT_FOUND, "등록되지 않은 의뢰자 정보");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package es.princip.getp.domain.client.controller;
package es.princip.getp.domain.client.presentation;

import es.princip.getp.domain.client.application.ClientService;
import es.princip.getp.domain.client.dto.request.CreateClientRequest;
import es.princip.getp.domain.client.dto.response.ClientResponse;
import es.princip.getp.domain.client.service.ClientService;
import es.princip.getp.global.security.details.PrincipalDetails;
import es.princip.getp.global.util.ApiResponse;
import es.princip.getp.global.util.ApiResponse.ApiSuccessResult;
import es.princip.getp.infra.dto.response.ApiResponse;
import es.princip.getp.infra.dto.response.ApiResponse.ApiSuccessResult;
import es.princip.getp.infra.security.details.PrincipalDetails;
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,23 +1,19 @@
package es.princip.getp.domain.client.controller;
package es.princip.getp.domain.client.presentation;

import es.princip.getp.domain.client.application.ClientService;
import es.princip.getp.domain.client.dto.request.UpdateClientRequest;
import es.princip.getp.domain.client.dto.response.MyClientResponse;
import es.princip.getp.domain.client.service.ClientService;
import es.princip.getp.domain.member.domain.entity.Member;
import es.princip.getp.global.security.details.PrincipalDetails;
import es.princip.getp.global.util.ApiResponse;
import es.princip.getp.global.util.ApiResponse.ApiSuccessResult;
import es.princip.getp.domain.member.domain.Member;
import es.princip.getp.infra.dto.response.ApiResponse;
import es.princip.getp.infra.dto.response.ApiResponse.ApiSuccessResult;
import es.princip.getp.infra.security.details.PrincipalDetails;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/client/me")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package es.princip.getp.domain.client.repository;

import java.util.Optional;

import es.princip.getp.domain.client.domain.Client;
import org.springframework.data.jpa.repository.JpaRepository;
import es.princip.getp.domain.client.domain.entity.Client;

import java.util.Optional;

public interface ClientRepository extends JpaRepository<Client, Long>{
Optional<Client> findByMember_MemberId(Long memberId);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.global.domain.values;
package es.princip.getp.domain.hashtag.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package es.princip.getp.global.validator.annotation;
package es.princip.getp.domain.member.annotation;

import jakarta.validation.Constraint;
import jakarta.validation.Payload;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package es.princip.getp.domain.member.validator.annotation;
package es.princip.getp.domain.member.annotation;

import es.princip.getp.domain.member.validator.UserMemberTypeValidator;
import jakarta.validation.Constraint;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
Loading

0 comments on commit b90f2b7

Please sign in to comment.