From cb40b3f5130fd9829160344573fc14864ea19ef7 Mon Sep 17 00:00:00 2001 From: soomanbaek Date: Sat, 12 Aug 2023 15:41:01 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20(#18)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toquiz/answer/AnswerController.java | 4 -- .../activeinfo/ActiveInfoRepository.java | 4 +- .../activeinfo/domain/ActiveInfo.java | 4 +- .../activeinfo/domain/ActivePanel.java | 2 +- .../toquiz/domain/answer/api/AnswerApi.java | 4 ++ .../{ => domain}/answer/domain/Answer.java | 6 +-- .../member/api/AuthApi.java} | 31 ++++++------ .../toquiz/domain/member/api/MemberApi.java | 4 ++ .../member/application}/AuthService.java | 48 +++++++++---------- .../member/dao}/MemberRepository.java | 4 +- .../{ => domain}/member/domain/Member.java | 5 +- .../member/dto/request/LoginRequest.java} | 8 ++-- .../member/dto/request/SignUpRequest.java} | 16 +++---- .../dto/response/AuthenticateResponse.java} | 10 ++-- .../member/exception/MemberErrorCode.java} | 5 +- .../domain => domain/model}/Provider.java | 2 +- .../toquiz/domain/panel/api/PanelApi.java | 5 ++ .../{ => domain}/panel/domain/Panel.java | 6 +-- .../domain/question/api/QuestionApi.java | 4 ++ .../question/domain/Question.java | 7 ++- .../{ => global}/common/domain/BaseTime.java | 2 +- .../common/error}/GlobalExceptionHandler.java | 9 ++-- .../common/error}/RestApiException.java | 4 +- .../error/errorcode/CommonErrorCode.java | 2 +- .../common/error/errorcode/ErrorCode.java | 2 +- .../filter/JwtAuthenticationFilter.java | 6 +-- .../interceptor/LoggingInterceptor.java | 2 +- .../common}/response/ErrorResponse.java | 2 +- .../common/response}/SuccessMessage.java | 2 +- .../common/response}/SuccessResponse.java | 2 +- .../validation/ValidationErrorMessage.java | 2 +- .../common/validation/ValidationFormat.java | 2 +- .../config/ApplicationConfig.java | 4 +- .../toquiz/{ => global}/config/WebConfig.java | 4 +- .../CustomAuthenticationEntryPoint.java | 8 ++-- .../config/security}/SecurityConfig.java | 4 +- .../util/auth}/CookieService.java | 17 +++---- .../util/auth}/JwtService.java | 6 +-- .../util/auth}/PasswordEncryptor.java | 2 +- .../util/auth}/RefreshToken.java | 2 +- .../util/auth}/RefreshTokenRepository.java | 2 +- .../util/auth}/RefreshTokenService.java | 6 +-- .../toquiz/member/MemberController.java | 4 -- .../toquiz/panel/PanelController.java | 5 -- .../toquiz/question/QuestionController.java | 4 -- 45 files changed, 140 insertions(+), 144 deletions(-) delete mode 100644 src/main/java/blacktokkies/toquiz/answer/AnswerController.java rename src/main/java/blacktokkies/toquiz/{ => domain}/activeinfo/ActiveInfoRepository.java (66%) rename src/main/java/blacktokkies/toquiz/{ => domain}/activeinfo/domain/ActiveInfo.java (80%) rename src/main/java/blacktokkies/toquiz/{ => domain}/activeinfo/domain/ActivePanel.java (71%) create mode 100644 src/main/java/blacktokkies/toquiz/domain/answer/api/AnswerApi.java rename src/main/java/blacktokkies/toquiz/{ => domain}/answer/domain/Answer.java (72%) rename src/main/java/blacktokkies/toquiz/{auth/AuthController.java => domain/member/api/AuthApi.java} (59%) create mode 100644 src/main/java/blacktokkies/toquiz/domain/member/api/MemberApi.java rename src/main/java/blacktokkies/toquiz/{auth => domain/member/application}/AuthService.java (64%) rename src/main/java/blacktokkies/toquiz/{member => domain/member/dao}/MemberRepository.java (77%) rename src/main/java/blacktokkies/toquiz/{ => domain}/member/domain/Member.java (92%) rename src/main/java/blacktokkies/toquiz/{auth/dto/request/LoginRequestDto.java => domain/member/dto/request/LoginRequest.java} (70%) rename src/main/java/blacktokkies/toquiz/{auth/dto/request/SignUpRequestDto.java => domain/member/dto/request/SignUpRequest.java} (67%) rename src/main/java/blacktokkies/toquiz/{auth/dto/response/AuthenticateResponseDto.java => domain/member/dto/response/AuthenticateResponse.java} (65%) rename src/main/java/blacktokkies/toquiz/{common/error/errorcode/AuthErrorCode.java => domain/member/exception/MemberErrorCode.java} (83%) rename src/main/java/blacktokkies/toquiz/{member/domain => domain/model}/Provider.java (54%) create mode 100644 src/main/java/blacktokkies/toquiz/domain/panel/api/PanelApi.java rename src/main/java/blacktokkies/toquiz/{ => domain}/panel/domain/Panel.java (76%) create mode 100644 src/main/java/blacktokkies/toquiz/domain/question/api/QuestionApi.java rename src/main/java/blacktokkies/toquiz/{ => domain}/question/domain/Question.java (77%) rename src/main/java/blacktokkies/toquiz/{ => global}/common/domain/BaseTime.java (92%) rename src/main/java/blacktokkies/toquiz/{common/error/handler => global/common/error}/GlobalExceptionHandler.java (92%) rename src/main/java/blacktokkies/toquiz/{common/error/exception => global/common/error}/RestApiException.java (62%) rename src/main/java/blacktokkies/toquiz/{ => global}/common/error/errorcode/CommonErrorCode.java (89%) rename src/main/java/blacktokkies/toquiz/{ => global}/common/error/errorcode/ErrorCode.java (72%) rename src/main/java/blacktokkies/toquiz/{ => global/common}/filter/JwtAuthenticationFilter.java (93%) rename src/main/java/blacktokkies/toquiz/{ => global/common}/interceptor/LoggingInterceptor.java (90%) rename src/main/java/blacktokkies/toquiz/{common/error => global/common}/response/ErrorResponse.java (94%) rename src/main/java/blacktokkies/toquiz/{common/success => global/common/response}/SuccessMessage.java (90%) rename src/main/java/blacktokkies/toquiz/{common/success => global/common/response}/SuccessResponse.java (87%) rename src/main/java/blacktokkies/toquiz/{ => global}/common/validation/ValidationErrorMessage.java (94%) rename src/main/java/blacktokkies/toquiz/{ => global}/common/validation/ValidationFormat.java (82%) rename src/main/java/blacktokkies/toquiz/{ => global}/config/ApplicationConfig.java (94%) rename src/main/java/blacktokkies/toquiz/{ => global}/config/WebConfig.java (82%) rename src/main/java/blacktokkies/toquiz/{config/secure => global/config/security}/CustomAuthenticationEntryPoint.java (84%) rename src/main/java/blacktokkies/toquiz/{config/secure => global/config/security}/SecurityConfig.java (95%) rename src/main/java/blacktokkies/toquiz/{helper => global/util/auth}/CookieService.java (75%) rename src/main/java/blacktokkies/toquiz/{helper/token => global/util/auth}/JwtService.java (93%) rename src/main/java/blacktokkies/toquiz/{helper => global/util/auth}/PasswordEncryptor.java (92%) rename src/main/java/blacktokkies/toquiz/{helper/token => global/util/auth}/RefreshToken.java (94%) rename src/main/java/blacktokkies/toquiz/{helper/token => global/util/auth}/RefreshTokenRepository.java (83%) rename src/main/java/blacktokkies/toquiz/{helper/token => global/util/auth}/RefreshTokenService.java (89%) delete mode 100644 src/main/java/blacktokkies/toquiz/member/MemberController.java delete mode 100644 src/main/java/blacktokkies/toquiz/panel/PanelController.java delete mode 100644 src/main/java/blacktokkies/toquiz/question/QuestionController.java diff --git a/src/main/java/blacktokkies/toquiz/answer/AnswerController.java b/src/main/java/blacktokkies/toquiz/answer/AnswerController.java deleted file mode 100644 index f1c8267..0000000 --- a/src/main/java/blacktokkies/toquiz/answer/AnswerController.java +++ /dev/null @@ -1,4 +0,0 @@ -package blacktokkies.toquiz.answer; - -public class AnswerController { -} diff --git a/src/main/java/blacktokkies/toquiz/activeinfo/ActiveInfoRepository.java b/src/main/java/blacktokkies/toquiz/domain/activeinfo/ActiveInfoRepository.java similarity index 66% rename from src/main/java/blacktokkies/toquiz/activeinfo/ActiveInfoRepository.java rename to src/main/java/blacktokkies/toquiz/domain/activeinfo/ActiveInfoRepository.java index 1e42886..2f83050 100644 --- a/src/main/java/blacktokkies/toquiz/activeinfo/ActiveInfoRepository.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/activeinfo/domain/ActiveInfo.java b/src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActiveInfo.java similarity index 80% rename from src/main/java/blacktokkies/toquiz/activeinfo/domain/ActiveInfo.java rename to src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActiveInfo.java index 53ca305..7cc351b 100644 --- a/src/main/java/blacktokkies/toquiz/activeinfo/domain/ActiveInfo.java +++ b/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") diff --git a/src/main/java/blacktokkies/toquiz/activeinfo/domain/ActivePanel.java b/src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActivePanel.java similarity index 71% rename from src/main/java/blacktokkies/toquiz/activeinfo/domain/ActivePanel.java rename to src/main/java/blacktokkies/toquiz/domain/activeinfo/domain/ActivePanel.java index 1c7abf2..e66fdb3 100644 --- a/src/main/java/blacktokkies/toquiz/activeinfo/domain/ActivePanel.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/domain/answer/api/AnswerApi.java b/src/main/java/blacktokkies/toquiz/domain/answer/api/AnswerApi.java new file mode 100644 index 0000000..e26af01 --- /dev/null +++ b/src/main/java/blacktokkies/toquiz/domain/answer/api/AnswerApi.java @@ -0,0 +1,4 @@ +package blacktokkies.toquiz.domain.answer.api; + +public class AnswerApi { +} diff --git a/src/main/java/blacktokkies/toquiz/answer/domain/Answer.java b/src/main/java/blacktokkies/toquiz/domain/answer/domain/Answer.java similarity index 72% rename from src/main/java/blacktokkies/toquiz/answer/domain/Answer.java rename to src/main/java/blacktokkies/toquiz/domain/answer/domain/Answer.java index 89cb808..2fb390b 100644 --- a/src/main/java/blacktokkies/toquiz/answer/domain/Answer.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/auth/AuthController.java b/src/main/java/blacktokkies/toquiz/domain/member/api/AuthApi.java similarity index 59% rename from src/main/java/blacktokkies/toquiz/auth/AuthController.java rename to src/main/java/blacktokkies/toquiz/domain/member/api/AuthApi.java index ccd9d7e..1fed526 100644 --- a/src/main/java/blacktokkies/toquiz/auth/AuthController.java +++ b/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 signUp(@RequestBody @Valid SignUpRequestDto signUpRequestDto) { - authService.signUp(signUpRequestDto); + ResponseEntity signUp(@RequestBody @Valid SignUpRequest signUpRequest) { + authService.signUp(signUpRequest); return ResponseEntity.ok(SuccessMessage.SIGN_UP); } @PostMapping("/api/auth/login") - ResponseEntity> login(@RequestBody @Valid LoginRequestDto loginRequestDto, + ResponseEntity> 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 logout(HttpServletResponse response){ } @PostMapping ("/api/auth/refresh") - ResponseEntity> refresh(@CookieValue(name = "refresh_token", required = false) String refreshToken, HttpServletResponse response){ - AuthenticateResponseDto refreshResponse = authService.refresh(refreshToken); + ResponseEntity> refresh(@CookieValue(name = "refresh_token", required = false) String refreshToken, HttpServletResponse response){ + AuthenticateResponse refreshResponse = authService.refresh(refreshToken); response.addCookie(cookieService.issueRefreshTokenCookie(refreshResponse.getEmail())); diff --git a/src/main/java/blacktokkies/toquiz/domain/member/api/MemberApi.java b/src/main/java/blacktokkies/toquiz/domain/member/api/MemberApi.java new file mode 100644 index 0000000..7d7d9af --- /dev/null +++ b/src/main/java/blacktokkies/toquiz/domain/member/api/MemberApi.java @@ -0,0 +1,4 @@ +package blacktokkies.toquiz.domain.member.api; + +public class MemberApi { +} diff --git a/src/main/java/blacktokkies/toquiz/auth/AuthService.java b/src/main/java/blacktokkies/toquiz/domain/member/application/AuthService.java similarity index 64% rename from src/main/java/blacktokkies/toquiz/auth/AuthService.java rename to src/main/java/blacktokkies/toquiz/domain/member/application/AuthService.java index 48d47d9..a5a614b 100644 --- a/src/main/java/blacktokkies/toquiz/auth/AuthService.java +++ b/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,23 +27,23 @@ 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(){ @@ -51,7 +51,7 @@ public void logout(){ 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) { diff --git a/src/main/java/blacktokkies/toquiz/member/MemberRepository.java b/src/main/java/blacktokkies/toquiz/domain/member/dao/MemberRepository.java similarity index 77% rename from src/main/java/blacktokkies/toquiz/member/MemberRepository.java rename to src/main/java/blacktokkies/toquiz/domain/member/dao/MemberRepository.java index cebb32b..26cc80d 100644 --- a/src/main/java/blacktokkies/toquiz/member/MemberRepository.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/member/domain/Member.java b/src/main/java/blacktokkies/toquiz/domain/member/domain/Member.java similarity index 92% rename from src/main/java/blacktokkies/toquiz/member/domain/Member.java rename to src/main/java/blacktokkies/toquiz/domain/member/domain/Member.java index f3b46fc..e6b5bb6 100644 --- a/src/main/java/blacktokkies/toquiz/member/domain/Member.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/auth/dto/request/LoginRequestDto.java b/src/main/java/blacktokkies/toquiz/domain/member/dto/request/LoginRequest.java similarity index 70% rename from src/main/java/blacktokkies/toquiz/auth/dto/request/LoginRequestDto.java rename to src/main/java/blacktokkies/toquiz/domain/member/dto/request/LoginRequest.java index 4f35f0b..03d15f3 100644 --- a/src/main/java/blacktokkies/toquiz/auth/dto/request/LoginRequestDto.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/auth/dto/request/SignUpRequestDto.java b/src/main/java/blacktokkies/toquiz/domain/member/dto/request/SignUpRequest.java similarity index 67% rename from src/main/java/blacktokkies/toquiz/auth/dto/request/SignUpRequestDto.java rename to src/main/java/blacktokkies/toquiz/domain/member/dto/request/SignUpRequest.java index 78bcfcb..eb9ef1d 100644 --- a/src/main/java/blacktokkies/toquiz/auth/dto/request/SignUpRequestDto.java +++ b/src/main/java/blacktokkies/toquiz/domain/member/dto/request/SignUpRequest.java @@ -1,8 +1,8 @@ -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; @@ -10,13 +10,13 @@ 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; diff --git a/src/main/java/blacktokkies/toquiz/auth/dto/response/AuthenticateResponseDto.java b/src/main/java/blacktokkies/toquiz/domain/member/dto/response/AuthenticateResponse.java similarity index 65% rename from src/main/java/blacktokkies/toquiz/auth/dto/response/AuthenticateResponseDto.java rename to src/main/java/blacktokkies/toquiz/domain/member/dto/response/AuthenticateResponse.java index 1f09561..6fa14fd 100644 --- a/src/main/java/blacktokkies/toquiz/auth/dto/response/AuthenticateResponseDto.java +++ b/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()) diff --git a/src/main/java/blacktokkies/toquiz/common/error/errorcode/AuthErrorCode.java b/src/main/java/blacktokkies/toquiz/domain/member/exception/MemberErrorCode.java similarity index 83% rename from src/main/java/blacktokkies/toquiz/common/error/errorcode/AuthErrorCode.java rename to src/main/java/blacktokkies/toquiz/domain/member/exception/MemberErrorCode.java index c6f8586..b1151a4 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/errorcode/AuthErrorCode.java +++ b/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, "비밀번호가 일치하지 않습니다."), diff --git a/src/main/java/blacktokkies/toquiz/member/domain/Provider.java b/src/main/java/blacktokkies/toquiz/domain/model/Provider.java similarity index 54% rename from src/main/java/blacktokkies/toquiz/member/domain/Provider.java rename to src/main/java/blacktokkies/toquiz/domain/model/Provider.java index e19672b..a9ddef1 100644 --- a/src/main/java/blacktokkies/toquiz/member/domain/Provider.java +++ b/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 diff --git a/src/main/java/blacktokkies/toquiz/domain/panel/api/PanelApi.java b/src/main/java/blacktokkies/toquiz/domain/panel/api/PanelApi.java new file mode 100644 index 0000000..1ca3fe3 --- /dev/null +++ b/src/main/java/blacktokkies/toquiz/domain/panel/api/PanelApi.java @@ -0,0 +1,5 @@ +package blacktokkies.toquiz.domain.panel.api; + +public class PanelApi { + +} diff --git a/src/main/java/blacktokkies/toquiz/panel/domain/Panel.java b/src/main/java/blacktokkies/toquiz/domain/panel/domain/Panel.java similarity index 76% rename from src/main/java/blacktokkies/toquiz/panel/domain/Panel.java rename to src/main/java/blacktokkies/toquiz/domain/panel/domain/Panel.java index 980e37d..90e4b54 100644 --- a/src/main/java/blacktokkies/toquiz/panel/domain/Panel.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/domain/question/api/QuestionApi.java b/src/main/java/blacktokkies/toquiz/domain/question/api/QuestionApi.java new file mode 100644 index 0000000..7a1e603 --- /dev/null +++ b/src/main/java/blacktokkies/toquiz/domain/question/api/QuestionApi.java @@ -0,0 +1,4 @@ +package blacktokkies.toquiz.domain.question.api; + +public class QuestionApi { +} diff --git a/src/main/java/blacktokkies/toquiz/question/domain/Question.java b/src/main/java/blacktokkies/toquiz/domain/question/domain/Question.java similarity index 77% rename from src/main/java/blacktokkies/toquiz/question/domain/Question.java rename to src/main/java/blacktokkies/toquiz/domain/question/domain/Question.java index e843e55..46804a1 100644 --- a/src/main/java/blacktokkies/toquiz/question/domain/Question.java +++ b/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 diff --git a/src/main/java/blacktokkies/toquiz/common/domain/BaseTime.java b/src/main/java/blacktokkies/toquiz/global/common/domain/BaseTime.java similarity index 92% rename from src/main/java/blacktokkies/toquiz/common/domain/BaseTime.java rename to src/main/java/blacktokkies/toquiz/global/common/domain/BaseTime.java index b6cdf18..45b6393 100644 --- a/src/main/java/blacktokkies/toquiz/common/domain/BaseTime.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/common/error/handler/GlobalExceptionHandler.java b/src/main/java/blacktokkies/toquiz/global/common/error/GlobalExceptionHandler.java similarity index 92% rename from src/main/java/blacktokkies/toquiz/common/error/handler/GlobalExceptionHandler.java rename to src/main/java/blacktokkies/toquiz/global/common/error/GlobalExceptionHandler.java index e434d53..98133dc 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/handler/GlobalExceptionHandler.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/common/error/exception/RestApiException.java b/src/main/java/blacktokkies/toquiz/global/common/error/RestApiException.java similarity index 62% rename from src/main/java/blacktokkies/toquiz/common/error/exception/RestApiException.java rename to src/main/java/blacktokkies/toquiz/global/common/error/RestApiException.java index 34e2df4..04cd12d 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/exception/RestApiException.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/common/error/errorcode/CommonErrorCode.java b/src/main/java/blacktokkies/toquiz/global/common/error/errorcode/CommonErrorCode.java similarity index 89% rename from src/main/java/blacktokkies/toquiz/common/error/errorcode/CommonErrorCode.java rename to src/main/java/blacktokkies/toquiz/global/common/error/errorcode/CommonErrorCode.java index 5e20a54..87f7081 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/errorcode/CommonErrorCode.java +++ b/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; diff --git a/src/main/java/blacktokkies/toquiz/common/error/errorcode/ErrorCode.java b/src/main/java/blacktokkies/toquiz/global/common/error/errorcode/ErrorCode.java similarity index 72% rename from src/main/java/blacktokkies/toquiz/common/error/errorcode/ErrorCode.java rename to src/main/java/blacktokkies/toquiz/global/common/error/errorcode/ErrorCode.java index 906f50a..f782e19 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/errorcode/ErrorCode.java +++ b/src/main/java/blacktokkies/toquiz/global/common/error/errorcode/ErrorCode.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.error.errorcode; +package blacktokkies.toquiz.global.common.error.errorcode; import org.springframework.http.HttpStatus; diff --git a/src/main/java/blacktokkies/toquiz/filter/JwtAuthenticationFilter.java b/src/main/java/blacktokkies/toquiz/global/common/filter/JwtAuthenticationFilter.java similarity index 93% rename from src/main/java/blacktokkies/toquiz/filter/JwtAuthenticationFilter.java rename to src/main/java/blacktokkies/toquiz/global/common/filter/JwtAuthenticationFilter.java index 6baf134..990e907 100644 --- a/src/main/java/blacktokkies/toquiz/filter/JwtAuthenticationFilter.java +++ b/src/main/java/blacktokkies/toquiz/global/common/filter/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ -package blacktokkies.toquiz.filter; +package blacktokkies.toquiz.global.common.filter; -import blacktokkies.toquiz.common.error.exception.RestApiException; -import blacktokkies.toquiz.helper.token.JwtService; +import blacktokkies.toquiz.global.common.error.RestApiException; +import blacktokkies.toquiz.global.util.auth.JwtService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/blacktokkies/toquiz/interceptor/LoggingInterceptor.java b/src/main/java/blacktokkies/toquiz/global/common/interceptor/LoggingInterceptor.java similarity index 90% rename from src/main/java/blacktokkies/toquiz/interceptor/LoggingInterceptor.java rename to src/main/java/blacktokkies/toquiz/global/common/interceptor/LoggingInterceptor.java index 39dfd44..f1f7bd9 100644 --- a/src/main/java/blacktokkies/toquiz/interceptor/LoggingInterceptor.java +++ b/src/main/java/blacktokkies/toquiz/global/common/interceptor/LoggingInterceptor.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.interceptor; +package blacktokkies.toquiz.global.common.interceptor; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/blacktokkies/toquiz/common/error/response/ErrorResponse.java b/src/main/java/blacktokkies/toquiz/global/common/response/ErrorResponse.java similarity index 94% rename from src/main/java/blacktokkies/toquiz/common/error/response/ErrorResponse.java rename to src/main/java/blacktokkies/toquiz/global/common/response/ErrorResponse.java index 6ee4d5b..cb20f74 100644 --- a/src/main/java/blacktokkies/toquiz/common/error/response/ErrorResponse.java +++ b/src/main/java/blacktokkies/toquiz/global/common/response/ErrorResponse.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.error.response; +package blacktokkies.toquiz.global.common.response; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Builder; diff --git a/src/main/java/blacktokkies/toquiz/common/success/SuccessMessage.java b/src/main/java/blacktokkies/toquiz/global/common/response/SuccessMessage.java similarity index 90% rename from src/main/java/blacktokkies/toquiz/common/success/SuccessMessage.java rename to src/main/java/blacktokkies/toquiz/global/common/response/SuccessMessage.java index 1d21311..7c6dede 100644 --- a/src/main/java/blacktokkies/toquiz/common/success/SuccessMessage.java +++ b/src/main/java/blacktokkies/toquiz/global/common/response/SuccessMessage.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.success; +package blacktokkies.toquiz.global.common.response; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; diff --git a/src/main/java/blacktokkies/toquiz/common/success/SuccessResponse.java b/src/main/java/blacktokkies/toquiz/global/common/response/SuccessResponse.java similarity index 87% rename from src/main/java/blacktokkies/toquiz/common/success/SuccessResponse.java rename to src/main/java/blacktokkies/toquiz/global/common/response/SuccessResponse.java index d1c86ac..db2ce07 100644 --- a/src/main/java/blacktokkies/toquiz/common/success/SuccessResponse.java +++ b/src/main/java/blacktokkies/toquiz/global/common/response/SuccessResponse.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.success; +package blacktokkies.toquiz.global.common.response; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Getter; diff --git a/src/main/java/blacktokkies/toquiz/common/validation/ValidationErrorMessage.java b/src/main/java/blacktokkies/toquiz/global/common/validation/ValidationErrorMessage.java similarity index 94% rename from src/main/java/blacktokkies/toquiz/common/validation/ValidationErrorMessage.java rename to src/main/java/blacktokkies/toquiz/global/common/validation/ValidationErrorMessage.java index 5ffbda3..12012bc 100644 --- a/src/main/java/blacktokkies/toquiz/common/validation/ValidationErrorMessage.java +++ b/src/main/java/blacktokkies/toquiz/global/common/validation/ValidationErrorMessage.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.validation; +package blacktokkies.toquiz.global.common.validation; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/blacktokkies/toquiz/common/validation/ValidationFormat.java b/src/main/java/blacktokkies/toquiz/global/common/validation/ValidationFormat.java similarity index 82% rename from src/main/java/blacktokkies/toquiz/common/validation/ValidationFormat.java rename to src/main/java/blacktokkies/toquiz/global/common/validation/ValidationFormat.java index 0cbc2d5..2c635c8 100644 --- a/src/main/java/blacktokkies/toquiz/common/validation/ValidationFormat.java +++ b/src/main/java/blacktokkies/toquiz/global/common/validation/ValidationFormat.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.common.validation; +package blacktokkies.toquiz.global.common.validation; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/blacktokkies/toquiz/config/ApplicationConfig.java b/src/main/java/blacktokkies/toquiz/global/config/ApplicationConfig.java similarity index 94% rename from src/main/java/blacktokkies/toquiz/config/ApplicationConfig.java rename to src/main/java/blacktokkies/toquiz/global/config/ApplicationConfig.java index e8dd14f..5cea51e 100644 --- a/src/main/java/blacktokkies/toquiz/config/ApplicationConfig.java +++ b/src/main/java/blacktokkies/toquiz/global/config/ApplicationConfig.java @@ -1,6 +1,6 @@ -package blacktokkies.toquiz.config; +package blacktokkies.toquiz.global.config; -import blacktokkies.toquiz.member.MemberRepository; +import blacktokkies.toquiz.domain.member.dao.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/blacktokkies/toquiz/config/WebConfig.java b/src/main/java/blacktokkies/toquiz/global/config/WebConfig.java similarity index 82% rename from src/main/java/blacktokkies/toquiz/config/WebConfig.java rename to src/main/java/blacktokkies/toquiz/global/config/WebConfig.java index 1ea0771..f6cc4f5 100644 --- a/src/main/java/blacktokkies/toquiz/config/WebConfig.java +++ b/src/main/java/blacktokkies/toquiz/global/config/WebConfig.java @@ -1,6 +1,6 @@ -package blacktokkies.toquiz.config; +package blacktokkies.toquiz.global.config; -import blacktokkies.toquiz.interceptor.LoggingInterceptor; +import blacktokkies.toquiz.global.common.interceptor.LoggingInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; diff --git a/src/main/java/blacktokkies/toquiz/config/secure/CustomAuthenticationEntryPoint.java b/src/main/java/blacktokkies/toquiz/global/config/security/CustomAuthenticationEntryPoint.java similarity index 84% rename from src/main/java/blacktokkies/toquiz/config/secure/CustomAuthenticationEntryPoint.java rename to src/main/java/blacktokkies/toquiz/global/config/security/CustomAuthenticationEntryPoint.java index 6dd60c1..3e58197 100644 --- a/src/main/java/blacktokkies/toquiz/config/secure/CustomAuthenticationEntryPoint.java +++ b/src/main/java/blacktokkies/toquiz/global/config/security/CustomAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package blacktokkies.toquiz.config.secure; +package blacktokkies.toquiz.global.config.security; -import blacktokkies.toquiz.common.error.errorcode.ErrorCode; -import blacktokkies.toquiz.common.error.response.ErrorResponse; +import blacktokkies.toquiz.global.common.error.errorcode.ErrorCode; +import blacktokkies.toquiz.global.common.response.ErrorResponse; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; @@ -14,7 +14,7 @@ import java.io.IOException; -import static blacktokkies.toquiz.common.error.errorcode.AuthErrorCode.INVALID_ACCESS_TOKEN; +import static blacktokkies.toquiz.domain.member.exception.MemberErrorCode.INVALID_ACCESS_TOKEN; @Slf4j @Component diff --git a/src/main/java/blacktokkies/toquiz/config/secure/SecurityConfig.java b/src/main/java/blacktokkies/toquiz/global/config/security/SecurityConfig.java similarity index 95% rename from src/main/java/blacktokkies/toquiz/config/secure/SecurityConfig.java rename to src/main/java/blacktokkies/toquiz/global/config/security/SecurityConfig.java index f5284a8..3f0e54b 100644 --- a/src/main/java/blacktokkies/toquiz/config/secure/SecurityConfig.java +++ b/src/main/java/blacktokkies/toquiz/global/config/security/SecurityConfig.java @@ -1,6 +1,6 @@ -package blacktokkies.toquiz.config.secure; +package blacktokkies.toquiz.global.config.security; -import blacktokkies.toquiz.filter.JwtAuthenticationFilter; +import blacktokkies.toquiz.global.common.filter.JwtAuthenticationFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/blacktokkies/toquiz/helper/CookieService.java b/src/main/java/blacktokkies/toquiz/global/util/auth/CookieService.java similarity index 75% rename from src/main/java/blacktokkies/toquiz/helper/CookieService.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/CookieService.java index a023d06..5025e0a 100644 --- a/src/main/java/blacktokkies/toquiz/helper/CookieService.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/CookieService.java @@ -1,12 +1,9 @@ -package blacktokkies.toquiz.helper; - -import blacktokkies.toquiz.common.error.errorcode.AuthErrorCode; -import blacktokkies.toquiz.common.error.exception.RestApiException; -import blacktokkies.toquiz.helper.token.JwtService; -import blacktokkies.toquiz.helper.token.RefreshToken; -import blacktokkies.toquiz.helper.token.RefreshTokenService; -import blacktokkies.toquiz.member.MemberRepository; -import blacktokkies.toquiz.member.domain.Member; +package blacktokkies.toquiz.global.util.auth; + +import blacktokkies.toquiz.domain.member.exception.MemberErrorCode; +import blacktokkies.toquiz.global.common.error.RestApiException; +import blacktokkies.toquiz.domain.member.dao.MemberRepository; +import blacktokkies.toquiz.domain.member.domain.Member; import jakarta.servlet.http.Cookie; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -25,7 +22,7 @@ public class CookieService { public Cookie issueActiveInfoIdCookie(String email){ Member member = memberRepository.findByEmail(email) - .orElseThrow(() -> new RestApiException(AuthErrorCode.NOT_EXIST_MEMBER)); + .orElseThrow(() -> new RestApiException(MemberErrorCode.NOT_EXIST_MEMBER)); String activeInfoId = member.getActiveInfoId(); diff --git a/src/main/java/blacktokkies/toquiz/helper/token/JwtService.java b/src/main/java/blacktokkies/toquiz/global/util/auth/JwtService.java similarity index 93% rename from src/main/java/blacktokkies/toquiz/helper/token/JwtService.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/JwtService.java index bb902bd..91ec6c6 100644 --- a/src/main/java/blacktokkies/toquiz/helper/token/JwtService.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/JwtService.java @@ -1,6 +1,6 @@ -package blacktokkies.toquiz.helper.token; +package blacktokkies.toquiz.global.util.auth; -import blacktokkies.toquiz.common.error.exception.RestApiException; +import blacktokkies.toquiz.global.common.error.RestApiException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.function.Function; -import static blacktokkies.toquiz.common.error.errorcode.AuthErrorCode.INVALID_REFRESH_TOKEN; +import static blacktokkies.toquiz.domain.member.exception.MemberErrorCode.INVALID_REFRESH_TOKEN; @Service public class JwtService { diff --git a/src/main/java/blacktokkies/toquiz/helper/PasswordEncryptor.java b/src/main/java/blacktokkies/toquiz/global/util/auth/PasswordEncryptor.java similarity index 92% rename from src/main/java/blacktokkies/toquiz/helper/PasswordEncryptor.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/PasswordEncryptor.java index ab2292d..e4eb3a0 100644 --- a/src/main/java/blacktokkies/toquiz/helper/PasswordEncryptor.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/PasswordEncryptor.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.helper; +package blacktokkies.toquiz.global.util.auth; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/blacktokkies/toquiz/helper/token/RefreshToken.java b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshToken.java similarity index 94% rename from src/main/java/blacktokkies/toquiz/helper/token/RefreshToken.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/RefreshToken.java index a3051cd..a7567b6 100644 --- a/src/main/java/blacktokkies/toquiz/helper/token/RefreshToken.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshToken.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.helper.token; +package blacktokkies.toquiz.global.util.auth; import jakarta.persistence.Id; import lombok.AllArgsConstructor; diff --git a/src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenRepository.java b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenRepository.java similarity index 83% rename from src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenRepository.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenRepository.java index e1841bb..a995048 100644 --- a/src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenRepository.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenRepository.java @@ -1,4 +1,4 @@ -package blacktokkies.toquiz.helper.token; +package blacktokkies.toquiz.global.util.auth; import org.springframework.data.repository.CrudRepository; diff --git a/src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenService.java b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenService.java similarity index 89% rename from src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenService.java rename to src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenService.java index 5d03204..e6f0f03 100644 --- a/src/main/java/blacktokkies/toquiz/helper/token/RefreshTokenService.java +++ b/src/main/java/blacktokkies/toquiz/global/util/auth/RefreshTokenService.java @@ -1,6 +1,6 @@ -package blacktokkies.toquiz.helper.token; +package blacktokkies.toquiz.global.util.auth; -import blacktokkies.toquiz.common.error.exception.RestApiException; +import blacktokkies.toquiz.global.common.error.RestApiException; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -8,7 +8,7 @@ import java.util.Optional; -import static blacktokkies.toquiz.common.error.errorcode.AuthErrorCode.INVALID_REFRESH_TOKEN; +import static blacktokkies.toquiz.domain.member.exception.MemberErrorCode.INVALID_REFRESH_TOKEN; @Service @RequiredArgsConstructor diff --git a/src/main/java/blacktokkies/toquiz/member/MemberController.java b/src/main/java/blacktokkies/toquiz/member/MemberController.java deleted file mode 100644 index 3df3436..0000000 --- a/src/main/java/blacktokkies/toquiz/member/MemberController.java +++ /dev/null @@ -1,4 +0,0 @@ -package blacktokkies.toquiz.member; - -public class MemberController { -} diff --git a/src/main/java/blacktokkies/toquiz/panel/PanelController.java b/src/main/java/blacktokkies/toquiz/panel/PanelController.java deleted file mode 100644 index 699cf65..0000000 --- a/src/main/java/blacktokkies/toquiz/panel/PanelController.java +++ /dev/null @@ -1,5 +0,0 @@ -package blacktokkies.toquiz.panel; - -public class PanelController { - -} diff --git a/src/main/java/blacktokkies/toquiz/question/QuestionController.java b/src/main/java/blacktokkies/toquiz/question/QuestionController.java deleted file mode 100644 index c4a4456..0000000 --- a/src/main/java/blacktokkies/toquiz/question/QuestionController.java +++ /dev/null @@ -1,4 +0,0 @@ -package blacktokkies.toquiz.question; - -public class QuestionController { -}