diff --git a/src/main/java/capstone/facefriend/DummyInitializer.java b/src/main/java/capstone/facefriend/DummyInitializer.java index 4c95ca03df..fe52a3132b 100644 --- a/src/main/java/capstone/facefriend/DummyInitializer.java +++ b/src/main/java/capstone/facefriend/DummyInitializer.java @@ -1,181 +1,177 @@ -//package capstone.facefriend; -// -//import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; -//import capstone.facefriend.member.domain.analysisInfo.AnalysisInfoRepository; -//import capstone.facefriend.member.domain.member.Member; -//import capstone.facefriend.member.domain.member.MemberRepository; -//import capstone.facefriend.member.service.AnalysisInfoService; -//import capstone.facefriend.member.service.MemberService; -//import capstone.facefriend.member.service.dto.member.SignUpRequest; -//import capstone.facefriend.resume.domain.Resume; -//import capstone.facefriend.resume.domain.ResumeRepository; -//import capstone.facefriend.resume.service.ResumeService; -//import jakarta.annotation.PostConstruct; -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.stereotype.Component; -//import org.springframework.transaction.annotation.Transactional; -// -//import java.util.ArrayList; -//import java.util.List; -//import java.util.Random; -//import java.util.Set; -//import java.util.stream.Collectors; -// -//@Component -//@Slf4j -//@RequiredArgsConstructor -//public class DummyInitializer { -// -// private final MemberService memberService; -// private final MemberRepository memberRepository; -// -// private final AnalysisInfoRepository analysisInfoRepository; -// private final ResumeRepository resumeRepository; -// -// @PostConstruct -// @Transactional -// public void init() { -// Random random = new Random(); -// -// List> CATEGORY = List.of( -// List.of("FOOD"), -// List.of("WORKOUT"), -// List.of("MOVIE"), -// List.of("FASHION"), -// List.of("DATING"), -// List.of("STUDY"), -// List.of("ETC"), -// List.of("FOOD", "WORKOUT"), -// List.of("FOOD", "MOVIE"), -// List.of("FOOD", "FASHION"), -// List.of("FOOD", "DATING"), -// List.of("FOOD", "STUDY"), -// List.of("FOOD", "ETC"), -// List.of("WORKOUT", "MOVIE"), -// List.of("WORKOUT", "FASHION"), -// List.of("WORKOUT", "DATING"), -// List.of("WORKOUT", "STUDY"), -// List.of("WORKOUT", "ETC"), -// List.of("MOVIE", "FASHION"), -// List.of("MOVIE", "DATING"), -// List.of("MOVIE", "STUDY"), -// List.of("MOVIE", "ETC"), -// List.of("FASHION", "DATING"), -// List.of("FASHION", "STUDY"), -// List.of("FASHION", "ETC"), -// List.of("DATING", "STUDY"), -// List.of("DATING", "ETC"), -// List.of("STUDY", "ETC"), -// List.of("FOOD", "WORKOUT", "MOVIE"), -// List.of("FOOD", "WORKOUT", "FASHION"), -// List.of("FOOD", "WORKOUT", "DATING"), -// List.of("FOOD", "WORKOUT", "STUDY"), -// List.of("FOOD", "WORKOUT", "ETC"), -// List.of("FOOD", "MOVIE", "FASHION"), -// List.of("FOOD", "MOVIE", "DATING"), -// List.of("FOOD", "MOVIE", "STUDY"), -// List.of("FOOD", "MOVIE", "ETC"), -// List.of("FOOD", "FASHION", "DATING"), -// List.of("FOOD", "FASHION", "STUDY"), -// List.of("FOOD", "FASHION", "ETC"), -// List.of("FOOD", "DATING", "STUDY"), -// List.of("FOOD", "DATING", "ETC"), -// List.of("FOOD", "STUDY", "ETC"), -// List.of("WORKOUT", "MOVIE", "FASHION"), -// List.of("WORKOUT", "MOVIE", "DATING"), -// List.of("WORKOUT", "MOVIE", "STUDY"), -// List.of("WORKOUT", "MOVIE", "ETC"), -// List.of("WORKOUT", "FASHION", "DATING"), -// List.of("WORKOUT", "FASHION", "STUDY"), -// List.of("WORKOUT", "FASHION", "ETC"), -// List.of("WORKOUT", "DATING", "STUDY"), -// List.of("WORKOUT", "DATING", "ETC"), -// List.of("WORKOUT", "STUDY", "ETC"), -// List.of("MOVIE", "FASHION", "DATING"), -// List.of("MOVIE", "FASHION", "STUDY"), -// List.of("MOVIE", "FASHION", "ETC"), -// List.of("MOVIE", "DATING", "STUDY"), -// List.of("MOVIE", "DATING", "ETC"), -// List.of("MOVIE", "STUDY", "ETC"), -// List.of("FASHION", "DATING", "STUDY"), -// List.of("FASHION", "DATING", "ETC"), -// List.of("FASHION", "STUDY", "ETC"), -// List.of("DATING", "STUDY", "ETC"), -// List.of("FOOD", "WORKOUT", "MOVIE", "FASHION"), -// List.of("FOOD", "WORKOUT", "MOVIE", "DATING"), -// List.of("FOOD", "WORKOUT", "MOVIE", "STUDY"), -// List.of("FOOD", "WORKOUT", "MOVIE", "ETC"), -// List.of("FOOD", "WORKOUT", "FASHION", "DATING"), -// List.of("FOOD", "WORKOUT", "FASHION", "STUDY"), -// List.of("FOOD", "WORKOUT", "FASHION", "ETC"), -// List.of("FOOD", "WORKOUT", "DATING", "STUDY"), -// List.of("FOOD", "WORKOUT", "DATING", "ETC"), -// List.of("FOOD", "WORKOUT", "STUDY", "ETC"), -// List.of("FOOD", "MOVIE", "FASHION", "DATING"), -// List.of("FOOD", "MOVIE", "FASHION", "STUDY"), -// List.of("FOOD", "MOVIE", "FASHION", "ETC"), -// List.of("FOOD", "MOVIE", "DATING", "STUDY"), -// List.of("FOOD", "MOVIE", "DATING", "ETC"), -// List.of("FOOD", "MOVIE", "STUDY", "ETC"), -// List.of("FOOD", "FASHION", "DATING", "STUDY"), -// List.of("FOOD", "FASHION", "DATING", "ETC"), -// List.of("FOOD", "FASHION", "STUDY", "ETC"), -// List.of("FOOD", "DATING", "STUDY", "ETC"), -// List.of("WORKOUT", "MOVIE", "FASHION", "DATING"), -// List.of("WORKOUT", "MOVIE", "FASHION", "STUDY"), -// List.of("WORKOUT", "MOVIE", "FASHION", "ETC"), -// List.of("WORKOUT", "MOVIE", "DATING", "STUDY"), -// List.of("WORKOUT", "MOVIE", "DATING", "ETC"), -// List.of("WORKOUT", "MOVIE", "STUDY", "ETC"), -// List.of("WORKOUT", "FASHION", "DATING", "STUDY"), -// List.of("WORKOUT", "FASHION", "DATING", "ETC"), -// List.of("WORKOUT", "FASHION", "STUDY", "ETC"), -// List.of("WORKOUT", "DATING", "STUDY", "ETC"), -// List.of("MOVIE", "FASHION", "DATING", "STUDY"), -// List.of("MOVIE", "FASHION", "DATING", "ETC"), -// List.of("MOVIE", "FASHION", "STUDY", "ETC"), -// List.of("MOVIE", "DATING", "STUDY", "ETC"), -// List.of("FASHION", "DATING", "STUDY", "ETC"), -// List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "DATING"), -// List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "STUDY"), -// List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "ETC"), -// List.of("FOOD", "WORKOUT", "MOVIE", "DATING", "STUDY"), -// List.of("FOOD", "WORKOUT", "MOVIE", "DATING", "ETC"), -// List.of("FOOD", "WORKOUT", "MOVIE", "STUDY", "ETC"), -// List.of("FOOD", "WORKOUT", "FASHION", "DATING", "STUDY"), -// List.of("FOOD", "WORKOUT", "FASHION", "DATING", "ETC"), -// List.of("FOOD", "WORKOUT", "FASHION", "STUDY", "ETC"), -// List.of("FOOD", "WORKOUT", "DATING", "STUDY", "ETC"), -// List.of("FOOD", "MOVIE", "FASHION", "DATING", "STUDY"), -// List.of("FOOD", "MOVIE", "FASHION", "DATING", "ETC"), -// List.of("FOOD", "MOVIE", "FASHION", "STUDY", "ETC"), -// List.of("FOOD", "MOVIE", "DATING", "STUDY", "ETC"), -// List.of("FOOD", "FASHION", "DATING", "STUDY", "ETC"), -// List.of("WORKOUT", "MOVIE", "FASHION", "DATING", "STUDY"), -// List.of("WORKOUT", "MOVIE", "FASHION", "DATING", "ETC"), -// List.of("WORKOUT", "MOVIE", "FASHION", "STUDY", "ETC"), -// List.of("WORKOUT", "MOVIE", "DATING", "STUDY", "ETC"), -// List.of("WORKOUT", "FASHION", "DATING", "STUDY", "ETC"), -// List.of("MOVIE", "FASHION", "DATING", "STUDY", "ETC") -// ); -// -// for (int i = 1; i <= 50; i++) { -// // 회원 가입 -// memberService.signUp(new SignUpRequest(i + "@" + i + ".com", "123", "123")); -// Member member = memberRepository.findByEmail(i + "@" + i + ".com").get(); -// -// // 관상 분석 -// AnalysisInfo analysisInfo = member.getAnalysisInfo(); -// analysisInfo.setFaceShapeIdNum(random.nextInt(5)); // 얼굴형 넘버 랜덤 -// analysisInfoRepository.save(analysisInfo); -// -// // 자기소개서 -// Resume resume = Resume.builder() -// .categories(CATEGORY.get(random.nextInt(CATEGORY.size() - 1)).stream().map(str -> Resume.Category.valueOf(str)).collect(Collectors.toSet())) // 카테고리 랜던 -// .member(member) -// .build(); -// resumeRepository.save(resume); -// } -// } -//} +package capstone.facefriend; + +import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; +import capstone.facefriend.member.repository.AnalysisInfoRepository; +import capstone.facefriend.member.domain.member.Member; +import capstone.facefriend.member.repository.MemberRepository; +import capstone.facefriend.member.service.MemberService; +import capstone.facefriend.member.dto.member.SignUpRequest; +import capstone.facefriend.resume.domain.Resume; +import capstone.facefriend.resume.repository.ResumeRepository; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Random; +import java.util.stream.Collectors; + +@Component +@Slf4j +@RequiredArgsConstructor +public class DummyInitializer { + + private final MemberService memberService; + private final MemberRepository memberRepository; + + private final AnalysisInfoRepository analysisInfoRepository; + private final ResumeRepository resumeRepository; + + @PostConstruct + @Transactional + public void init() { + Random random = new Random(); + + List> CATEGORY = List.of( + List.of("FOOD"), + List.of("WORKOUT"), + List.of("MOVIE"), + List.of("FASHION"), + List.of("DATING"), + List.of("STUDY"), + List.of("ETC"), + List.of("FOOD", "WORKOUT"), + List.of("FOOD", "MOVIE"), + List.of("FOOD", "FASHION"), + List.of("FOOD", "DATING"), + List.of("FOOD", "STUDY"), + List.of("FOOD", "ETC"), + List.of("WORKOUT", "MOVIE"), + List.of("WORKOUT", "FASHION"), + List.of("WORKOUT", "DATING"), + List.of("WORKOUT", "STUDY"), + List.of("WORKOUT", "ETC"), + List.of("MOVIE", "FASHION"), + List.of("MOVIE", "DATING"), + List.of("MOVIE", "STUDY"), + List.of("MOVIE", "ETC"), + List.of("FASHION", "DATING"), + List.of("FASHION", "STUDY"), + List.of("FASHION", "ETC"), + List.of("DATING", "STUDY"), + List.of("DATING", "ETC"), + List.of("STUDY", "ETC"), + List.of("FOOD", "WORKOUT", "MOVIE"), + List.of("FOOD", "WORKOUT", "FASHION"), + List.of("FOOD", "WORKOUT", "DATING"), + List.of("FOOD", "WORKOUT", "STUDY"), + List.of("FOOD", "WORKOUT", "ETC"), + List.of("FOOD", "MOVIE", "FASHION"), + List.of("FOOD", "MOVIE", "DATING"), + List.of("FOOD", "MOVIE", "STUDY"), + List.of("FOOD", "MOVIE", "ETC"), + List.of("FOOD", "FASHION", "DATING"), + List.of("FOOD", "FASHION", "STUDY"), + List.of("FOOD", "FASHION", "ETC"), + List.of("FOOD", "DATING", "STUDY"), + List.of("FOOD", "DATING", "ETC"), + List.of("FOOD", "STUDY", "ETC"), + List.of("WORKOUT", "MOVIE", "FASHION"), + List.of("WORKOUT", "MOVIE", "DATING"), + List.of("WORKOUT", "MOVIE", "STUDY"), + List.of("WORKOUT", "MOVIE", "ETC"), + List.of("WORKOUT", "FASHION", "DATING"), + List.of("WORKOUT", "FASHION", "STUDY"), + List.of("WORKOUT", "FASHION", "ETC"), + List.of("WORKOUT", "DATING", "STUDY"), + List.of("WORKOUT", "DATING", "ETC"), + List.of("WORKOUT", "STUDY", "ETC"), + List.of("MOVIE", "FASHION", "DATING"), + List.of("MOVIE", "FASHION", "STUDY"), + List.of("MOVIE", "FASHION", "ETC"), + List.of("MOVIE", "DATING", "STUDY"), + List.of("MOVIE", "DATING", "ETC"), + List.of("MOVIE", "STUDY", "ETC"), + List.of("FASHION", "DATING", "STUDY"), + List.of("FASHION", "DATING", "ETC"), + List.of("FASHION", "STUDY", "ETC"), + List.of("DATING", "STUDY", "ETC"), + List.of("FOOD", "WORKOUT", "MOVIE", "FASHION"), + List.of("FOOD", "WORKOUT", "MOVIE", "DATING"), + List.of("FOOD", "WORKOUT", "MOVIE", "STUDY"), + List.of("FOOD", "WORKOUT", "MOVIE", "ETC"), + List.of("FOOD", "WORKOUT", "FASHION", "DATING"), + List.of("FOOD", "WORKOUT", "FASHION", "STUDY"), + List.of("FOOD", "WORKOUT", "FASHION", "ETC"), + List.of("FOOD", "WORKOUT", "DATING", "STUDY"), + List.of("FOOD", "WORKOUT", "DATING", "ETC"), + List.of("FOOD", "WORKOUT", "STUDY", "ETC"), + List.of("FOOD", "MOVIE", "FASHION", "DATING"), + List.of("FOOD", "MOVIE", "FASHION", "STUDY"), + List.of("FOOD", "MOVIE", "FASHION", "ETC"), + List.of("FOOD", "MOVIE", "DATING", "STUDY"), + List.of("FOOD", "MOVIE", "DATING", "ETC"), + List.of("FOOD", "MOVIE", "STUDY", "ETC"), + List.of("FOOD", "FASHION", "DATING", "STUDY"), + List.of("FOOD", "FASHION", "DATING", "ETC"), + List.of("FOOD", "FASHION", "STUDY", "ETC"), + List.of("FOOD", "DATING", "STUDY", "ETC"), + List.of("WORKOUT", "MOVIE", "FASHION", "DATING"), + List.of("WORKOUT", "MOVIE", "FASHION", "STUDY"), + List.of("WORKOUT", "MOVIE", "FASHION", "ETC"), + List.of("WORKOUT", "MOVIE", "DATING", "STUDY"), + List.of("WORKOUT", "MOVIE", "DATING", "ETC"), + List.of("WORKOUT", "MOVIE", "STUDY", "ETC"), + List.of("WORKOUT", "FASHION", "DATING", "STUDY"), + List.of("WORKOUT", "FASHION", "DATING", "ETC"), + List.of("WORKOUT", "FASHION", "STUDY", "ETC"), + List.of("WORKOUT", "DATING", "STUDY", "ETC"), + List.of("MOVIE", "FASHION", "DATING", "STUDY"), + List.of("MOVIE", "FASHION", "DATING", "ETC"), + List.of("MOVIE", "FASHION", "STUDY", "ETC"), + List.of("MOVIE", "DATING", "STUDY", "ETC"), + List.of("FASHION", "DATING", "STUDY", "ETC"), + List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "DATING"), + List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "STUDY"), + List.of("FOOD", "WORKOUT", "MOVIE", "FASHION", "ETC"), + List.of("FOOD", "WORKOUT", "MOVIE", "DATING", "STUDY"), + List.of("FOOD", "WORKOUT", "MOVIE", "DATING", "ETC"), + List.of("FOOD", "WORKOUT", "MOVIE", "STUDY", "ETC"), + List.of("FOOD", "WORKOUT", "FASHION", "DATING", "STUDY"), + List.of("FOOD", "WORKOUT", "FASHION", "DATING", "ETC"), + List.of("FOOD", "WORKOUT", "FASHION", "STUDY", "ETC"), + List.of("FOOD", "WORKOUT", "DATING", "STUDY", "ETC"), + List.of("FOOD", "MOVIE", "FASHION", "DATING", "STUDY"), + List.of("FOOD", "MOVIE", "FASHION", "DATING", "ETC"), + List.of("FOOD", "MOVIE", "FASHION", "STUDY", "ETC"), + List.of("FOOD", "MOVIE", "DATING", "STUDY", "ETC"), + List.of("FOOD", "FASHION", "DATING", "STUDY", "ETC"), + List.of("WORKOUT", "MOVIE", "FASHION", "DATING", "STUDY"), + List.of("WORKOUT", "MOVIE", "FASHION", "DATING", "ETC"), + List.of("WORKOUT", "MOVIE", "FASHION", "STUDY", "ETC"), + List.of("WORKOUT", "MOVIE", "DATING", "STUDY", "ETC"), + List.of("WORKOUT", "FASHION", "DATING", "STUDY", "ETC"), + List.of("MOVIE", "FASHION", "DATING", "STUDY", "ETC") + ); + + for (int i = 1; i <= 50; i++) { + // 회원 가입 + memberService.signUp(new SignUpRequest(i + "@" + i + ".com", "123", "123")); + Member member = memberRepository.findByEmail(i + "@" + i + ".com").get(); + + // 관상 분석 + AnalysisInfo analysisInfo = member.getAnalysisInfo(); + analysisInfo.setFaceShapeIdNum(random.nextInt(5)); // 얼굴형 넘버 랜덤 + analysisInfoRepository.save(analysisInfo); + + // 자기소개서 + Resume resume = Resume.builder() + .categories(CATEGORY.get(random.nextInt(CATEGORY.size() - 1)).stream().map(str -> Resume.Category.valueOf(str)).collect(Collectors.toSet())) // 카테고리 랜던 + .member(member) + .build(); + resumeRepository.save(resume); + } + } +} diff --git a/src/main/java/capstone/facefriend/auth/controller/AuthController.java b/src/main/java/capstone/facefriend/auth/controller/AuthController.java index 03e7424dc6..ce2c13a2af 100644 --- a/src/main/java/capstone/facefriend/auth/controller/AuthController.java +++ b/src/main/java/capstone/facefriend/auth/controller/AuthController.java @@ -1,12 +1,12 @@ package capstone.facefriend.auth.controller; -import capstone.facefriend.auth.controller.dto.LoginUriResponse; -import capstone.facefriend.auth.controller.dto.TokenResponse; -import capstone.facefriend.auth.domain.OAuthMember; +import capstone.facefriend.auth.dto.LoginUriResponse; +import capstone.facefriend.auth.dto.TokenResponse; +import capstone.facefriend.auth.domain.oauth.OAuthMember; import capstone.facefriend.auth.service.AuthService; import capstone.facefriend.auth.service.OAuthRequester; -import capstone.facefriend.auth.service.dto.OAuthLoginRequest; +import capstone.facefriend.auth.dto.OAuthLoginRequest; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/capstone/facefriend/auth/controller/dto/TokenResponse.java b/src/main/java/capstone/facefriend/auth/controller/dto/TokenResponse.java deleted file mode 100644 index acc35d696e..0000000000 --- a/src/main/java/capstone/facefriend/auth/controller/dto/TokenResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package capstone.facefriend.auth.controller.dto; - -public record TokenResponse( - String accessToken, - String refreshToken, - Long memberId -) { -} diff --git a/src/main/java/capstone/facefriend/auth/controller/interceptor/LoginInterceptor.java b/src/main/java/capstone/facefriend/auth/controller/interceptor/LoginInterceptor.java index a9ba204f58..41903f8e1f 100644 --- a/src/main/java/capstone/facefriend/auth/controller/interceptor/LoginInterceptor.java +++ b/src/main/java/capstone/facefriend/auth/controller/interceptor/LoginInterceptor.java @@ -2,7 +2,7 @@ import capstone.facefriend.auth.controller.support.AuthenticationContext; import capstone.facefriend.auth.controller.support.AuthenticationExtractor; -import capstone.facefriend.auth.domain.TokenProvider; +import capstone.facefriend.auth.domain.token.TokenProvider; import capstone.facefriend.auth.exception.AuthException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/capstone/facefriend/auth/controller/interceptor/TokenReissueInterceptor.java b/src/main/java/capstone/facefriend/auth/controller/interceptor/TokenReissueInterceptor.java index 5bd23a9b2a..ba84413567 100644 --- a/src/main/java/capstone/facefriend/auth/controller/interceptor/TokenReissueInterceptor.java +++ b/src/main/java/capstone/facefriend/auth/controller/interceptor/TokenReissueInterceptor.java @@ -2,7 +2,7 @@ import capstone.facefriend.auth.controller.support.AuthenticationContext; import capstone.facefriend.auth.controller.support.AuthenticationExtractor; -import capstone.facefriend.auth.domain.TokenProvider; +import capstone.facefriend.auth.domain.token.TokenProvider; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/capstone/facefriend/auth/domain/GoogleMember.java b/src/main/java/capstone/facefriend/auth/domain/oauth/GoogleMember.java similarity index 94% rename from src/main/java/capstone/facefriend/auth/domain/GoogleMember.java rename to src/main/java/capstone/facefriend/auth/domain/oauth/GoogleMember.java index 3e7f9ff64a..5c2d580c2d 100644 --- a/src/main/java/capstone/facefriend/auth/domain/GoogleMember.java +++ b/src/main/java/capstone/facefriend/auth/domain/oauth/GoogleMember.java @@ -1,4 +1,4 @@ -package capstone.facefriend.auth.domain; +package capstone.facefriend.auth.domain.oauth; import java.util.Map; diff --git a/src/main/java/capstone/facefriend/auth/domain/OAuthMember.java b/src/main/java/capstone/facefriend/auth/domain/oauth/OAuthMember.java similarity index 72% rename from src/main/java/capstone/facefriend/auth/domain/OAuthMember.java rename to src/main/java/capstone/facefriend/auth/domain/oauth/OAuthMember.java index d3338c69a4..3f093c328d 100644 --- a/src/main/java/capstone/facefriend/auth/domain/OAuthMember.java +++ b/src/main/java/capstone/facefriend/auth/domain/oauth/OAuthMember.java @@ -1,4 +1,4 @@ -package capstone.facefriend.auth.domain; +package capstone.facefriend.auth.domain.oauth; public interface OAuthMember { diff --git a/src/main/java/capstone/facefriend/auth/domain/oauth/Provider.java b/src/main/java/capstone/facefriend/auth/domain/oauth/Provider.java new file mode 100644 index 0000000000..00a7f8e711 --- /dev/null +++ b/src/main/java/capstone/facefriend/auth/domain/oauth/Provider.java @@ -0,0 +1,35 @@ +package capstone.facefriend.auth.domain.oauth; + +import capstone.facefriend.auth.exception.AuthException; +import capstone.facefriend.auth.exception.AuthExceptionType; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; + +public enum Provider { + + GOOGLE("google", GoogleMember::new), + ; + + private final String providerName; + private final Function, OAuthMember> function; + + Provider(String providerName, Function, OAuthMember> function) { + this.providerName = providerName; + this.function = function; + } + + public static Provider from(String name) { + return Arrays.stream(values()) + .filter(it -> it.providerName.equals(name)) + .findFirst() + .orElseThrow(() -> new AuthException(AuthExceptionType.INVALID_AUTH_PROVIDER)); + } + + public OAuthMember getOAuthMember(Map body) { + return function.apply(body); + // function 은 GoogleMember 의 생성자를 의미 + // GoogleMember 생성자의 파라미터에 request body (=Map) 넣어서 OAuthMember 객체 반환 + } +} diff --git a/src/main/java/capstone/facefriend/auth/domain/token/TokenProvider.java b/src/main/java/capstone/facefriend/auth/domain/token/TokenProvider.java index 99573ee192..bc5a0375f1 100644 --- a/src/main/java/capstone/facefriend/auth/domain/token/TokenProvider.java +++ b/src/main/java/capstone/facefriend/auth/domain/token/TokenProvider.java @@ -1,6 +1,6 @@ package capstone.facefriend.auth.domain.token; -import capstone.facefriend.auth.controller.dto.TokenResponse; +import capstone.facefriend.auth.dto.TokenResponse; public interface TokenProvider { diff --git a/src/main/java/capstone/facefriend/auth/controller/dto/LoginUriResponse.java b/src/main/java/capstone/facefriend/auth/dto/LoginUriResponse.java similarity index 56% rename from src/main/java/capstone/facefriend/auth/controller/dto/LoginUriResponse.java rename to src/main/java/capstone/facefriend/auth/dto/LoginUriResponse.java index 819c3dbd88..03f54183d4 100644 --- a/src/main/java/capstone/facefriend/auth/controller/dto/LoginUriResponse.java +++ b/src/main/java/capstone/facefriend/auth/dto/LoginUriResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.auth.controller.dto; +package capstone.facefriend.auth.dto; public record LoginUriResponse( String loginUri diff --git a/src/main/java/capstone/facefriend/auth/service/dto/OAuthLoginRequest.java b/src/main/java/capstone/facefriend/auth/dto/OAuthLoginRequest.java similarity index 65% rename from src/main/java/capstone/facefriend/auth/service/dto/OAuthLoginRequest.java rename to src/main/java/capstone/facefriend/auth/dto/OAuthLoginRequest.java index 0245b077c7..5f01c582fa 100644 --- a/src/main/java/capstone/facefriend/auth/service/dto/OAuthLoginRequest.java +++ b/src/main/java/capstone/facefriend/auth/dto/OAuthLoginRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.auth.service.dto; +package capstone.facefriend.auth.dto; public record OAuthLoginRequest( String redirectUri, diff --git a/src/main/java/capstone/facefriend/auth/service/dto/OAuthUriRequest.java b/src/main/java/capstone/facefriend/auth/dto/OAuthUriRequest.java similarity index 58% rename from src/main/java/capstone/facefriend/auth/service/dto/OAuthUriRequest.java rename to src/main/java/capstone/facefriend/auth/dto/OAuthUriRequest.java index 482ef09868..20b85c59eb 100644 --- a/src/main/java/capstone/facefriend/auth/service/dto/OAuthUriRequest.java +++ b/src/main/java/capstone/facefriend/auth/dto/OAuthUriRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.auth.service.dto; +package capstone.facefriend.auth.dto; public record OAuthUriRequest( String redirectUri diff --git a/src/main/java/capstone/facefriend/auth/dto/TokenResponse.java b/src/main/java/capstone/facefriend/auth/dto/TokenResponse.java new file mode 100644 index 0000000000..0058dec1fa --- /dev/null +++ b/src/main/java/capstone/facefriend/auth/dto/TokenResponse.java @@ -0,0 +1,11 @@ +package capstone.facefriend.auth.dto; + +import capstone.facefriend.auth.domain.token.AccessToken; +import capstone.facefriend.auth.domain.token.RefreshToken; + +public record TokenResponse( + AccessToken accessToken, + RefreshToken refreshToken, + Long memberId +) { +} diff --git a/src/main/java/capstone/facefriend/auth/infrastructure/JwtProvider.java b/src/main/java/capstone/facefriend/auth/infrastructure/JwtProvider.java index 45aee75367..53a1a67a32 100644 --- a/src/main/java/capstone/facefriend/auth/infrastructure/JwtProvider.java +++ b/src/main/java/capstone/facefriend/auth/infrastructure/JwtProvider.java @@ -1,7 +1,7 @@ package capstone.facefriend.auth.infrastructure; -import capstone.facefriend.auth.controller.dto.TokenResponse; +import capstone.facefriend.auth.dto.TokenResponse; import capstone.facefriend.auth.domain.token.AccessToken; import capstone.facefriend.auth.domain.token.RefreshToken; import capstone.facefriend.auth.domain.token.TokenProvider; diff --git a/src/main/java/capstone/facefriend/auth/infrastructure/RestTemplateOAuthRequester.java b/src/main/java/capstone/facefriend/auth/infrastructure/RestTemplateOAuthRequester.java index c6f23fc60f..3535c8d6c3 100644 --- a/src/main/java/capstone/facefriend/auth/infrastructure/RestTemplateOAuthRequester.java +++ b/src/main/java/capstone/facefriend/auth/infrastructure/RestTemplateOAuthRequester.java @@ -1,14 +1,14 @@ package capstone.facefriend.auth.infrastructure; -import capstone.facefriend.auth.domain.OAuthMember; -import capstone.facefriend.auth.domain.Provider; +import capstone.facefriend.auth.domain.oauth.OAuthMember; +import capstone.facefriend.auth.domain.oauth.Provider; import capstone.facefriend.auth.exception.AuthException; import capstone.facefriend.auth.exception.AuthExceptionType; import capstone.facefriend.auth.infrastructure.dto.OAuthTokenResponse; import capstone.facefriend.auth.service.OAuthProviderProperties; import capstone.facefriend.auth.service.OAuthProviderProperties.OAuthProviderProperty; import capstone.facefriend.auth.service.OAuthRequester; -import capstone.facefriend.auth.service.dto.OAuthLoginRequest; +import capstone.facefriend.auth.dto.OAuthLoginRequest; import lombok.RequiredArgsConstructor; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.*; diff --git a/src/main/java/capstone/facefriend/auth/service/AuthService.java b/src/main/java/capstone/facefriend/auth/service/AuthService.java index 6a73f97142..9c3b3a5833 100644 --- a/src/main/java/capstone/facefriend/auth/service/AuthService.java +++ b/src/main/java/capstone/facefriend/auth/service/AuthService.java @@ -1,12 +1,14 @@ package capstone.facefriend.auth.service; -import capstone.facefriend.auth.controller.dto.TokenResponse; -import capstone.facefriend.auth.domain.OAuthMember; -import capstone.facefriend.auth.domain.Provider; -import capstone.facefriend.auth.domain.TokenProvider; +import capstone.facefriend.auth.dto.TokenResponse; +import capstone.facefriend.auth.domain.oauth.OAuthMember; +import capstone.facefriend.auth.domain.oauth.Provider; +import capstone.facefriend.auth.domain.token.AccessToken; +import capstone.facefriend.auth.domain.token.RefreshToken; +import capstone.facefriend.auth.domain.token.TokenProvider; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,15 +41,19 @@ public TokenResponse generateTokens(OAuthMember oAuthMember) { .orElseGet(() -> memberRepository.save(newMember)); Long memberId = member.getId(); - return new TokenResponse(getAccessToken(memberId), getRefreshToken(memberId), memberId); + + AccessToken accessToken = AccessToken.from(createAccessToken(memberId)); + RefreshToken refreshToken = RefreshToken.from(createRefreshToken(memberId)); + + return new TokenResponse(accessToken, refreshToken, memberId); } - private String getAccessToken(Long memberId) { + private String createAccessToken(Long memberId) { String accessToken = tokenProvider.createAccessToken(memberId); return accessToken; } - private String getRefreshToken(Long memberId) { + private String createRefreshToken(Long memberId) { String refreshToken = tokenProvider.createRefreshToken(memberId); return refreshToken; } diff --git a/src/main/java/capstone/facefriend/auth/service/OAuthProviderProperties.java b/src/main/java/capstone/facefriend/auth/service/OAuthProviderProperties.java index 0a36e7f2fe..9699854616 100644 --- a/src/main/java/capstone/facefriend/auth/service/OAuthProviderProperties.java +++ b/src/main/java/capstone/facefriend/auth/service/OAuthProviderProperties.java @@ -1,6 +1,6 @@ package capstone.facefriend.auth.service; -import capstone.facefriend.auth.domain.Provider; +import capstone.facefriend.auth.domain.oauth.Provider; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/capstone/facefriend/auth/service/OAuthRequester.java b/src/main/java/capstone/facefriend/auth/service/OAuthRequester.java index 1c2c009d11..64e8ee023a 100644 --- a/src/main/java/capstone/facefriend/auth/service/OAuthRequester.java +++ b/src/main/java/capstone/facefriend/auth/service/OAuthRequester.java @@ -1,8 +1,8 @@ package capstone.facefriend.auth.service; -import capstone.facefriend.auth.domain.OAuthMember; -import capstone.facefriend.auth.domain.Provider; -import capstone.facefriend.auth.service.dto.OAuthLoginRequest; +import capstone.facefriend.auth.domain.oauth.OAuthMember; +import capstone.facefriend.auth.domain.oauth.Provider; +import capstone.facefriend.auth.dto.OAuthLoginRequest; public interface OAuthRequester { diff --git a/src/main/java/capstone/facefriend/bucket/BucketService.java b/src/main/java/capstone/facefriend/bucket/BucketService.java index 70c3c39e8c..075253b56f 100644 --- a/src/main/java/capstone/facefriend/bucket/BucketService.java +++ b/src/main/java/capstone/facefriend/bucket/BucketService.java @@ -4,12 +4,11 @@ import capstone.facefriend.chat.domain.ChatRoom; import capstone.facefriend.chat.domain.ChatRoomMember; import capstone.facefriend.chat.exception.ChatException; -import capstone.facefriend.chat.exception.ChatExceptionType; import capstone.facefriend.chat.repository.ChatMessageRepository; import capstone.facefriend.chat.repository.ChatRoomMemberRepository; import capstone.facefriend.chat.repository.ChatRoomRepository; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.exception.member.MemberExceptionType; import capstone.facefriend.member.multipartFile.ByteArrayMultipartFile; @@ -42,7 +41,7 @@ public class BucketService { @Value("${spring.cloud.aws.s3.bucket}") private String BUCKET_NAME; - @Value("${spring.cloud.aws.s3.default-faceInfo-s3url}") + @Value("${spring.cloud.aws.s3.default-profile}") private String DEFAULT_FACE_INFO_S3_URL; @Value("${spring.cloud.aws.s3.origin-postfix}") private String ORIGIN_POSTFIX; diff --git a/src/main/java/capstone/facefriend/chat/aop/ChatAop.java b/src/main/java/capstone/facefriend/chat/aop/ChatAop.java index e4ba76487a..c3284c5e1b 100644 --- a/src/main/java/capstone/facefriend/chat/aop/ChatAop.java +++ b/src/main/java/capstone/facefriend/chat/aop/ChatAop.java @@ -8,7 +8,7 @@ import capstone.facefriend.chat.repository.ChatRoomMemberRepository; import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevel; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.multipartFile.ByteArrayMultipartFile; import capstone.facefriend.member.service.FaceInfoService; diff --git a/src/main/java/capstone/facefriend/chat/controller/ChatRoomController.java b/src/main/java/capstone/facefriend/chat/controller/ChatRoomController.java index 918e2f141b..57948f8faf 100644 --- a/src/main/java/capstone/facefriend/chat/controller/ChatRoomController.java +++ b/src/main/java/capstone/facefriend/chat/controller/ChatRoomController.java @@ -2,8 +2,6 @@ import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.chat.service.ChatRoomService; -import capstone.facefriend.chat.service.dto.chatroom.ChatRoomEnterResponse; -import capstone.facefriend.chat.service.dto.chatroom.ChatRoomExitResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/capstone/facefriend/chat/controller/MessageController.java b/src/main/java/capstone/facefriend/chat/controller/MessageController.java index a96131170e..b1e2dd7461 100644 --- a/src/main/java/capstone/facefriend/chat/controller/MessageController.java +++ b/src/main/java/capstone/facefriend/chat/controller/MessageController.java @@ -3,11 +3,11 @@ import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.auth.infrastructure.JwtProvider; import capstone.facefriend.chat.service.MessageService; -import capstone.facefriend.chat.service.dto.heart.HeartReplyRequest; -import capstone.facefriend.chat.service.dto.heart.SendHeartRequest; -import capstone.facefriend.chat.service.dto.message.MessageListRequest; -import capstone.facefriend.chat.service.dto.message.MessageListResponse; -import capstone.facefriend.chat.service.dto.message.MessageRequest; +import capstone.facefriend.chat.dto.heart.HeartReplyRequest; +import capstone.facefriend.chat.dto.heart.SendHeartRequest; +import capstone.facefriend.chat.dto.message.MessageListRequest; +import capstone.facefriend.chat.dto.message.MessageListResponse; +import capstone.facefriend.chat.dto.message.MessageRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomCloseResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomCloseResponse.java similarity index 92% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomCloseResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomCloseResponse.java index 3051a5d98e..0140d3b77d 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomCloseResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomCloseResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.chat.domain.ChatRoom; import capstone.facefriend.member.domain.member.Member; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEmptyResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEmptyResponse.java similarity index 82% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEmptyResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEmptyResponse.java index ae7050b979..c956b39d91 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEmptyResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEmptyResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; public record ChatRoomEmptyResponse( Boolean isEmpty, diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEnterResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEnterResponse.java similarity index 89% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEnterResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEnterResponse.java index 8b64273412..e2cb72a930 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomEnterResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomEnterResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.chat.domain.ChatRoomInfo; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomExitResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomExitResponse.java similarity index 77% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomExitResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomExitResponse.java index 6884b1da1d..d7f8b85e3b 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomExitResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomExitResponse.java @@ -1,6 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; - -import capstone.facefriend.chat.domain.ChatRoomInfo; +package capstone.facefriend.chat.dto.chatroom; import java.time.LocalDateTime; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomHeartResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomHeartResponse.java similarity index 95% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomHeartResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomHeartResponse.java index 48a59d1b9c..08f9f7b28f 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomHeartResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomHeartResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.chat.domain.ChatRoom; import capstone.facefriend.member.domain.member.Member; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomLeftResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomLeftResponse.java similarity index 93% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomLeftResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomLeftResponse.java index 678ad688e2..3dee347308 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomLeftResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomLeftResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.member.domain.member.Member; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomMessageResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomMessageResponse.java similarity index 95% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomMessageResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomMessageResponse.java index 99d95ea279..604af3747f 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomMessageResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomMessageResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.chat.domain.ChatMessage; import capstone.facefriend.chat.domain.ChatRoom; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomOpenResponse.java b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomOpenResponse.java similarity index 95% rename from src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomOpenResponse.java rename to src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomOpenResponse.java index 3be802340a..58755645d3 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/chatroom/ChatRoomOpenResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/chatroom/ChatRoomOpenResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.chatroom; +package capstone.facefriend.chat.dto.chatroom; import capstone.facefriend.chat.domain.ChatRoom; import capstone.facefriend.member.domain.member.Member; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/heart/GetSendHeartResponse.java b/src/main/java/capstone/facefriend/chat/dto/heart/GetSendHeartResponse.java similarity index 96% rename from src/main/java/capstone/facefriend/chat/service/dto/heart/GetSendHeartResponse.java rename to src/main/java/capstone/facefriend/chat/dto/heart/GetSendHeartResponse.java index cee9f54c5e..60762d99f1 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/heart/GetSendHeartResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/heart/GetSendHeartResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.heart; +package capstone.facefriend.chat.dto.heart; import capstone.facefriend.chat.domain.ChatRoom; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyRequest.java b/src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyRequest.java similarity index 62% rename from src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyRequest.java rename to src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyRequest.java index c680454d96..9ec1ec40e0 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyRequest.java +++ b/src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.heart; +package capstone.facefriend.chat.dto.heart; public record HeartReplyRequest( Long senderId, diff --git a/src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyResponse.java b/src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyResponse.java similarity index 87% rename from src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyResponse.java rename to src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyResponse.java index aef980425a..3ded197d99 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/heart/HeartReplyResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/heart/HeartReplyResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.heart; +package capstone.facefriend.chat.dto.heart; public record HeartReplyResponse( String method, diff --git a/src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartRequest.java b/src/main/java/capstone/facefriend/chat/dto/heart/SendHeartRequest.java similarity index 79% rename from src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartRequest.java rename to src/main/java/capstone/facefriend/chat/dto/heart/SendHeartRequest.java index 4176169283..6efad53dfd 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartRequest.java +++ b/src/main/java/capstone/facefriend/chat/dto/heart/SendHeartRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.heart; +package capstone.facefriend.chat.dto.heart; import lombok.Data; import lombok.Getter; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartResponse.java b/src/main/java/capstone/facefriend/chat/dto/heart/SendHeartResponse.java similarity index 96% rename from src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartResponse.java rename to src/main/java/capstone/facefriend/chat/dto/heart/SendHeartResponse.java index 36fd16baf1..d0cb9f930f 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/heart/SendHeartResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/heart/SendHeartResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.heart; +package capstone.facefriend.chat.dto.heart; import capstone.facefriend.chat.domain.ChatRoom; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/message/GetMessageResponse.java b/src/main/java/capstone/facefriend/chat/dto/message/GetMessageResponse.java similarity index 95% rename from src/main/java/capstone/facefriend/chat/service/dto/message/GetMessageResponse.java rename to src/main/java/capstone/facefriend/chat/dto/message/GetMessageResponse.java index 412fcd419f..6032012348 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/message/GetMessageResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/message/GetMessageResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.message; +package capstone.facefriend.chat.dto.message; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageListRequest.java b/src/main/java/capstone/facefriend/chat/dto/message/MessageListRequest.java similarity index 80% rename from src/main/java/capstone/facefriend/chat/service/dto/message/MessageListRequest.java rename to src/main/java/capstone/facefriend/chat/dto/message/MessageListRequest.java index c8c19b6791..cd26fb6a70 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageListRequest.java +++ b/src/main/java/capstone/facefriend/chat/dto/message/MessageListRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.message; +package capstone.facefriend.chat.dto.message; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageListResponse.java b/src/main/java/capstone/facefriend/chat/dto/message/MessageListResponse.java similarity index 93% rename from src/main/java/capstone/facefriend/chat/service/dto/message/MessageListResponse.java rename to src/main/java/capstone/facefriend/chat/dto/message/MessageListResponse.java index f5e03c28ac..60023334c7 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageListResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/message/MessageListResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.message; +package capstone.facefriend.chat.dto.message; import capstone.facefriend.chat.domain.ChatMessage; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageRequest.java b/src/main/java/capstone/facefriend/chat/dto/message/MessageRequest.java similarity index 77% rename from src/main/java/capstone/facefriend/chat/service/dto/message/MessageRequest.java rename to src/main/java/capstone/facefriend/chat/dto/message/MessageRequest.java index 727a867e7e..2d2d646f4f 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageRequest.java +++ b/src/main/java/capstone/facefriend/chat/dto/message/MessageRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.message; +package capstone.facefriend.chat.dto.message; import lombok.Data; import lombok.Getter; diff --git a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageResponse.java b/src/main/java/capstone/facefriend/chat/dto/message/MessageResponse.java similarity index 96% rename from src/main/java/capstone/facefriend/chat/service/dto/message/MessageResponse.java rename to src/main/java/capstone/facefriend/chat/dto/message/MessageResponse.java index bc083b3323..3a4a190ebd 100644 --- a/src/main/java/capstone/facefriend/chat/service/dto/message/MessageResponse.java +++ b/src/main/java/capstone/facefriend/chat/dto/message/MessageResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.chat.service.dto.message; +package capstone.facefriend.chat.dto.message; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/src/main/java/capstone/facefriend/chat/service/ChatRoomService.java b/src/main/java/capstone/facefriend/chat/service/ChatRoomService.java index 4f44fe9246..d05dcf9b40 100644 --- a/src/main/java/capstone/facefriend/chat/service/ChatRoomService.java +++ b/src/main/java/capstone/facefriend/chat/service/ChatRoomService.java @@ -4,14 +4,14 @@ import capstone.facefriend.chat.domain.ChatRoom; import capstone.facefriend.chat.domain.ChatRoomInfo; import capstone.facefriend.chat.domain.ChatRoomMember; +import capstone.facefriend.chat.dto.chatroom.*; import capstone.facefriend.chat.exception.ChatException; import capstone.facefriend.chat.repository.ChatMessageRepository; import capstone.facefriend.chat.repository.ChatRoomInfoRedisRepository; import capstone.facefriend.chat.repository.ChatRoomMemberRepository; import capstone.facefriend.chat.repository.ChatRoomRepository; -import capstone.facefriend.chat.service.dto.chatroom.*; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.exception.member.MemberExceptionType; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/capstone/facefriend/chat/service/MessageService.java b/src/main/java/capstone/facefriend/chat/service/MessageService.java index 973165d35a..3dfe5511bf 100644 --- a/src/main/java/capstone/facefriend/chat/service/MessageService.java +++ b/src/main/java/capstone/facefriend/chat/service/MessageService.java @@ -3,16 +3,16 @@ import capstone.facefriend.chat.domain.*; import capstone.facefriend.chat.exception.ChatException; import capstone.facefriend.chat.repository.*; -import capstone.facefriend.chat.service.dto.heart.HeartReplyRequest; -import capstone.facefriend.chat.service.dto.heart.HeartReplyResponse; -import capstone.facefriend.chat.service.dto.heart.SendHeartResponse; -import capstone.facefriend.chat.service.dto.message.MessageListRequest; -import capstone.facefriend.chat.service.dto.message.MessageListResponse; -import capstone.facefriend.chat.service.dto.message.MessageRequest; -import capstone.facefriend.chat.service.dto.message.MessageResponse; +import capstone.facefriend.chat.dto.heart.HeartReplyRequest; +import capstone.facefriend.chat.dto.heart.HeartReplyResponse; +import capstone.facefriend.chat.dto.heart.SendHeartResponse; +import capstone.facefriend.chat.dto.message.MessageListRequest; +import capstone.facefriend.chat.dto.message.MessageListResponse; +import capstone.facefriend.chat.dto.message.MessageRequest; +import capstone.facefriend.chat.dto.message.MessageResponse; import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevel; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/capstone/facefriend/chat/service/RedisSubscriber.java b/src/main/java/capstone/facefriend/chat/service/RedisSubscriber.java index 17c22a621a..537cc5e9bc 100644 --- a/src/main/java/capstone/facefriend/chat/service/RedisSubscriber.java +++ b/src/main/java/capstone/facefriend/chat/service/RedisSubscriber.java @@ -1,23 +1,19 @@ package capstone.facefriend.chat.service; -import capstone.facefriend.chat.domain.SocketInfo; -import capstone.facefriend.chat.service.dto.heart.GetSendHeartResponse; -import capstone.facefriend.chat.service.dto.heart.SendHeartResponse; -import capstone.facefriend.chat.service.dto.message.GetMessageResponse; -import capstone.facefriend.chat.service.dto.message.MessageResponse; +import capstone.facefriend.chat.dto.heart.GetSendHeartResponse; +import capstone.facefriend.chat.dto.heart.SendHeartResponse; +import capstone.facefriend.chat.dto.message.GetMessageResponse; +import capstone.facefriend.chat.dto.message.MessageResponse; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; -import org.springframework.data.redis.core.ListOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.messaging.simp.SimpMessageSendingOperations; import org.springframework.stereotype.Service; import java.io.IOException; -import java.util.List; -import java.util.Objects; @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/capstone/facefriend/email/controller/dto/EmailVerificationResponse.java b/src/main/java/capstone/facefriend/email/dto/EmailVerificationResponse.java similarity index 64% rename from src/main/java/capstone/facefriend/email/controller/dto/EmailVerificationResponse.java rename to src/main/java/capstone/facefriend/email/dto/EmailVerificationResponse.java index 64942965b9..a85d0cf186 100644 --- a/src/main/java/capstone/facefriend/email/controller/dto/EmailVerificationResponse.java +++ b/src/main/java/capstone/facefriend/email/dto/EmailVerificationResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.email.controller.dto; +package capstone.facefriend.email.dto; public record EmailVerificationResponse( String email, diff --git a/src/main/java/capstone/facefriend/member/controller/AnalysisInfoController.java b/src/main/java/capstone/facefriend/member/controller/AnalysisInfoController.java index c2e4f9174c..453004a2de 100644 --- a/src/main/java/capstone/facefriend/member/controller/AnalysisInfoController.java +++ b/src/main/java/capstone/facefriend/member/controller/AnalysisInfoController.java @@ -2,9 +2,9 @@ import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.member.service.AnalysisInfoService; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoFullResponse; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoFullShortResponse; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoShortResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoFullResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoFullShortResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoShortResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/capstone/facefriend/member/controller/BasicInfoController.java b/src/main/java/capstone/facefriend/member/controller/BasicInfoController.java index bbbe72a0e2..0272959a50 100644 --- a/src/main/java/capstone/facefriend/member/controller/BasicInfoController.java +++ b/src/main/java/capstone/facefriend/member/controller/BasicInfoController.java @@ -3,8 +3,8 @@ import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.member.service.BasicInfoService; -import capstone.facefriend.member.service.dto.basicInfo.BasicInfoRequest; -import capstone.facefriend.member.service.dto.basicInfo.BasicInfoResponse; +import capstone.facefriend.member.dto.basicInfo.BasicInfoRequest; +import capstone.facefriend.member.dto.basicInfo.BasicInfoResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/capstone/facefriend/member/controller/FaceInfoController.java b/src/main/java/capstone/facefriend/member/controller/FaceInfoController.java index 4f2a56c8ae..21f2a62d50 100644 --- a/src/main/java/capstone/facefriend/member/controller/FaceInfoController.java +++ b/src/main/java/capstone/facefriend/member/controller/FaceInfoController.java @@ -2,7 +2,7 @@ import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.member.service.FaceInfoService; -import capstone.facefriend.member.service.dto.faceInfo.FaceInfoResponse; +import capstone.facefriend.member.dto.faceInfo.FaceInfoResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/capstone/facefriend/member/controller/MemberController.java b/src/main/java/capstone/facefriend/member/controller/MemberController.java index b1f867bc0f..ba0a1e73bb 100644 --- a/src/main/java/capstone/facefriend/member/controller/MemberController.java +++ b/src/main/java/capstone/facefriend/member/controller/MemberController.java @@ -1,13 +1,13 @@ package capstone.facefriend.member.controller; -import capstone.facefriend.auth.controller.dto.TokenResponse; +import capstone.facefriend.auth.dto.TokenResponse; import capstone.facefriend.auth.controller.support.AuthMember; import capstone.facefriend.auth.controller.support.AuthenticationExtractor; -import capstone.facefriend.email.controller.dto.EmailVerificationResponse; +import capstone.facefriend.email.dto.EmailVerificationResponse; +import capstone.facefriend.member.dto.member.*; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.service.MemberService; -import capstone.facefriend.member.service.dto.member.*; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullResponse.java b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullResponse.java similarity index 64% rename from src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullResponse.java rename to src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullResponse.java index fb4e52fc1a..04de95e306 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.analysisInfo; +package capstone.facefriend.member.dto.analysisInfo; import java.util.Map; diff --git a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullShortResponse.java b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullShortResponse.java similarity index 74% rename from src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullShortResponse.java rename to src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullShortResponse.java index c80b670182..ce0465b88b 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoFullShortResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoFullShortResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.analysisInfo; +package capstone.facefriend.member.dto.analysisInfo; import java.util.List; import java.util.Map; diff --git a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoShortResponse.java b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoShortResponse.java similarity index 63% rename from src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoShortResponse.java rename to src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoShortResponse.java index 81917d3cfe..628071d055 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/analysisInfo/AnalysisInfoShortResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/analysisInfo/AnalysisInfoShortResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.analysisInfo; +package capstone.facefriend.member.dto.analysisInfo; import java.util.List; diff --git a/src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoRequest.java b/src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoRequest.java similarity index 76% rename from src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoRequest.java rename to src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoRequest.java index 9ca155e14d..17708391d3 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoRequest.java +++ b/src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.basicInfo; +package capstone.facefriend.member.dto.basicInfo; public record BasicInfoRequest( String nickname, diff --git a/src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoResponse.java b/src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoResponse.java similarity index 92% rename from src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoResponse.java rename to src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoResponse.java index 74f51f7dc8..436511ff41 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/basicInfo/BasicInfoResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/basicInfo/BasicInfoResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.basicInfo; +package capstone.facefriend.member.dto.basicInfo; import capstone.facefriend.member.domain.basicInfo.BasicInfo; diff --git a/src/main/java/capstone/facefriend/member/service/dto/faceInfo/FaceInfoResponse.java b/src/main/java/capstone/facefriend/member/dto/faceInfo/FaceInfoResponse.java similarity index 62% rename from src/main/java/capstone/facefriend/member/service/dto/faceInfo/FaceInfoResponse.java rename to src/main/java/capstone/facefriend/member/dto/faceInfo/FaceInfoResponse.java index eb9fc623ae..200c0eec10 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/faceInfo/FaceInfoResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/faceInfo/FaceInfoResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.faceInfo; +package capstone.facefriend.member.dto.faceInfo; public record FaceInfoResponse( String originS3url, diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/FindEmailResponse.java b/src/main/java/capstone/facefriend/member/dto/member/FindEmailResponse.java similarity index 62% rename from src/main/java/capstone/facefriend/member/service/dto/member/FindEmailResponse.java rename to src/main/java/capstone/facefriend/member/dto/member/FindEmailResponse.java index 07521a8f2b..1f950027c6 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/FindEmailResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/member/FindEmailResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record FindEmailResponse( String email, diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/ReissueRequest.java b/src/main/java/capstone/facefriend/member/dto/member/ReissueRequest.java similarity index 54% rename from src/main/java/capstone/facefriend/member/service/dto/member/ReissueRequest.java rename to src/main/java/capstone/facefriend/member/dto/member/ReissueRequest.java index 1e5da08c68..6b0b188c17 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/ReissueRequest.java +++ b/src/main/java/capstone/facefriend/member/dto/member/ReissueRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record ReissueRequest( String refreshToken diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/ResetPasswordRequest.java b/src/main/java/capstone/facefriend/member/dto/member/ResetPasswordRequest.java similarity index 64% rename from src/main/java/capstone/facefriend/member/service/dto/member/ResetPasswordRequest.java rename to src/main/java/capstone/facefriend/member/dto/member/ResetPasswordRequest.java index 350d06e58d..c6ec9e95da 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/ResetPasswordRequest.java +++ b/src/main/java/capstone/facefriend/member/dto/member/ResetPasswordRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record ResetPasswordRequest( String newPassword, diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/SignInRequest.java b/src/main/java/capstone/facefriend/member/dto/member/SignInRequest.java similarity index 59% rename from src/main/java/capstone/facefriend/member/service/dto/member/SignInRequest.java rename to src/main/java/capstone/facefriend/member/dto/member/SignInRequest.java index a77afc5062..27329adc26 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/SignInRequest.java +++ b/src/main/java/capstone/facefriend/member/dto/member/SignInRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record SignInRequest( String email, diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/SignUpRequest.java b/src/main/java/capstone/facefriend/member/dto/member/SignUpRequest.java similarity index 66% rename from src/main/java/capstone/facefriend/member/service/dto/member/SignUpRequest.java rename to src/main/java/capstone/facefriend/member/dto/member/SignUpRequest.java index 692decd22a..78cb271f6d 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/SignUpRequest.java +++ b/src/main/java/capstone/facefriend/member/dto/member/SignUpRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record SignUpRequest( String email, diff --git a/src/main/java/capstone/facefriend/member/service/dto/member/SignupResponse.java b/src/main/java/capstone/facefriend/member/dto/member/SignupResponse.java similarity index 51% rename from src/main/java/capstone/facefriend/member/service/dto/member/SignupResponse.java rename to src/main/java/capstone/facefriend/member/dto/member/SignupResponse.java index ba52662f76..8a3e08f51d 100644 --- a/src/main/java/capstone/facefriend/member/service/dto/member/SignupResponse.java +++ b/src/main/java/capstone/facefriend/member/dto/member/SignupResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.member.service.dto.member; +package capstone.facefriend.member.dto.member; public record SignupResponse( Long memberId diff --git a/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceException.java b/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceException.java new file mode 100644 index 0000000000..27e440e1a3 --- /dev/null +++ b/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceException.java @@ -0,0 +1,11 @@ +package capstone.facefriend.member.exception.faceInfo; + +import capstone.facefriend.common.exception.BaseException; +import capstone.facefriend.common.exception.ExceptionType; + +public class FaceException extends BaseException { + + public FaceException(ExceptionType exceptionType) { + super(exceptionType); + } +} diff --git a/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceExceptionType.java b/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceExceptionType.java new file mode 100644 index 0000000000..6f31e1e3ef --- /dev/null +++ b/src/main/java/capstone/facefriend/member/exception/faceInfo/FaceExceptionType.java @@ -0,0 +1,36 @@ +package capstone.facefriend.member.exception.faceInfo; + +import capstone.facefriend.common.exception.ExceptionType; +import capstone.facefriend.common.exception.Status; + +public enum FaceExceptionType implements ExceptionType { + + CANNOT_GET_BYTE(Status.SERVER_ERROR, 8001, "바이트를 추출할 수 없습니다."), + CANNOT_GET_INPUT_STREAM(Status.SERVER_ERROR, 8002, "인풋 스트림을 추출할 수 없습니다."); + ; + + private final Status status; + private final int exceptionCode; + private final String message; + + FaceExceptionType(Status status, int exceptionCode, String message) { + this.status = status; + this.exceptionCode = exceptionCode; + this.message = message; + } + + @Override + public Status status() { + return status; + } + + @Override + public int exceptionCode() { + return exceptionCode; + } + + @Override + public String message() { + return message; + } +} diff --git a/src/main/java/capstone/facefriend/member/domain/analysisInfo/AnalysisInfoRepository.java b/src/main/java/capstone/facefriend/member/repository/AnalysisInfoRepository.java similarity index 67% rename from src/main/java/capstone/facefriend/member/domain/analysisInfo/AnalysisInfoRepository.java rename to src/main/java/capstone/facefriend/member/repository/AnalysisInfoRepository.java index b3596e5e85..c1d5d6b4cc 100644 --- a/src/main/java/capstone/facefriend/member/domain/analysisInfo/AnalysisInfoRepository.java +++ b/src/main/java/capstone/facefriend/member/repository/AnalysisInfoRepository.java @@ -1,5 +1,6 @@ -package capstone.facefriend.member.domain.analysisInfo; +package capstone.facefriend.member.repository; +import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; import org.springframework.data.repository.Repository; public interface AnalysisInfoRepository extends Repository { diff --git a/src/main/java/capstone/facefriend/member/domain/basicInfo/BasicInfoRepository.java b/src/main/java/capstone/facefriend/member/repository/BasicInfoRepository.java similarity index 61% rename from src/main/java/capstone/facefriend/member/domain/basicInfo/BasicInfoRepository.java rename to src/main/java/capstone/facefriend/member/repository/BasicInfoRepository.java index 29d6602dff..1cefd15920 100644 --- a/src/main/java/capstone/facefriend/member/domain/basicInfo/BasicInfoRepository.java +++ b/src/main/java/capstone/facefriend/member/repository/BasicInfoRepository.java @@ -1,5 +1,6 @@ -package capstone.facefriend.member.domain.basicInfo; +package capstone.facefriend.member.repository; +import capstone.facefriend.member.domain.basicInfo.BasicInfo; import org.springframework.data.repository.Repository; public interface BasicInfoRepository extends Repository { diff --git a/src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoByLevelRepository.java b/src/main/java/capstone/facefriend/member/repository/FaceInfoByLevelRepository.java similarity index 64% rename from src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoByLevelRepository.java rename to src/main/java/capstone/facefriend/member/repository/FaceInfoByLevelRepository.java index 93ad93fe52..580e92dd8b 100644 --- a/src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoByLevelRepository.java +++ b/src/main/java/capstone/facefriend/member/repository/FaceInfoByLevelRepository.java @@ -1,5 +1,6 @@ -package capstone.facefriend.member.domain.faceInfo; +package capstone.facefriend.member.repository; +import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevel; import org.springframework.data.repository.Repository; public interface FaceInfoByLevelRepository extends Repository { diff --git a/src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoRepository.java b/src/main/java/capstone/facefriend/member/repository/FaceInfoRepository.java similarity index 70% rename from src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoRepository.java rename to src/main/java/capstone/facefriend/member/repository/FaceInfoRepository.java index 4123be4b04..b19ebae930 100644 --- a/src/main/java/capstone/facefriend/member/domain/faceInfo/FaceInfoRepository.java +++ b/src/main/java/capstone/facefriend/member/repository/FaceInfoRepository.java @@ -1,5 +1,6 @@ -package capstone.facefriend.member.domain.faceInfo; +package capstone.facefriend.member.repository; +import capstone.facefriend.member.domain.faceInfo.FaceInfo; import org.springframework.data.repository.Repository; public interface FaceInfoRepository extends Repository { diff --git a/src/main/java/capstone/facefriend/member/domain/member/MemberRepository.java b/src/main/java/capstone/facefriend/member/repository/MemberRepository.java similarity index 75% rename from src/main/java/capstone/facefriend/member/domain/member/MemberRepository.java rename to src/main/java/capstone/facefriend/member/repository/MemberRepository.java index 67b85d6746..35a777eabe 100644 --- a/src/main/java/capstone/facefriend/member/domain/member/MemberRepository.java +++ b/src/main/java/capstone/facefriend/member/repository/MemberRepository.java @@ -1,5 +1,6 @@ -package capstone.facefriend.member.domain.member; +package capstone.facefriend.member.repository; +import capstone.facefriend.member.domain.member.Member; import org.springframework.data.repository.Repository; import java.util.Optional; diff --git a/src/main/java/capstone/facefriend/member/service/AnalysisInfoService.java b/src/main/java/capstone/facefriend/member/service/AnalysisInfoService.java index bbc6251cb8..f291350aca 100644 --- a/src/main/java/capstone/facefriend/member/service/AnalysisInfoService.java +++ b/src/main/java/capstone/facefriend/member/service/AnalysisInfoService.java @@ -2,13 +2,13 @@ import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.analysis.AnalysisException; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.service.deserializer.StringListDeserializer; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoFullResponse; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoFullShortResponse; -import capstone.facefriend.member.service.dto.analysisInfo.AnalysisInfoShortResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoFullResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoFullShortResponse; +import capstone.facefriend.member.dto.analysisInfo.AnalysisInfoShortResponse; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/src/main/java/capstone/facefriend/member/service/BasicInfoService.java b/src/main/java/capstone/facefriend/member/service/BasicInfoService.java index ab31250a39..2f3743f11c 100644 --- a/src/main/java/capstone/facefriend/member/service/BasicInfoService.java +++ b/src/main/java/capstone/facefriend/member/service/BasicInfoService.java @@ -3,10 +3,10 @@ import capstone.facefriend.member.domain.basicInfo.BasicInfo; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; -import capstone.facefriend.member.service.dto.basicInfo.BasicInfoRequest; -import capstone.facefriend.member.service.dto.basicInfo.BasicInfoResponse; +import capstone.facefriend.member.dto.basicInfo.BasicInfoRequest; +import capstone.facefriend.member.dto.basicInfo.BasicInfoResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/capstone/facefriend/member/service/FaceInfoService.java b/src/main/java/capstone/facefriend/member/service/FaceInfoService.java index 644c29bfe1..b16e781cac 100644 --- a/src/main/java/capstone/facefriend/member/service/FaceInfoService.java +++ b/src/main/java/capstone/facefriend/member/service/FaceInfoService.java @@ -2,13 +2,13 @@ import capstone.facefriend.bucket.BucketService; import capstone.facefriend.member.domain.faceInfo.FaceInfo; -import capstone.facefriend.member.domain.faceInfo.FaceInfoRepository; +import capstone.facefriend.member.repository.FaceInfoRepository; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.member.exception.member.MemberExceptionType; import capstone.facefriend.member.multipartFile.ByteArrayMultipartFile; -import capstone.facefriend.member.service.dto.faceInfo.FaceInfoResponse; +import capstone.facefriend.member.dto.faceInfo.FaceInfoResponse; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/capstone/facefriend/member/service/MemberService.java b/src/main/java/capstone/facefriend/member/service/MemberService.java index 10455b2ef2..5a048d8c32 100644 --- a/src/main/java/capstone/facefriend/member/service/MemberService.java +++ b/src/main/java/capstone/facefriend/member/service/MemberService.java @@ -1,24 +1,23 @@ package capstone.facefriend.member.service; -import capstone.facefriend.auth.controller.dto.TokenResponse; -import capstone.facefriend.auth.domain.TokenProvider; -import capstone.facefriend.email.controller.dto.EmailVerificationResponse; +import capstone.facefriend.auth.dto.TokenResponse; +import capstone.facefriend.auth.domain.token.TokenProvider; +import capstone.facefriend.email.dto.EmailVerificationResponse; import capstone.facefriend.email.service.EmailService; import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; -import capstone.facefriend.member.domain.analysisInfo.AnalysisInfoRepository; +import capstone.facefriend.member.repository.AnalysisInfoRepository; import capstone.facefriend.member.domain.basicInfo.BasicInfo; -import capstone.facefriend.member.domain.basicInfo.BasicInfoRepository; +import capstone.facefriend.member.repository.BasicInfoRepository; import capstone.facefriend.member.domain.faceInfo.FaceInfo; -import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevel; -import capstone.facefriend.member.domain.faceInfo.FaceInfoByLevelRepository; -import capstone.facefriend.member.domain.faceInfo.FaceInfoRepository; +import capstone.facefriend.member.repository.FaceInfoByLevelRepository; +import capstone.facefriend.member.repository.FaceInfoRepository; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; -import capstone.facefriend.member.service.dto.member.FindEmailResponse; -import capstone.facefriend.member.service.dto.member.SignInRequest; -import capstone.facefriend.member.service.dto.member.SignUpRequest; -import capstone.facefriend.member.service.dto.member.SignupResponse; +import capstone.facefriend.member.dto.member.FindEmailResponse; +import capstone.facefriend.member.dto.member.SignInRequest; +import capstone.facefriend.member.dto.member.SignUpRequest; +import capstone.facefriend.member.dto.member.SignupResponse; import capstone.facefriend.redis.RedisDao; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class MemberService { private static final Long BLACKLIST_REMAIN_MINUTE = 1000 * 60 * 60 * 12L; // 12 시간 - @Value("${spring.cloud.aws.s3.default-faceInfo-s3url}") + @Value("${spring.cloud.aws.s3.default-profile}") private String defaultFaceInfoS3url; @Transactional diff --git a/src/main/java/capstone/facefriend/resume/controller/ResumeController.java b/src/main/java/capstone/facefriend/resume/controller/ResumeController.java index ee574cb7bf..bf80bd2e2c 100644 --- a/src/main/java/capstone/facefriend/resume/controller/ResumeController.java +++ b/src/main/java/capstone/facefriend/resume/controller/ResumeController.java @@ -1,8 +1,8 @@ package capstone.facefriend.resume.controller; import capstone.facefriend.auth.controller.support.AuthMember; +import capstone.facefriend.resume.dto.*; import capstone.facefriend.resume.service.ResumeService; -import capstone.facefriend.resume.service.dto.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/src/main/java/capstone/facefriend/resume/service/dto/ResumeDeleteResponse.java b/src/main/java/capstone/facefriend/resume/dto/ResumeDeleteResponse.java similarity index 57% rename from src/main/java/capstone/facefriend/resume/service/dto/ResumeDeleteResponse.java rename to src/main/java/capstone/facefriend/resume/dto/ResumeDeleteResponse.java index c2ab6265ff..7c0477c7da 100644 --- a/src/main/java/capstone/facefriend/resume/service/dto/ResumeDeleteResponse.java +++ b/src/main/java/capstone/facefriend/resume/dto/ResumeDeleteResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.resume.service.dto; +package capstone.facefriend.resume.dto; public record ResumeDeleteResponse( String message diff --git a/src/main/java/capstone/facefriend/resume/service/dto/ResumeGetResponse.java b/src/main/java/capstone/facefriend/resume/dto/ResumeGetResponse.java similarity index 93% rename from src/main/java/capstone/facefriend/resume/service/dto/ResumeGetResponse.java rename to src/main/java/capstone/facefriend/resume/dto/ResumeGetResponse.java index 95bc849e70..fb05624834 100644 --- a/src/main/java/capstone/facefriend/resume/service/dto/ResumeGetResponse.java +++ b/src/main/java/capstone/facefriend/resume/dto/ResumeGetResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.resume.service.dto; +package capstone.facefriend.resume.dto; import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; import capstone.facefriend.member.domain.basicInfo.BasicInfo; diff --git a/src/main/java/capstone/facefriend/resume/service/dto/ResumeHomeDetailResponse.java b/src/main/java/capstone/facefriend/resume/dto/ResumeHomeDetailResponse.java similarity index 88% rename from src/main/java/capstone/facefriend/resume/service/dto/ResumeHomeDetailResponse.java rename to src/main/java/capstone/facefriend/resume/dto/ResumeHomeDetailResponse.java index 9e6e22f65e..2c43f6db5a 100644 --- a/src/main/java/capstone/facefriend/resume/service/dto/ResumeHomeDetailResponse.java +++ b/src/main/java/capstone/facefriend/resume/dto/ResumeHomeDetailResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.resume.service.dto; +package capstone.facefriend.resume.dto; import com.querydsl.core.annotations.QueryProjection; import lombok.Data; diff --git a/src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutRequest.java b/src/main/java/capstone/facefriend/resume/dto/ResumePostPutRequest.java similarity index 81% rename from src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutRequest.java rename to src/main/java/capstone/facefriend/resume/dto/ResumePostPutRequest.java index 61a3c66fac..014135fbd5 100644 --- a/src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutRequest.java +++ b/src/main/java/capstone/facefriend/resume/dto/ResumePostPutRequest.java @@ -1,4 +1,4 @@ -package capstone.facefriend.resume.service.dto; +package capstone.facefriend.resume.dto; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutResponse.java b/src/main/java/capstone/facefriend/resume/dto/ResumePostPutResponse.java similarity index 92% rename from src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutResponse.java rename to src/main/java/capstone/facefriend/resume/dto/ResumePostPutResponse.java index 1813bccfb7..d9a4d6bb01 100644 --- a/src/main/java/capstone/facefriend/resume/service/dto/ResumePostPutResponse.java +++ b/src/main/java/capstone/facefriend/resume/dto/ResumePostPutResponse.java @@ -1,4 +1,4 @@ -package capstone.facefriend.resume.service.dto; +package capstone.facefriend.resume.dto; import capstone.facefriend.member.domain.analysisInfo.AnalysisInfo; import capstone.facefriend.member.domain.basicInfo.BasicInfo; diff --git a/src/main/java/capstone/facefriend/resume/domain/ResumeRepository.java b/src/main/java/capstone/facefriend/resume/repository/ResumeRepository.java similarity index 77% rename from src/main/java/capstone/facefriend/resume/domain/ResumeRepository.java rename to src/main/java/capstone/facefriend/resume/repository/ResumeRepository.java index 369520470e..166cb1b29a 100644 --- a/src/main/java/capstone/facefriend/resume/domain/ResumeRepository.java +++ b/src/main/java/capstone/facefriend/resume/repository/ResumeRepository.java @@ -1,10 +1,9 @@ -package capstone.facefriend.resume.domain; +package capstone.facefriend.resume.repository; import capstone.facefriend.member.domain.member.Member; -import org.springframework.data.jpa.repository.Query; +import capstone.facefriend.resume.domain.Resume; import org.springframework.data.repository.Repository; -import java.util.List; import java.util.Optional; public interface ResumeRepository extends Repository, ResumeRepositoryCustom { diff --git a/src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryCustom.java b/src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryCustom.java similarity index 76% rename from src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryCustom.java rename to src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryCustom.java index 5f4168dbf2..2cd8d24dce 100644 --- a/src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryCustom.java +++ b/src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryCustom.java @@ -1,6 +1,6 @@ -package capstone.facefriend.resume.domain; +package capstone.facefriend.resume.repository; -import capstone.facefriend.resume.service.dto.ResumeHomeDetailResponse; +import capstone.facefriend.resume.dto.ResumeHomeDetailResponse; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryImpl.java b/src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryImpl.java similarity index 95% rename from src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryImpl.java rename to src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryImpl.java index 0bcf461352..13ace78112 100644 --- a/src/main/java/capstone/facefriend/resume/domain/ResumeRepositoryImpl.java +++ b/src/main/java/capstone/facefriend/resume/repository/ResumeRepositoryImpl.java @@ -1,11 +1,12 @@ -package capstone.facefriend.resume.domain; +package capstone.facefriend.resume.repository; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.domain.member.QMember; import capstone.facefriend.member.exception.member.MemberException; +import capstone.facefriend.resume.domain.Resume; import capstone.facefriend.resume.service.dto.QResumeHomeDetailResponse; -import capstone.facefriend.resume.service.dto.ResumeHomeDetailResponse; +import capstone.facefriend.resume.dto.ResumeHomeDetailResponse; import com.querydsl.core.BooleanBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/capstone/facefriend/resume/service/ResumeService.java b/src/main/java/capstone/facefriend/resume/service/ResumeService.java index 1fe0aa2ae0..e2a6876825 100644 --- a/src/main/java/capstone/facefriend/resume/service/ResumeService.java +++ b/src/main/java/capstone/facefriend/resume/service/ResumeService.java @@ -3,12 +3,12 @@ import capstone.facefriend.bucket.BucketService; import capstone.facefriend.member.domain.member.Member; -import capstone.facefriend.member.domain.member.MemberRepository; +import capstone.facefriend.member.repository.MemberRepository; import capstone.facefriend.member.exception.member.MemberException; import capstone.facefriend.resume.domain.Resume; -import capstone.facefriend.resume.domain.ResumeRepository; +import capstone.facefriend.resume.dto.*; +import capstone.facefriend.resume.repository.ResumeRepository; import capstone.facefriend.resume.exception.ResumeException; -import capstone.facefriend.resume.service.dto.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page;