[REFACTOR] 프로젝트 안정성 이슈로 인한 기존 PR 복구

src/main/java/hyu/erica/v1/capstone/CapstoneApplication.java → src/main/java/hyu/erica/capstone/CapstoneApplication.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone;
+package hyu.erica.capstone;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/hyu/erica/v1/capstone/api/ApiResponse.java → src/main/java/hyu/erica/capstone/api/ApiResponse.java

@@ -1,11 +1,11 @@
-package hyu.erica.v1.capstone.api;
+package hyu.erica.capstone.api;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import hyu.erica.v1.capstone.api.code.BaseCode;
-import hyu.erica.v1.capstone.api.code.status.ErrorStatus;
-import hyu.erica.v1.capstone.api.code.status.SuccessStatus;
+import hyu.erica.capstone.api.code.BaseCode;
+import hyu.erica.capstone.api.code.status.ErrorStatus;
+import hyu.erica.capstone.api.code.status.SuccessStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/hyu/erica/v1/capstone/api/code/BaseCode.java → src/main/java/hyu/erica/capstone/api/code/BaseCode.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.api.code;
+package hyu.erica.capstone.api.code;
 
 
 public interface BaseCode {

src/main/java/hyu/erica/v1/capstone/api/code/BaseErrorCode.java → src/main/java/hyu/erica/capstone/api/code/BaseErrorCode.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.api.code;
+package hyu.erica.capstone.api.code;
 
 public interface BaseErrorCode {
 

src/main/java/hyu/erica/v1/capstone/api/code/ErrorReasonDTO.java → src/main/java/hyu/erica/capstone/api/code/ErrorReasonDTO.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.api.code;
+package hyu.erica.capstone.api.code;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/hyu/erica/v1/capstone/api/code/ReasonDTO.java → src/main/java/hyu/erica/capstone/api/code/ReasonDTO.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.api.code;
+package hyu.erica.capstone.api.code;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/hyu/erica/v1/capstone/api/code/status/ErrorStatus.java → src/main/java/hyu/erica/capstone/api/code/status/ErrorStatus.java

@@ -1,7 +1,7 @@
-package hyu.erica.v1.capstone.api.code.status;
+package hyu.erica.capstone.api.code.status;
 
-import hyu.erica.v1.capstone.api.code.BaseErrorCode;
-import hyu.erica.v1.capstone.api.code.ErrorReasonDTO;
+import hyu.erica.capstone.api.code.BaseErrorCode;
+import hyu.erica.capstone.api.code.ErrorReasonDTO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

src/main/java/hyu/erica/v1/capstone/api/code/status/SuccessStatus.java → src/main/java/hyu/erica/capstone/api/code/status/SuccessStatus.java

@@ -1,7 +1,7 @@
-package hyu.erica.v1.capstone.api.code.status;
+package hyu.erica.capstone.api.code.status;
 
-import hyu.erica.v1.capstone.api.code.BaseCode;
-import hyu.erica.v1.capstone.api.code.ReasonDTO;
+import hyu.erica.capstone.api.code.BaseCode;
+import hyu.erica.capstone.api.code.ReasonDTO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

src/main/java/hyu/erica/v1/capstone/api/exception/ExceptionAdvice.java → src/main/java/hyu/erica/capstone/api/exception/ExceptionAdvice.java

@@ -1,11 +1,18 @@
-package hyu.erica.v1.capstone.api.exception;
+package hyu.erica.capstone.api.exception;
 
 
-import hyu.erica.v1.capstone.api.ApiResponse;
-import hyu.erica.v1.capstone.api.code.status.ErrorStatus;
+import hyu.erica.capstone.api.ApiResponse;
+import hyu.erica.capstone.api.code.status.ErrorStatus;
+import jakarta.validation.ConstraintViolationException;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 
 
 @Slf4j

src/main/java/hyu/erica/v1/capstone/api/exception/GeneralException.java → src/main/java/hyu/erica/capstone/api/exception/GeneralException.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.api.exception;
+package hyu.erica.capstone.api.exception;
 
-import hyu.erica.v1.capstone.api.code.status.ErrorStatus;
+import hyu.erica.capstone.api.code.status.ErrorStatus;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/hyu/erica/v1/capstone/client/PlanClient.java → src/main/java/hyu/erica/capstone/client/PlanClient.java

@@ -1,11 +1,13 @@
-package hyu.erica.v1.capstone.client;
+package hyu.erica.capstone.client;
 
-import hyu.erica.v1.capstone.web.dto.client.AttractionRequestDTO;
-import hyu.erica.v1.capstone.web.dto.client.RestaurantRequestDTO;
-import hyu.erica.v1.capstone.web.dto.client.StyleRequestDTO;
+import hyu.erica.capstone.web.dto.client.AttractionRequestDTO;
+import hyu.erica.capstone.web.dto.client.RestaurantRequestDTO;
+import hyu.erica.capstone.web.dto.client.StyleRequestDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "planApiClient", url = "${plan.api.url}")
 public interface PlanClient {

src/main/java/hyu/erica/v1/capstone/config/SwaggerConfig.java → src/main/java/hyu/erica/capstone/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.config;
+package hyu.erica.capstone.config;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;

src/main/java/hyu/erica/v1/capstone/config/WebSecurity.java → src/main/java/hyu/erica/capstone/config/WebSecurity.java

@@ -1,8 +1,8 @@
-package hyu.erica.v1.capstone.config;
+package hyu.erica.capstone.config;
 
-import hyu.erica.v1.capstone.security.JwtAuthenticationFilter;
-import hyu.erica.v1.capstone.security.JwtTokenProvider;
-import hyu.erica.v1.capstone.service.auth.AuthService;
+import hyu.erica.capstone.security.JwtAuthenticationFilter;
+import hyu.erica.capstone.security.JwtTokenProvider;
+import hyu.erica.capstone.service.auth.AuthService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/hyu/erica/v1/capstone/domain/Attraction.java → src/main/java/hyu/erica/capstone/domain/Attraction.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/hyu/erica/v1/capstone/domain/Restaurant.java → src/main/java/hyu/erica/capstone/domain/Restaurant.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/hyu/erica/v1/capstone/domain/Style.java → src/main/java/hyu/erica/capstone/domain/Style.java

@@ -1,15 +1,16 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 
-import hyu.erica.v1.capstone.domain.enums.City;
+import hyu.erica.capstone.domain.enums.City;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/hyu/erica/v1/capstone/domain/TripPlan.java → src/main/java/hyu/erica/capstone/domain/TripPlan.java

@@ -1,10 +1,10 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 import static jakarta.persistence.GenerationType.*;
 
-import hyu.erica.v1.capstone.domain.enums.TripPlanStatus;
-import hyu.erica.v1.capstone.domain.mapping.PreferAttraction;
-import hyu.erica.v1.capstone.domain.mapping.PreferRestaurant;
+import hyu.erica.capstone.domain.enums.TripPlanStatus;
+import hyu.erica.capstone.domain.mapping.PreferAttraction;
+import hyu.erica.capstone.domain.mapping.PreferRestaurant;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;

src/main/java/hyu/erica/v1/capstone/domain/TripScheduleItem.java → src/main/java/hyu/erica/capstone/domain/TripScheduleItem.java

@@ -1,9 +1,9 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 import static jakarta.persistence.EnumType.*;
 import static jakarta.persistence.GenerationType.IDENTITY;
 
-import hyu.erica.v1.capstone.domain.enums.PlaceType;
+import hyu.erica.capstone.domain.enums.PlaceType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;

src/main/java/hyu/erica/v1/capstone/domain/User.java → src/main/java/hyu/erica/capstone/domain/User.java

@@ -1,18 +1,19 @@
-package hyu.erica.v1.capstone.domain;
+package hyu.erica.capstone.domain;
 
 
 import static jakarta.persistence.EnumType.*;
 
-import hyu.erica.v1.capstone.domain.base.BaseEntity;
-import hyu.erica.v1.capstone.domain.enums.Gender;
-import hyu.erica.v1.capstone.domain.enums.PhoneService;
-import hyu.erica.v1.capstone.domain.enums.ThirdPartyLogin;
+import hyu.erica.capstone.domain.base.BaseEntity;
+import hyu.erica.capstone.domain.enums.Gender;
+import hyu.erica.capstone.domain.enums.PhoneService;
+import hyu.erica.capstone.domain.enums.ThirdPartyLogin;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import java.time.LocalDate;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/hyu/erica/v1/capstone/domain/base/BaseEntity.java → src/main/java/hyu/erica/capstone/domain/base/BaseEntity.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.base;
+package hyu.erica.capstone.domain.base;
 
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;

src/main/java/hyu/erica/v1/capstone/domain/enums/City.java → src/main/java/hyu/erica/capstone/domain/enums/City.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.enums;
+package hyu.erica.capstone.domain.enums;
 
 public enum City {
     BUSAN, DAEGU, INCHEON, JEJU, SEOUL

src/main/java/hyu/erica/capstone/domain/enums/Gender.java

@@ -0,0 +1,5 @@
+package hyu.erica.capstone.domain.enums;
+
+public enum Gender {
+    MALE, FEMALE
+}

src/main/java/hyu/erica/v1/capstone/domain/enums/PhoneService.java → src/main/java/hyu/erica/capstone/domain/enums/PhoneService.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.enums;
+package hyu.erica.capstone.domain.enums;
 
 public enum PhoneService {
     SKT,

src/main/java/hyu/erica/v1/capstone/domain/enums/PlaceType.java → src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.enums;
+package hyu.erica.capstone.domain.enums;
 
 public enum PlaceType {
     ATTRACTION, RESTAURANT

src/main/java/hyu/erica/v1/capstone/domain/enums/ThirdPartyLogin.java → src/main/java/hyu/erica/capstone/domain/enums/ThirdPartyLogin.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.enums;
+package hyu.erica.capstone.domain.enums;
 
 public enum ThirdPartyLogin {
     GOOGLE, NAVER, KAKAO

src/main/java/hyu/erica/v1/capstone/domain/enums/TripPlanStatus.java → src/main/java/hyu/erica/capstone/domain/enums/TripPlanStatus.java

@@ -1,4 +1,4 @@
-package hyu.erica.v1.capstone.domain.enums;
+package hyu.erica.capstone.domain.enums;
 
 public enum TripPlanStatus {
     PROGRESSING, DONE, FAILED

src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferAttraction.java → src/main/java/hyu/erica/capstone/domain/mapping/PreferAttraction.java

@@ -1,18 +1,19 @@
-package hyu.erica.v1.capstone.domain.mapping;
+package hyu.erica.capstone.domain.mapping;
 
 import static jakarta.persistence.GenerationType.*;
 
-import hyu.erica.v1.capstone.domain.Attraction;
-import hyu.erica.v1.capstone.domain.TripPlan;
-import hyu.erica.v1.capstone.domain.User;
-import hyu.erica.v1.capstone.domain.base.BaseEntity;
+import hyu.erica.capstone.domain.Attraction;
+import hyu.erica.capstone.domain.TripPlan;
+import hyu.erica.capstone.domain.User;
+import hyu.erica.capstone.domain.base.BaseEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferRestaurant.java → src/main/java/hyu/erica/capstone/domain/mapping/PreferRestaurant.java

@@ -1,11 +1,11 @@
-package hyu.erica.v1.capstone.domain.mapping;
+package hyu.erica.capstone.domain.mapping;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 
-import hyu.erica.v1.capstone.domain.Restaurant;
-import hyu.erica.v1.capstone.domain.TripPlan;
-import hyu.erica.v1.capstone.domain.User;
-import hyu.erica.v1.capstone.domain.base.BaseEntity;
+import hyu.erica.capstone.domain.Restaurant;
+import hyu.erica.capstone.domain.TripPlan;
+import hyu.erica.capstone.domain.User;
+import hyu.erica.capstone.domain.base.BaseEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

src/main/java/hyu/erica/v1/capstone/repository/AttractionRepository.java → src/main/java/hyu/erica/capstone/repository/AttractionRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.Attraction;
+import hyu.erica.capstone.domain.Attraction;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/PreferAttractionRepository.java → src/main/java/hyu/erica/capstone/repository/PreferAttractionRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.mapping.PreferAttraction;
+import hyu.erica.capstone.domain.mapping.PreferAttraction;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/PreferRestaurantRepository.java → src/main/java/hyu/erica/capstone/repository/PreferRestaurantRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.mapping.PreferRestaurant;
+import hyu.erica.capstone.domain.mapping.PreferRestaurant;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/RestaurantRepository.java → src/main/java/hyu/erica/capstone/repository/RestaurantRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.Restaurant;
+import hyu.erica.capstone.domain.Restaurant;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/StyleRepository.java → src/main/java/hyu/erica/capstone/repository/StyleRepository.java

@@ -1,6 +1,8 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.Style;
+import hyu.erica.capstone.domain.Style;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface StyleRepository extends JpaRepository<Style, Long> {

src/main/java/hyu/erica/v1/capstone/repository/TripPlanRepository.java → src/main/java/hyu/erica/capstone/repository/TripPlanRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.TripPlan;
+import hyu.erica.capstone.domain.TripPlan;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/TripScheduleItemRepository.java → src/main/java/hyu/erica/capstone/repository/TripScheduleItemRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.TripScheduleItem;
+import hyu.erica.capstone.domain.TripScheduleItem;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/repository/UserRepository.java → src/main/java/hyu/erica/capstone/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package hyu.erica.v1.capstone.repository;
+package hyu.erica.capstone.repository;
 
-import hyu.erica.v1.capstone.domain.User;
+import hyu.erica.capstone.domain.User;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/hyu/erica/v1/capstone/security/JwtAuthenticationFilter.java → src/main/java/hyu/erica/capstone/security/JwtAuthenticationFilter.java

@@ -1,8 +1,8 @@
-package hyu.erica.v1.capstone.security;
+package hyu.erica.capstone.security;
 
-import hyu.erica.v1.capstone.api.exception.GeneralException;
-import hyu.erica.v1.capstone.security.details.CustomUserDetails;
-import hyu.erica.v1.capstone.service.auth.AuthService;
+import hyu.erica.capstone.api.exception.GeneralException;
+import hyu.erica.capstone.security.details.CustomUserDetails;
+import hyu.erica.capstone.service.auth.AuthService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;