Merge pull request #30 from MEME-UMC/refactor/#29

Merge Refactor/#29 into main

build.gradle

@@ -49,8 +49,6 @@ dependencies {
 
 	// Swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
-
-
 }
 
 tasks.named('test') {

src/main/java/umc/meme/auth/domain/artist/entity/Artist.java

@@ -12,7 +12,6 @@
 import umc.meme.auth.global.enums.Region;
 import umc.meme.auth.global.enums.WorkExperience;
 import umc.meme.auth.domain.user.entity.User;
-import umc.meme.auth.domain.user.dto.UserRequest;
 import umc.meme.auth.global.enums.DayOfWeek;
 import umc.meme.auth.global.enums.Times;
 
@@ -60,24 +59,24 @@ public class Artist extends User {
     private Map<DayOfWeek, Times> availableDayOfWeekAndTime;
 
     public void update(AuthRequest.ArtistExtraDto joinDto) {
-        if (joinDto.getProfileImg() != null)
-            this.profileImg = joinDto.getProfileImg();
+        if (joinDto.getProfile_img() != null)
+            this.profileImg = joinDto.getProfile_img();
         if (joinDto.getNickname() != null)
             this.nickname = joinDto.getNickname();
         if (joinDto.getGender() != null)
             this.gender = joinDto.getGender();
         if (joinDto.getIntroduction() != null)
             this.introduction = joinDto.getIntroduction();
-        if (joinDto.getWorkExperience() != null)
-            this.workExperience = joinDto.getWorkExperience();
+        if (joinDto.getWork_experience() != null)
+            this.workExperience = joinDto.getWork_experience();
         if (joinDto.getRegion() != null)
             this.region = joinDto.getRegion();
         if (joinDto.getSpecialization() != null)
             this.specialization = joinDto.getSpecialization();
-        if (joinDto.getMakeupLocation() != null)
-            this.makeupLocation = joinDto.getMakeupLocation();
-        if (joinDto.getShopLocation() != null)
-            this.shopLocation = joinDto.getShopLocation();
+        if (joinDto.getMakeup_location() != null)
+            this.makeupLocation = joinDto.getMakeup_location();
+        if (joinDto.getShop_location() != null)
+            this.shopLocation = joinDto.getShop_location();
         if (joinDto.getAvailableDayOfWeekAndTime() != null)
             this.availableDayOfWeekAndTime = joinDto.getAvailableDayOfWeekAndTime();
     }

src/main/java/umc/meme/auth/global/auth/AuthController.java

@@ -10,7 +10,7 @@
 import umc.meme.auth.global.common.BaseResponseDto;
 import umc.meme.auth.global.common.status.ErrorStatus;
 import umc.meme.auth.global.common.status.SuccessStatus;
-import umc.meme.auth.global.exception.handler.AuthException;
+import umc.meme.auth.global.exception.AuthException;
 
 @RequiredArgsConstructor
 @RestController

src/main/java/umc/meme/auth/global/auth/AuthService.java

@@ -23,12 +23,12 @@
 import umc.meme.auth.global.enums.Provider;
 import umc.meme.auth.global.enums.UserStatus;
 import umc.meme.auth.global.exception.GeneralException;
-import umc.meme.auth.global.exception.handler.AuthException;
+import umc.meme.auth.global.exception.AuthException;
 import umc.meme.auth.global.infra.RedisRepository;
 import umc.meme.auth.global.jwt.JwtTokenProvider;
-import umc.meme.auth.global.oauth.OAuthService;
-import umc.meme.auth.global.oauth.apple.AppleAuthService;
-import umc.meme.auth.global.oauth.kakao.KakaoAuthService;
+import umc.meme.auth.global.oauth.service.OAuthService;
+import umc.meme.auth.global.oauth.service.apple.AppleAuthService;
+import umc.meme.auth.global.oauth.service.kakao.KakaoAuthService;
 
 import java.time.LocalDate;
 import java.util.stream.Collectors;
@@ -63,12 +63,12 @@ public AuthResponse.TokenDto signupModel(AuthRequest.ModelJoinDto modelJoinDto)
         User user = Model.builder()
                 .email(userEmail)
                 .provider(modelJoinDto.getProvider())
-                .profileImg(modelJoinDto.getProfileImg())
+                .profileImg(modelJoinDto.getProfile_img())
                 .username(modelJoinDto.getUsername())
                 .nickname(nickName)
                 .gender(modelJoinDto.getGender())
-                .skinType(modelJoinDto.getSkinType())
-                .personalColor(modelJoinDto.getPersonalColor())
+                .skinType(modelJoinDto.getSkin_type())
+                .personalColor(modelJoinDto.getPersonal_color())
                 .password(SecurityConfig.passwordEncoder().encode(userEmail))
                 .role("MODEL")
                 .inactiveDate(LocalDate.of(2099,12,31))
@@ -96,7 +96,7 @@ public AuthResponse.TokenDto signupArtist(AuthRequest.ArtistJoinDto artistJoinDt
         User user = Artist.builder()
                 .email(userEmail)
                 .provider(artistJoinDto.getProvider())
-                .profileImg(artistJoinDto.getProfileImg())
+                .profileImg(artistJoinDto.getProfile_img())
                 .username(artistJoinDto.getUsername())
                 .nickname(nickName)
                 .password(SecurityConfig.passwordEncoder().encode(userEmail))
@@ -118,7 +118,7 @@ public AuthResponse.TokenDto signupArtist(AuthRequest.ArtistJoinDto artistJoinDt
 
     @Transactional
     public void signupArtistExtra(AuthRequest.ArtistExtraDto artistExtraDto) {
-        Artist artist = artistRepository.findById(artistExtraDto.getUserId())
+        Artist artist = artistRepository.findById(artistExtraDto.getUser_id())
                 .orElseThrow(() -> new AuthException(ARTIST_NOT_FOUND));
         artist.update(artistExtraDto);
     }
@@ -160,8 +160,8 @@ private String getUser(String idToken, Provider provider) throws AuthException {
 
     @Transactional
     public AuthResponse.TokenDto reissue(AuthRequest.ReissueDto reissueDto) throws AuthException {
-        String requestAccessToken = reissueDto.getAccessToken();
-        String requestRefreshToken = reissueDto.getRefreshToken();
+        String requestAccessToken = reissueDto.getAccess_token();
+        String requestRefreshToken = reissueDto.getRefresh_token();
 
         Token requestToken = tokenRepository.findByAccessToken(requestAccessToken)
                 .orElseThrow(() -> new AuthException(CANNOT_FOUND_USER));

src/main/java/umc/meme/auth/global/auth/PrincipalDetailsService.java

@@ -7,7 +7,6 @@
 import org.springframework.stereotype.Service;
 import umc.meme.auth.domain.user.entity.User;
 import umc.meme.auth.domain.user.entity.UserRepository;
-import umc.meme.auth.global.common.status.ErrorStatus;
 
 @RequiredArgsConstructor
 @Service

src/main/java/umc/meme/auth/global/auth/dto/AuthRequest.java

@@ -17,13 +17,13 @@ public static class ModelJoinDto {
         private String id_token;
         private Provider provider;
 
-        private String profileImg;
+        private String profile_img;
         private String username;
         private String nickname;
 
         private Gender gender;
-        private SkinType skinType;
-        private PersonalColor personalColor;
+        private SkinType skin_type;
+        private PersonalColor personal_color;
     }
 
     @Data @Builder
@@ -33,7 +33,7 @@ public static class ArtistJoinDto {
         private String id_token;
         private Provider provider;
 
-        private String profileImg;
+        private String profile_img;
         private String username;
         private String nickname;
     }
@@ -42,16 +42,16 @@ public static class ArtistJoinDto {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class ArtistExtraDto {
-        private Long userId;
-        private String profileImg;
+        private Long user_id;
+        private String profile_img;
         private String nickname;
         private Gender gender;
         private String introduction;
-        private WorkExperience workExperience;
+        private WorkExperience work_experience;
         private List<Region> region;
         private List<Category> specialization;
-        private MakeupLocation makeupLocation;
-        private String shopLocation;
+        private MakeupLocation makeup_location;
+        private String shop_location;
         private Map<DayOfWeek, Times> availableDayOfWeekAndTime;
     }
 
@@ -67,8 +67,8 @@ public static class LoginDto {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class ReissueDto {
-        private String accessToken;
-        private String refreshToken;
+        private String access_token;
+        private String refresh_token;
     }
 
     @Data @Builder

src/main/java/umc/meme/auth/global/common/status/ErrorStatus.java

@@ -1,10 +1,7 @@
 package umc.meme.auth.global.common.status;
 
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.MalformedJwtException;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.apache.coyote.http2.HpackDecoder;
 import org.springframework.http.HttpStatus;
 import umc.meme.auth.global.common.BaseErrorCode;
 import umc.meme.auth.global.common.ErrorReasonDto;

src/main/java/umc/meme/auth/global/config/SecurityConfig.java

@@ -47,11 +47,12 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         authorizeHttpRequests
                                 .requestMatchers("/api/v1/signup/model").permitAll()
                                 .requestMatchers("/api/v1/signup/artist").permitAll()
-                                .requestMatchers("/api/v1/auth/artist/extra").permitAll()
                                 .requestMatchers("/api/v1/reissue").permitAll()
+
+                                .requestMatchers("/api/v1/auth/artist/extra").permitAll()
                                 .requestMatchers("/api/v1/auth/logout").permitAll()
                                 .requestMatchers("/api/v1/auth/withdraw").permitAll()
-                                .requestMatchers("/auth/**").permitAll()
+                                .requestMatchers("/api/v2/**").permitAll()
                 );
 
 

src/main/java/umc/meme/auth/global/config/SwaggerConfig.java

@@ -11,13 +11,13 @@
 
 @Configuration
 public class SwaggerConfig {
-    // http://localhost:8080/swagger-ui/index.html#/
+    // http://localhost:8080/api/v2/swagger-ui/index.html#/
     @Bean
     public OpenAPI MemeAPI() {
         Info info = new Info()
-                .title("MEME_SERVICE API Docs")
-                .description("MEME_SERVICE API 명세서입니다.")
-                .version("1.0.0");
+                .title("MEME_AUTH API Docs")
+                .description("MEME_AUTH API 명세서")
+                .version("2.0.0");
 
         String jwtSchemeName = "accessToken";
         // API 요청헤더에 인증정보 포함
@@ -32,7 +32,7 @@ public OpenAPI MemeAPI() {
                         .bearerFormat("JWT"));
 
         return new OpenAPI()
-                .addServersItem(new Server().url("/auth/swagger-ui/"))
+                .addServersItem(new Server().url("/"))
                 .info(info)
                 .addSecurityItem(securityRequirement)
                 .components(components);

src/main/java/umc/meme/auth/global/exception/handler/AuthException.java → src/main/java/umc/meme/auth/global/exception/AuthException.java

@@ -1,7 +1,6 @@
-package umc.meme.auth.global.exception.handler;
+package umc.meme.auth.global.exception;
 
 import umc.meme.auth.global.common.BaseErrorCode;
-import umc.meme.auth.global.exception.GeneralException;
 
 public class AuthException extends GeneralException {
     public AuthException(BaseErrorCode errorCode) {

src/main/java/umc/meme/auth/global/exception/ControllerAdvice.java → src/main/java/umc/meme/auth/global/exception/handler/ControllerAdvice.java

@@ -1,10 +1,10 @@
-package umc.meme.auth.global.exception;
+package umc.meme.auth.global.exception.handler;
 
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import umc.meme.auth.global.common.BaseResponseDto;
 import umc.meme.auth.global.common.status.ErrorStatus;
-import umc.meme.auth.global.exception.handler.AuthException;
+import umc.meme.auth.global.exception.AuthException;
 
 @RestControllerAdvice
 public class ControllerAdvice {

src/main/java/umc/meme/auth/global/infra/RedisRepository.java

@@ -3,7 +3,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Repository;
-import umc.meme.auth.global.oauth.jwk.PublicKeyDto;
+import umc.meme.auth.global.oauth.jsonwebkey.PublicKeyDto;
 
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;

src/main/java/umc/meme/auth/global/jwt/JwtAccessDeniedHandler.java

@@ -1,7 +1,6 @@
 package umc.meme.auth.global.jwt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.HttpStatus;

src/main/java/umc/meme/auth/global/oauth/jwk/JsonWebKey.java → src/main/java/umc/meme/auth/global/oauth/jsonwebkey/JsonWebKey.java

@@ -1,4 +1,4 @@
-package umc.meme.auth.global.oauth.jwk;
+package umc.meme.auth.global.oauth.jsonwebkey;
 
 import lombok.Builder;
 import lombok.NoArgsConstructor;

src/main/java/umc/meme/auth/global/oauth/jwk/PublicKeyDto.java → src/main/java/umc/meme/auth/global/oauth/jsonwebkey/PublicKeyDto.java

@@ -1,4 +1,4 @@
-package umc.meme.auth.global.oauth.jwk;
+package umc.meme.auth.global.oauth.jsonwebkey;
 
 import lombok.Builder;
 

src/main/java/umc/meme/auth/global/oauth/OAuthService.java → src/main/java/umc/meme/auth/global/oauth/service/OAuthService.java

@@ -1,19 +1,17 @@
-package umc.meme.auth.global.oauth;
+package umc.meme.auth.global.oauth.service;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.io.Decoders;
-import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import umc.meme.auth.domain.user.entity.User;
 import umc.meme.auth.domain.user.entity.UserRepository;
 import umc.meme.auth.global.common.status.ErrorStatus;
-import umc.meme.auth.global.exception.handler.AuthException;
-import umc.meme.auth.global.oauth.jwk.JsonWebKey;
+import umc.meme.auth.global.exception.AuthException;
+import umc.meme.auth.global.oauth.jsonwebkey.JsonWebKey;
 
 import java.io.IOException;
 import java.math.BigInteger;

src/main/java/umc/meme/auth/global/oauth/apple/AppleAuthService.java → src/main/java/umc/meme/auth/global/oauth/service/apple/AppleAuthService.java

@@ -1,15 +1,15 @@
-package umc.meme.auth.global.oauth.apple;
+package umc.meme.auth.global.oauth.service.apple;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.SignatureException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import umc.meme.auth.domain.user.entity.UserRepository;
 import umc.meme.auth.global.common.status.ErrorStatus;
-import umc.meme.auth.global.exception.handler.AuthException;
+import umc.meme.auth.global.exception.AuthException;
 import umc.meme.auth.global.infra.RedisRepository;
-import umc.meme.auth.global.oauth.OAuthService;
-import umc.meme.auth.global.oauth.jwk.PublicKeyDto;
+import umc.meme.auth.global.oauth.service.OAuthService;
+import umc.meme.auth.global.oauth.jsonwebkey.PublicKeyDto;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/umc/meme/auth/global/oauth/kakao/KakaoAuthService.java → src/main/java/umc/meme/auth/global/oauth/service/kakao/KakaoAuthService.java

@@ -1,15 +1,15 @@
-package umc.meme.auth.global.oauth.kakao;
+package umc.meme.auth.global.oauth.service.kakao;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.SignatureException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import umc.meme.auth.domain.user.entity.UserRepository;
 import umc.meme.auth.global.common.status.ErrorStatus;
-import umc.meme.auth.global.exception.handler.AuthException;
+import umc.meme.auth.global.exception.AuthException;
 import umc.meme.auth.global.infra.RedisRepository;
-import umc.meme.auth.global.oauth.OAuthService;
-import umc.meme.auth.global.oauth.jwk.PublicKeyDto;
+import umc.meme.auth.global.oauth.service.OAuthService;
+import umc.meme.auth.global.oauth.jsonwebkey.PublicKeyDto;
 
 import java.io.BufferedReader;
 import java.io.IOException;