Merge pull request #15 from Tave-13th-Project-Team-4-Fiurinee/feature…

…/kakao-login

entity 이름 수정

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;

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,

src/main/java/com/example/fiurinee/domain/member/data/Member.java → 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)

src/main/java/com/example/fiurinee/domain/member/data/PrincipalDetail.java → 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;

src/main/java/com/example/fiurinee/domain/member/data/Role.java → 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;

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;

src/main/java/com/example/fiurinee/domain/member/service/MemberService.java

@@ -1,15 +1,13 @@
 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;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor

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;

src/main/java/com/example/fiurinee/domain/oauth2/data/KakaoUserInfo.java → 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;
 

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;
 

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

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;