From 0716a69f62ddba185623b64e731485f8036aa7b7 Mon Sep 17 00:00:00 2001 From: Lee junbeom Date: Sat, 15 Jun 2024 17:37:48 +0900 Subject: [PATCH] =?UTF-8?q?entity=20=EC=9D=B4=EB=A6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/fiurinee/domain/jwt/utils/JwtUtils.java | 4 ++-- .../example/fiurinee/domain/member/dto/MemberDto.java | 2 +- .../domain/member/{data => entity}/Member.java | 3 +-- .../member/{data => entity}/PrincipalDetail.java | 2 +- .../fiurinee/domain/member/{data => entity}/Role.java | 2 +- .../domain/member/repository/MemberRepository.java | 2 +- .../fiurinee/domain/member/service/MemberService.java | 4 +--- .../domain/oauth2/controller/OAuth2Controller.java | 4 +--- .../domain/oauth2/{data => entity}/KakaoUserInfo.java | 2 +- .../domain/oauth2/service/OAuth2UserService.java | 11 ++++------- .../java/com/example/fiurinee/global/api/CallApi.java | 7 +------ .../security/handler/CommonLoginSuccessHandler.java | 2 +- 12 files changed, 16 insertions(+), 29 deletions(-) rename src/main/java/com/example/fiurinee/domain/member/{data => entity}/Member.java (90%) rename src/main/java/com/example/fiurinee/domain/member/{data => entity}/PrincipalDetail.java (97%) rename src/main/java/com/example/fiurinee/domain/member/{data => entity}/Role.java (77%) rename src/main/java/com/example/fiurinee/domain/oauth2/{data => entity}/KakaoUserInfo.java (93%) diff --git a/src/main/java/com/example/fiurinee/domain/jwt/utils/JwtUtils.java b/src/main/java/com/example/fiurinee/domain/jwt/utils/JwtUtils.java index b06b751..be3b18a 100644 --- a/src/main/java/com/example/fiurinee/domain/jwt/utils/JwtUtils.java +++ b/src/main/java/com/example/fiurinee/domain/jwt/utils/JwtUtils.java @@ -1,8 +1,8 @@ package com.example.fiurinee.domain.jwt.utils; import com.example.fiurinee.domain.jwt.exception.CustomExpiredJwtException; -import com.example.fiurinee.domain.member.data.PrincipalDetail; -import com.example.fiurinee.domain.member.data.Role; +import com.example.fiurinee.domain.member.entity.PrincipalDetail; +import com.example.fiurinee.domain.member.entity.Role; import com.example.fiurinee.domain.member.dto.MemberDto; import com.example.fiurinee.global.exception.CustomException; import io.jsonwebtoken.ExpiredJwtException; diff --git a/src/main/java/com/example/fiurinee/domain/member/dto/MemberDto.java b/src/main/java/com/example/fiurinee/domain/member/dto/MemberDto.java index 4930696..9a9d4e4 100644 --- a/src/main/java/com/example/fiurinee/domain/member/dto/MemberDto.java +++ b/src/main/java/com/example/fiurinee/domain/member/dto/MemberDto.java @@ -1,6 +1,6 @@ package com.example.fiurinee.domain.member.dto; -import com.example.fiurinee.domain.member.data.Role; +import com.example.fiurinee.domain.member.entity.Role; public record MemberDto( Long id, diff --git a/src/main/java/com/example/fiurinee/domain/member/data/Member.java b/src/main/java/com/example/fiurinee/domain/member/entity/Member.java similarity index 90% rename from src/main/java/com/example/fiurinee/domain/member/data/Member.java rename to src/main/java/com/example/fiurinee/domain/member/entity/Member.java index 7873173..0b23867 100644 --- a/src/main/java/com/example/fiurinee/domain/member/data/Member.java +++ b/src/main/java/com/example/fiurinee/domain/member/entity/Member.java @@ -1,11 +1,10 @@ -package com.example.fiurinee.domain.member.data; +package com.example.fiurinee.domain.member.entity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.security.oauth2.core.OAuth2AccessToken; @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/com/example/fiurinee/domain/member/data/PrincipalDetail.java b/src/main/java/com/example/fiurinee/domain/member/entity/PrincipalDetail.java similarity index 97% rename from src/main/java/com/example/fiurinee/domain/member/data/PrincipalDetail.java rename to src/main/java/com/example/fiurinee/domain/member/entity/PrincipalDetail.java index fb79d2e..35989b0 100644 --- a/src/main/java/com/example/fiurinee/domain/member/data/PrincipalDetail.java +++ b/src/main/java/com/example/fiurinee/domain/member/entity/PrincipalDetail.java @@ -1,4 +1,4 @@ -package com.example.fiurinee.domain.member.data; +package com.example.fiurinee.domain.member.entity; import com.example.fiurinee.domain.member.dto.MemberDto; import lombok.Data; diff --git a/src/main/java/com/example/fiurinee/domain/member/data/Role.java b/src/main/java/com/example/fiurinee/domain/member/entity/Role.java similarity index 77% rename from src/main/java/com/example/fiurinee/domain/member/data/Role.java rename to src/main/java/com/example/fiurinee/domain/member/entity/Role.java index 3909558..bdf6a02 100644 --- a/src/main/java/com/example/fiurinee/domain/member/data/Role.java +++ b/src/main/java/com/example/fiurinee/domain/member/entity/Role.java @@ -1,4 +1,4 @@ -package com.example.fiurinee.domain.member.data; +package com.example.fiurinee.domain.member.entity; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/fiurinee/domain/member/repository/MemberRepository.java b/src/main/java/com/example/fiurinee/domain/member/repository/MemberRepository.java index 3254f1f..c0de393 100644 --- a/src/main/java/com/example/fiurinee/domain/member/repository/MemberRepository.java +++ b/src/main/java/com/example/fiurinee/domain/member/repository/MemberRepository.java @@ -1,6 +1,6 @@ package com.example.fiurinee.domain.member.repository; -import com.example.fiurinee.domain.member.data.Member; +import com.example.fiurinee.domain.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/example/fiurinee/domain/member/service/MemberService.java b/src/main/java/com/example/fiurinee/domain/member/service/MemberService.java index f7a7faa..67a782b 100644 --- a/src/main/java/com/example/fiurinee/domain/member/service/MemberService.java +++ b/src/main/java/com/example/fiurinee/domain/member/service/MemberService.java @@ -1,6 +1,6 @@ package com.example.fiurinee.domain.member.service; -import com.example.fiurinee.domain.member.data.Member; +import com.example.fiurinee.domain.member.entity.Member; import com.example.fiurinee.domain.member.repository.MemberRepository; import com.example.fiurinee.global.exception.CustomException; import lombok.RequiredArgsConstructor; @@ -8,8 +8,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Service @Transactional(readOnly = true) @RequiredArgsConstructor diff --git a/src/main/java/com/example/fiurinee/domain/oauth2/controller/OAuth2Controller.java b/src/main/java/com/example/fiurinee/domain/oauth2/controller/OAuth2Controller.java index b014265..80124f1 100644 --- a/src/main/java/com/example/fiurinee/domain/oauth2/controller/OAuth2Controller.java +++ b/src/main/java/com/example/fiurinee/domain/oauth2/controller/OAuth2Controller.java @@ -1,11 +1,9 @@ package com.example.fiurinee.domain.oauth2.controller; -import com.example.fiurinee.domain.member.data.Member; -import com.example.fiurinee.domain.member.repository.MemberRepository; +import com.example.fiurinee.domain.member.entity.Member; import com.example.fiurinee.domain.member.service.MemberService; import com.example.fiurinee.domain.oauth2.dto.KakaoLogoutDto; import com.example.fiurinee.global.api.CallApi; -import com.google.gson.Gson; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatusCode; diff --git a/src/main/java/com/example/fiurinee/domain/oauth2/data/KakaoUserInfo.java b/src/main/java/com/example/fiurinee/domain/oauth2/entity/KakaoUserInfo.java similarity index 93% rename from src/main/java/com/example/fiurinee/domain/oauth2/data/KakaoUserInfo.java rename to src/main/java/com/example/fiurinee/domain/oauth2/entity/KakaoUserInfo.java index a5b7758..4f34253 100644 --- a/src/main/java/com/example/fiurinee/domain/oauth2/data/KakaoUserInfo.java +++ b/src/main/java/com/example/fiurinee/domain/oauth2/entity/KakaoUserInfo.java @@ -1,4 +1,4 @@ -package com.example.fiurinee.domain.oauth2.data; +package com.example.fiurinee.domain.oauth2.entity; import java.util.Map; diff --git a/src/main/java/com/example/fiurinee/domain/oauth2/service/OAuth2UserService.java b/src/main/java/com/example/fiurinee/domain/oauth2/service/OAuth2UserService.java index e0479cc..db58fcd 100644 --- a/src/main/java/com/example/fiurinee/domain/oauth2/service/OAuth2UserService.java +++ b/src/main/java/com/example/fiurinee/domain/oauth2/service/OAuth2UserService.java @@ -1,22 +1,19 @@ package com.example.fiurinee.domain.oauth2.service; -import com.example.fiurinee.domain.member.data.Member; -import com.example.fiurinee.domain.member.data.PrincipalDetail; -import com.example.fiurinee.domain.member.data.Role; +import com.example.fiurinee.domain.member.entity.Member; +import com.example.fiurinee.domain.member.entity.PrincipalDetail; +import com.example.fiurinee.domain.member.entity.Role; import com.example.fiurinee.domain.member.dto.MemberDto; import com.example.fiurinee.domain.member.repository.MemberRepository; -import com.example.fiurinee.domain.oauth2.data.KakaoUserInfo; +import com.example.fiurinee.domain.oauth2.entity.KakaoUserInfo; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; -import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; -import org.springframework.security.oauth2.core.OAuth2RefreshToken; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/fiurinee/global/api/CallApi.java b/src/main/java/com/example/fiurinee/global/api/CallApi.java index 0613747..11163a4 100644 --- a/src/main/java/com/example/fiurinee/global/api/CallApi.java +++ b/src/main/java/com/example/fiurinee/global/api/CallApi.java @@ -1,17 +1,12 @@ package com.example.fiurinee.global.api; -import com.example.fiurinee.domain.member.data.Member; +import com.example.fiurinee.domain.member.entity.Member; import com.example.fiurinee.domain.oauth2.dto.KakaoLogoutDto; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; - -import java.util.List; @Service @Transactional diff --git a/src/main/java/com/example/fiurinee/global/security/handler/CommonLoginSuccessHandler.java b/src/main/java/com/example/fiurinee/global/security/handler/CommonLoginSuccessHandler.java index aebdb7a..3ca5117 100644 --- a/src/main/java/com/example/fiurinee/global/security/handler/CommonLoginSuccessHandler.java +++ b/src/main/java/com/example/fiurinee/global/security/handler/CommonLoginSuccessHandler.java @@ -2,7 +2,7 @@ import com.example.fiurinee.domain.jwt.utils.JwtConstants; import com.example.fiurinee.domain.jwt.utils.JwtUtils; -import com.example.fiurinee.domain.member.data.PrincipalDetail; +import com.example.fiurinee.domain.member.entity.PrincipalDetail; import com.google.gson.Gson; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest;