refactor: 디렉토리 구조 변경 (#18)

src/main/java/blacktokkies/toquiz/activeinfo/ActiveInfoRepository.java → src/main/java/blacktokkies/toquiz/domain/activeinfo/ActiveInfoRepository.java

@@ -1,6 +1,6 @@
-package blacktokkies.toquiz.activeinfo;
+package blacktokkies.toquiz.domain.activeinfo;
 
-import blacktokkies.toquiz.activeinfo.domain.ActiveInfo;
+import blacktokkies.toquiz.domain.activeinfo.domain.ActiveInfo;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/blacktokkies/toquiz/activeinfo/domain/ActiveInfo.java → src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActiveInfo.java

@@ -1,13 +1,11 @@
-package blacktokkies.toquiz.activeinfo.domain;
+package blacktokkies.toquiz.domain.activeinfo.domain;
 
 import jakarta.persistence.Id;
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Document(collection = "toquiz-member")

src/main/java/blacktokkies/toquiz/activeinfo/domain/ActivePanel.java → src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActivePanel.java

@@ -1,4 +1,4 @@
-package blacktokkies.toquiz.activeinfo.domain;
+package blacktokkies.toquiz.domain.activeinfo.domain;
 
 import java.util.List;
 

src/main/java/blacktokkies/toquiz/domain/answer/api/AnswerApi.java

@@ -0,0 +1,4 @@
+package blacktokkies.toquiz.domain.answer.api;
+
+public class AnswerApi {
+}

src/main/java/blacktokkies/toquiz/answer/domain/Answer.java → src/main/java/blacktokkies/toquiz/domain/answer/domain/Answer.java

@@ -1,7 +1,7 @@
-package blacktokkies.toquiz.answer.domain;
+package blacktokkies.toquiz.domain.answer.domain;
 
-import blacktokkies.toquiz.common.domain.BaseTime;
-import blacktokkies.toquiz.question.domain.Question;
+import blacktokkies.toquiz.global.common.domain.BaseTime;
+import blacktokkies.toquiz.domain.question.domain.Question;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/blacktokkies/toquiz/auth/AuthController.java → src/main/java/blacktokkies/toquiz/domain/member/api/AuthApi.java

@@ -1,11 +1,12 @@
-package blacktokkies.toquiz.auth;
-
-import blacktokkies.toquiz.auth.dto.response.AuthenticateResponseDto;
-import blacktokkies.toquiz.common.success.SuccessMessage;
-import blacktokkies.toquiz.common.success.SuccessResponse;
-import blacktokkies.toquiz.auth.dto.request.LoginRequestDto;
-import blacktokkies.toquiz.auth.dto.request.SignUpRequestDto;
-import blacktokkies.toquiz.helper.CookieService;
+package blacktokkies.toquiz.domain.member.api;
+
+import blacktokkies.toquiz.domain.member.dto.response.AuthenticateResponse;
+import blacktokkies.toquiz.global.common.response.SuccessMessage;
+import blacktokkies.toquiz.global.common.response.SuccessResponse;
+import blacktokkies.toquiz.domain.member.dto.request.LoginRequest;
+import blacktokkies.toquiz.domain.member.dto.request.SignUpRequest;
+import blacktokkies.toquiz.domain.member.application.AuthService;
+import blacktokkies.toquiz.global.util.auth.CookieService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -15,20 +16,20 @@
 
 @RestController
 @RequiredArgsConstructor
-public class AuthController {
+public class AuthApi {
  private final AuthService authService;
  private final CookieService cookieService;
  @PostMapping("/api/auth/signup")
- ResponseEntity<SuccessMessage> signUp(@RequestBody @Valid SignUpRequestDto signUpRequestDto) {
- authService.signUp(signUpRequestDto);
+ ResponseEntity<SuccessMessage> signUp(@RequestBody @Valid SignUpRequest signUpRequest) {
+ authService.signUp(signUpRequest);
 
  return ResponseEntity.ok(SuccessMessage.SIGN_UP);
  }
 
  @PostMapping("/api/auth/login")
- ResponseEntity<SuccessResponse<AuthenticateResponseDto>> login(@RequestBody @Valid LoginRequestDto loginRequestDto,
+ ResponseEntity<SuccessResponse<AuthenticateResponse>> login(@RequestBody @Valid LoginRequest loginRequest,
  HttpServletResponse response) {
- AuthenticateResponseDto loginResponse = authService.login(loginRequestDto);
+ AuthenticateResponse loginResponse = authService.login(loginRequest);
 
  response.addCookie(cookieService.issueActiveInfoIdCookie(loginResponse.getEmail()));
  response.addCookie(cookieService.issueRefreshTokenCookie(loginResponse.getEmail()));
@@ -47,8 +48,8 @@ ResponseEntity<SuccessMessage> logout(HttpServletResponse response){
  }
 
  @PostMapping ("/api/auth/refresh")
- ResponseEntity<SuccessResponse<AuthenticateResponseDto>> refresh(@CookieValue(name = "refresh_token", required = false) String refreshToken, HttpServletResponse response){
- AuthenticateResponseDto refreshResponse = authService.refresh(refreshToken);
+ ResponseEntity<SuccessResponse<AuthenticateResponse>> refresh(@CookieValue(name = "refresh_token", required = false) String refreshToken, HttpServletResponse response){
+ AuthenticateResponse refreshResponse = authService.refresh(refreshToken);
 
  response.addCookie(cookieService.issueRefreshTokenCookie(refreshResponse.getEmail()));
 

src/main/java/blacktokkies/toquiz/domain/member/api/MemberApi.java

@@ -0,0 +1,4 @@
+package blacktokkies.toquiz.domain.member.api;
+
+public class MemberApi {
+}

src/main/java/blacktokkies/toquiz/auth/AuthService.java → src/main/java/blacktokkies/toquiz/domain/member/application/AuthService.java

@@ -1,22 +1,22 @@
-package blacktokkies.toquiz.auth;
-
-import blacktokkies.toquiz.activeinfo.ActiveInfoRepository;
-import blacktokkies.toquiz.activeinfo.domain.ActiveInfo;
-import blacktokkies.toquiz.auth.dto.response.AuthenticateResponseDto;
-import blacktokkies.toquiz.common.error.exception.RestApiException;
-import blacktokkies.toquiz.helper.token.JwtService;
-import blacktokkies.toquiz.helper.PasswordEncryptor;
-import blacktokkies.toquiz.auth.dto.request.LoginRequestDto;
-import blacktokkies.toquiz.helper.token.RefreshTokenService;
-import blacktokkies.toquiz.member.MemberRepository;
-import blacktokkies.toquiz.member.domain.Member;
-import blacktokkies.toquiz.auth.dto.request.SignUpRequestDto;
+package blacktokkies.toquiz.domain.member.application;
+
+import blacktokkies.toquiz.domain.activeinfo.ActiveInfoRepository;
+import blacktokkies.toquiz.domain.activeinfo.domain.ActiveInfo;
+import blacktokkies.toquiz.domain.member.dto.response.AuthenticateResponse;
+import blacktokkies.toquiz.global.common.error.RestApiException;
+import blacktokkies.toquiz.domain.member.dto.request.LoginRequest;
+import blacktokkies.toquiz.domain.member.dto.request.SignUpRequest;
+import blacktokkies.toquiz.domain.member.dao.MemberRepository;
+import blacktokkies.toquiz.domain.member.domain.Member;
+import blacktokkies.toquiz.global.util.auth.JwtService;
+import blacktokkies.toquiz.global.util.auth.PasswordEncryptor;
+import blacktokkies.toquiz.global.util.auth.RefreshTokenService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static blacktokkies.toquiz.common.error.errorcode.AuthErrorCode.*;
+import static blacktokkies.toquiz.domain.member.exception.MemberErrorCode.*;
 
 @Service
 @RequiredArgsConstructor
@@ -27,31 +27,31 @@ public class AuthService {
  private final RefreshTokenService refreshTokenService;
  private final JwtService jwtService;
  @Transactional
- public void signUp(SignUpRequestDto signUpRequestDto){
- checkExistDuplicateEmail(signUpRequestDto.getEmail());
- checkExistDuplicateNickname(signUpRequestDto.getNickname());
+ public void signUp(SignUpRequest signUpRequest){
+ checkExistDuplicateEmail(signUpRequest.getEmail());
+ checkExistDuplicateNickname(signUpRequest.getNickname());
 
  ActiveInfo activeInfo = activeInfoRepository.save(new ActiveInfo());
- Member member = signUpRequestDto.toMemberWith(activeInfo);
+ Member member = signUpRequest.toMemberWith(activeInfo);
 
  memberRepository.save(member);
  }
 
- public AuthenticateResponseDto login(LoginRequestDto loginRequestDto){
- Member member = getMemberByEmail(loginRequestDto.getEmail());
+ public AuthenticateResponse login(LoginRequest loginRequest){
+ Member member = getMemberByEmail(loginRequest.getEmail());
 
- checkCorrectPassword(loginRequestDto.getPassword(), member.getPassword());
+ checkCorrectPassword(loginRequest.getPassword(), member.getPassword());
  String accessToken = jwtService.generateAccessToken(member.getEmail());
 
- return AuthenticateResponseDto.toDto(member, accessToken);
+ return AuthenticateResponse.toDto(member, accessToken);
  }
 
  public void logout(){
  Member member = (Member) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
  refreshTokenService.delete(member.getEmail());
  }
 
- public AuthenticateResponseDto refresh(String refreshToken) {
+ public AuthenticateResponse refresh(String refreshToken) {
  checkExistRefreshToken(refreshToken);
 
  String email = jwtService.getSubject(refreshToken);
@@ -61,7 +61,7 @@ public AuthenticateResponseDto refresh(String refreshToken) {
 
  String accessToken = jwtService.generateAccessToken(email);
 
- return AuthenticateResponseDto.toDto(member, accessToken);
+ return AuthenticateResponse.toDto(member, accessToken);
  }
 
  private Member getMemberByEmail(String email) {

src/main/java/blacktokkies/toquiz/member/MemberRepository.java → src/main/java/blacktokkies/toquiz/domain/member/dao/MemberRepository.java

@@ -1,6 +1,6 @@
-package blacktokkies.toquiz.member;
+package blacktokkies.toquiz.domain.member.dao;
 
-import blacktokkies.toquiz.member.domain.Member;
+import blacktokkies.toquiz.domain.member.domain.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/blacktokkies/toquiz/member/domain/Member.java → src/main/java/blacktokkies/toquiz/domain/member/domain/Member.java

@@ -1,6 +1,7 @@
-package blacktokkies.toquiz.member.domain;
+package blacktokkies.toquiz.domain.member.domain;
 
-import blacktokkies.toquiz.common.domain.BaseTime;
+import blacktokkies.toquiz.global.common.domain.BaseTime;
+import blacktokkies.toquiz.domain.model.Provider;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.security.core.GrantedAuthority;

src/main/java/blacktokkies/toquiz/auth/dto/request/LoginRequestDto.java → src/main/java/blacktokkies/toquiz/domain/member/dto/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package blacktokkies.toquiz.auth.dto.request;
+package blacktokkies.toquiz.domain.member.dto.request;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
@@ -7,12 +7,12 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import static blacktokkies.toquiz.common.validation.ValidationErrorMessage.*;
-import static blacktokkies.toquiz.common.validation.ValidationFormat.PASSWORD_FORMAT;
+import static blacktokkies.toquiz.global.common.validation.ValidationErrorMessage.*;
+import static blacktokkies.toquiz.global.common.validation.ValidationFormat.PASSWORD_FORMAT;
 
 @Getter
 @NoArgsConstructor
-public class LoginRequestDto {
+public class LoginRequest {
  @NotBlank(message = EMAIL_EMPTY_MESSAGE)
  @Email(message = EMAIL_FORMAT_MESSAGE)
  private String email;

src/main/java/blacktokkies/toquiz/auth/dto/request/SignUpRequestDto.java → src/main/java/blacktokkies/toquiz/domain/member/dto/request/SignUpRequest.java

@@ -1,22 +1,22 @@
-package blacktokkies.toquiz.auth.dto.request;
+package blacktokkies.toquiz.domain.member.dto.request;
 
-import blacktokkies.toquiz.activeinfo.domain.ActiveInfo;
-import blacktokkies.toquiz.member.domain.Member;
-import blacktokkies.toquiz.member.domain.Provider;
+import blacktokkies.toquiz.domain.activeinfo.domain.ActiveInfo;
+import blacktokkies.toquiz.domain.model.Provider;
+import blacktokkies.toquiz.domain.member.domain.Member;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import static blacktokkies.toquiz.common.validation.ValidationErrorMessage.*;
-import static blacktokkies.toquiz.common.validation.ValidationFormat.PASSWORD_FORMAT;
-import static blacktokkies.toquiz.helper.PasswordEncryptor.encryptPassword;
+import static blacktokkies.toquiz.global.common.validation.ValidationErrorMessage.*;
+import static blacktokkies.toquiz.global.common.validation.ValidationFormat.PASSWORD_FORMAT;
+import static blacktokkies.toquiz.global.util.auth.PasswordEncryptor.encryptPassword;
 
 @Getter
 @NoArgsConstructor
-public class SignUpRequestDto {
+public class SignUpRequest {
  @NotBlank(message = EMAIL_EMPTY_MESSAGE)
  @Email(message = EMAIL_FORMAT_MESSAGE)
  private String email;

src/main/java/blacktokkies/toquiz/auth/dto/response/AuthenticateResponseDto.java → src/main/java/blacktokkies/toquiz/domain/member/dto/response/AuthenticateResponse.java

@@ -1,6 +1,6 @@
-package blacktokkies.toquiz.auth.dto.response;
+package blacktokkies.toquiz.domain.member.dto.response;
 
-import blacktokkies.toquiz.member.domain.Member;
+import blacktokkies.toquiz.domain.member.domain.Member;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -12,14 +12,14 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class AuthenticateResponseDto {
+public class AuthenticateResponse {
  private String email;
  private String nickname;
  private LocalDateTime createdAt;
  private String accessToken;
 
- public static AuthenticateResponseDto toDto(Member member, String accessToken){
- return AuthenticateResponseDto.builder()
+ public static AuthenticateResponse toDto(Member member, String accessToken){
+ return AuthenticateResponse.builder()
  .email(member.getEmail())
  .nickname(member.getNickname())
  .createdAt(member.getCreatedDate())

src/main/java/blacktokkies/toquiz/common/error/errorcode/AuthErrorCode.java → src/main/java/blacktokkies/toquiz/domain/member/exception/MemberErrorCode.java

@@ -1,12 +1,13 @@
-package blacktokkies.toquiz.common.error.errorcode;
+package blacktokkies.toquiz.domain.member.exception;
 
+import blacktokkies.toquiz.global.common.error.errorcode.ErrorCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 
 @Getter
 @RequiredArgsConstructor
-public enum AuthErrorCode implements ErrorCode {
+public enum MemberErrorCode implements ErrorCode {
  DUPLICATE_EMAIL(HttpStatus.BAD_REQUEST, "이미 존재하는 email 입니다."),
  DUPLICATE_NICKNAME(HttpStatus.BAD_REQUEST, "이미 존재하는 nickname 입니다."),
  INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호가 일치하지 않습니다."),

src/main/java/blacktokkies/toquiz/member/domain/Provider.java → src/main/java/blacktokkies/toquiz/domain/model/Provider.java

@@ -1,4 +1,4 @@
-package blacktokkies.toquiz.member.domain;
+package blacktokkies.toquiz.domain.model;
 
 public enum Provider {
  LOCAL, KAKAO, GOOGLE

src/main/java/blacktokkies/toquiz/domain/panel/api/PanelApi.java

@@ -0,0 +1,5 @@
+package blacktokkies.toquiz.domain.panel.api;
+
+public class PanelApi {
+
+}

src/main/java/blacktokkies/toquiz/panel/domain/Panel.java → src/main/java/blacktokkies/toquiz/domain/panel/domain/Panel.java

@@ -1,7 +1,7 @@
-package blacktokkies.toquiz.panel.domain;
+package blacktokkies.toquiz.domain.panel.domain;
 
-import blacktokkies.toquiz.common.domain.BaseTime;
-import blacktokkies.toquiz.member.domain.Member;
+import blacktokkies.toquiz.global.common.domain.BaseTime;
+import blacktokkies.toquiz.domain.member.domain.Member;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/blacktokkies/toquiz/domain/question/api/QuestionApi.java

@@ -0,0 +1,4 @@
+package blacktokkies.toquiz.domain.question.api;
+
+public class QuestionApi {
+}

src/main/java/blacktokkies/toquiz/question/domain/Question.java → src/main/java/blacktokkies/toquiz/domain/question/domain/Question.java

@@ -1,12 +1,11 @@
-package blacktokkies.toquiz.question.domain;
+package blacktokkies.toquiz.domain.question.domain;
 
-import blacktokkies.toquiz.common.domain.BaseTime;
-import blacktokkies.toquiz.panel.domain.Panel;
+import blacktokkies.toquiz.global.common.domain.BaseTime;
+import blacktokkies.toquiz.domain.panel.domain.Panel;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.bson.types.ObjectId;
 
 @Entity
 @Getter

src/main/java/blacktokkies/toquiz/common/domain/BaseTime.java → src/main/java/blacktokkies/toquiz/global/common/domain/BaseTime.java

@@ -1,4 +1,4 @@
-package blacktokkies.toquiz.common.domain;
+package blacktokkies.toquiz.global.common.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;

src/main/java/blacktokkies/toquiz/common/error/handler/GlobalExceptionHandler.java → src/main/java/blacktokkies/toquiz/global/common/error/GlobalExceptionHandler.java

@@ -1,9 +1,8 @@
-package blacktokkies.toquiz.common.error.handler;
+package blacktokkies.toquiz.global.common.error;
 
-import blacktokkies.toquiz.common.error.errorcode.CommonErrorCode;
-import blacktokkies.toquiz.common.error.errorcode.ErrorCode;
-import blacktokkies.toquiz.common.error.exception.RestApiException;
-import blacktokkies.toquiz.common.error.response.ErrorResponse;
+import blacktokkies.toquiz.global.common.error.errorcode.CommonErrorCode;
+import blacktokkies.toquiz.global.common.error.errorcode.ErrorCode;
+import blacktokkies.toquiz.global.common.response.ErrorResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;

src/main/java/blacktokkies/toquiz/common/error/exception/RestApiException.java → src/main/java/blacktokkies/toquiz/global/common/error/RestApiException.java

@@ -1,6 +1,6 @@
-package blacktokkies.toquiz.common.error.exception;
+package blacktokkies.toquiz.global.common.error;
 
-import blacktokkies.toquiz.common.error.errorcode.ErrorCode;
+import blacktokkies.toquiz.global.common.error.errorcode.ErrorCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

src/main/java/blacktokkies/toquiz/common/error/errorcode/CommonErrorCode.java → src/main/java/blacktokkies/toquiz/global/common/error/errorcode/CommonErrorCode.java

@@ -1,4 +1,4 @@
-package blacktokkies.toquiz.common.error.errorcode;
+package blacktokkies.toquiz.global.common.error.errorcode;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;