Skip to content

Commit

Permalink
Feat: 패키지 순환 참조 해결 (#191)
Browse files Browse the repository at this point in the history
* #190 - chore: 패키지 순환 참조를 해결하기 위해 패키지 분리
  • Loading branch information
GGHDMS authored Mar 12, 2024
1 parent 6e2f3f9 commit 19351d4
Show file tree
Hide file tree
Showing 27 changed files with 43 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import cotato.bookitlist.auth.dto.response.ReissueResponse;
import cotato.bookitlist.auth.repository.BlackListRepository;
import cotato.bookitlist.auth.repository.RefreshTokenRepository;
import cotato.bookitlist.config.security.jwt.JwtTokenProvider;
import cotato.bookitlist.security.jwt.JwtTokenProvider;
import cotato.bookitlist.member.repository.MemberRepository;
import jakarta.persistence.EntityNotFoundException;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import cotato.bookitlist.book.dto.response.BookLikeResponse;
import cotato.bookitlist.book.dto.response.BookListResponse;
import cotato.bookitlist.book.service.BookLikeService;
import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cotato.bookitlist.member.controller;

import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import cotato.bookitlist.member.dto.request.NameChangeRequest;
import cotato.bookitlist.member.dto.response.MemberRecommendListResponse;
import cotato.bookitlist.member.dto.response.MemberResponse;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/cotato/bookitlist/member/domain/Member.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cotato.bookitlist.member.domain;

import cotato.bookitlist.common.domain.BaseEntity;
import cotato.bookitlist.config.security.oauth.AuthProvider;
import cotato.bookitlist.config.security.oauth.OAuth2UserInfo;
import cotato.bookitlist.security.oauth.AuthProvider;
import cotato.bookitlist.security.oauth.OAuth2UserInfo;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cotato.bookitlist.member.repository;

import cotato.bookitlist.config.security.oauth.AuthProvider;
import cotato.bookitlist.security.oauth.AuthProvider;
import cotato.bookitlist.member.domain.Member;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import cotato.bookitlist.book.annotation.IsValidIsbn;
import cotato.bookitlist.common.domain.RecommendType;
import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import cotato.bookitlist.post.dto.request.PostRegisterRequest;
import cotato.bookitlist.post.dto.request.PostUpdateRequest;
import cotato.bookitlist.post.dto.response.PostCountResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cotato.bookitlist.post.controller;

import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import cotato.bookitlist.post.service.PostLikeService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import cotato.bookitlist.book.annotation.IsValidIsbn;
import cotato.bookitlist.common.domain.RecommendType;
import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import cotato.bookitlist.review.dto.request.ReviewRegisterRequest;
import cotato.bookitlist.review.dto.request.ReviewUpdateRequest;
import cotato.bookitlist.review.dto.response.ReviewCountResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cotato.bookitlist.review.controller;

import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import cotato.bookitlist.review.service.ReviewLikeService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security;
package cotato.bookitlist.security;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security;
package cotato.bookitlist.security;

import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cotato.bookitlist.config.security;
package cotato.bookitlist.security;

import cotato.bookitlist.config.security.jwt.JwtAuthenticationFilter;
import cotato.bookitlist.config.security.oauth.handler.OAuth2AuthenticationSuccessHandler;
import cotato.bookitlist.config.security.oauth.service.CustomOAuth2UserService;
import cotato.bookitlist.security.jwt.JwtAuthenticationFilter;
import cotato.bookitlist.security.oauth.handler.OAuth2AuthenticationSuccessHandler;
import cotato.bookitlist.security.oauth.service.CustomOAuth2UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.jwt;
package cotato.bookitlist.security.jwt;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cotato.bookitlist.config.security.jwt;
package cotato.bookitlist.security.jwt;

import cotato.bookitlist.auth.service.AuthService;
import cotato.bookitlist.config.security.jwt.dto.AccessTokenInfo;
import cotato.bookitlist.security.jwt.dto.AccessTokenInfo;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.Cookie;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cotato.bookitlist.config.security.jwt;
package cotato.bookitlist.security.jwt;

import cotato.bookitlist.config.security.jwt.dto.AccessTokenInfo;
import cotato.bookitlist.config.security.jwt.properties.JwtProperties;
import cotato.bookitlist.security.jwt.dto.AccessTokenInfo;
import cotato.bookitlist.security.jwt.properties.JwtProperties;
import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.jwt.dto;
package cotato.bookitlist.security.jwt.dto;

public record AccessTokenInfo(
Long userId,
Expand All @@ -8,4 +8,4 @@ public static AccessTokenInfo of(Long userId, String role) {
return new AccessTokenInfo(userId, role);
}

}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.jwt.properties;
package cotato.bookitlist.security.jwt.properties;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -11,4 +11,4 @@ public class JwtProperties {
private String secretKey;
private Long accessExp;
private Long refreshExp;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

public enum AuthProvider {
KAKAO,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cotato.bookitlist.config.security.oauth;
package cotato.bookitlist.security.oauth;

import cotato.bookitlist.member.domain.Member;

Expand Down Expand Up @@ -85,4 +85,4 @@ public String getPassword() {
public String getName() {
return String.valueOf(id);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cotato.bookitlist.config.security.oauth.handler;
package cotato.bookitlist.security.oauth.handler;

import cotato.bookitlist.auth.service.AuthService;
import cotato.bookitlist.config.security.jwt.JwtTokenProvider;
import cotato.bookitlist.config.security.oauth.UserPrincipal;
import cotato.bookitlist.security.jwt.JwtTokenProvider;
import cotato.bookitlist.security.oauth.UserPrincipal;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cotato.bookitlist.config.security.oauth.service;
package cotato.bookitlist.security.oauth.service;

import cotato.bookitlist.config.security.oauth.AuthProvider;
import cotato.bookitlist.config.security.oauth.OAuth2UserInfo;
import cotato.bookitlist.config.security.oauth.OAuth2UserInfoFactory;
import cotato.bookitlist.config.security.oauth.UserPrincipal;
import cotato.bookitlist.security.oauth.AuthProvider;
import cotato.bookitlist.security.oauth.OAuth2UserInfo;
import cotato.bookitlist.security.oauth.OAuth2UserInfoFactory;
import cotato.bookitlist.security.oauth.UserPrincipal;
import cotato.bookitlist.member.component.MemberComponent;
import cotato.bookitlist.member.domain.Member;
import cotato.bookitlist.member.repository.MemberRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cotato.bookitlist.factory;

import cotato.bookitlist.annotation.WithCustomMockUser;
import cotato.bookitlist.config.security.jwt.AuthDetails;
import cotato.bookitlist.security.jwt.AuthDetails;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/cotato/bookitlist/fixture/MemberFixture.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package cotato.bookitlist.fixture;

import cotato.bookitlist.config.security.oauth.AuthProvider;
import cotato.bookitlist.security.oauth.AuthProvider;
import cotato.bookitlist.member.domain.Member;
import org.springframework.test.util.ReflectionTestUtils;

Expand Down

0 comments on commit 19351d4

Please sign in to comment.