diff --git a/src/main/java/hyu/erica/v1/capstone/CapstoneApplication.java b/src/main/java/hyu/erica/capstone/CapstoneApplication.java similarity index 94% rename from src/main/java/hyu/erica/v1/capstone/CapstoneApplication.java rename to src/main/java/hyu/erica/capstone/CapstoneApplication.java index 9b733a8..a305ec3 100644 --- a/src/main/java/hyu/erica/v1/capstone/CapstoneApplication.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/ApiResponse.java b/src/main/java/hyu/erica/capstone/api/ApiResponse.java similarity index 90% rename from src/main/java/hyu/erica/v1/capstone/api/ApiResponse.java rename to src/main/java/hyu/erica/capstone/api/ApiResponse.java index a4d778b..cbe2267 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/ApiResponse.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/BaseCode.java b/src/main/java/hyu/erica/capstone/api/code/BaseCode.java similarity index 73% rename from src/main/java/hyu/erica/v1/capstone/api/code/BaseCode.java rename to src/main/java/hyu/erica/capstone/api/code/BaseCode.java index ed4c71d..58b731f 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/BaseCode.java +++ b/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 { diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/BaseErrorCode.java b/src/main/java/hyu/erica/capstone/api/code/BaseErrorCode.java similarity index 75% rename from src/main/java/hyu/erica/v1/capstone/api/code/BaseErrorCode.java rename to src/main/java/hyu/erica/capstone/api/code/BaseErrorCode.java index 1fce288..6ceecfa 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/BaseErrorCode.java +++ b/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 { diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/ErrorReasonDTO.java b/src/main/java/hyu/erica/capstone/api/code/ErrorReasonDTO.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/api/code/ErrorReasonDTO.java rename to src/main/java/hyu/erica/capstone/api/code/ErrorReasonDTO.java index ce530ae..c79342e 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/ErrorReasonDTO.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/ReasonDTO.java b/src/main/java/hyu/erica/capstone/api/code/ReasonDTO.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/api/code/ReasonDTO.java rename to src/main/java/hyu/erica/capstone/api/code/ReasonDTO.java index a9cceca..57f1149 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/ReasonDTO.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/status/ErrorStatus.java b/src/main/java/hyu/erica/capstone/api/code/status/ErrorStatus.java similarity index 96% rename from src/main/java/hyu/erica/v1/capstone/api/code/status/ErrorStatus.java rename to src/main/java/hyu/erica/capstone/api/code/status/ErrorStatus.java index 3a0a23b..0d66b78 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/status/ErrorStatus.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/code/status/SuccessStatus.java b/src/main/java/hyu/erica/capstone/api/code/status/SuccessStatus.java similarity index 87% rename from src/main/java/hyu/erica/v1/capstone/api/code/status/SuccessStatus.java rename to src/main/java/hyu/erica/capstone/api/code/status/SuccessStatus.java index 5f98981..b6f1efd 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/code/status/SuccessStatus.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/api/exception/ExceptionAdvice.java b/src/main/java/hyu/erica/capstone/api/exception/ExceptionAdvice.java similarity index 66% rename from src/main/java/hyu/erica/v1/capstone/api/exception/ExceptionAdvice.java rename to src/main/java/hyu/erica/capstone/api/exception/ExceptionAdvice.java index 3880bc2..9c80367 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/exception/ExceptionAdvice.java +++ b/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 diff --git a/src/main/java/hyu/erica/v1/capstone/api/exception/GeneralException.java b/src/main/java/hyu/erica/capstone/api/exception/GeneralException.java similarity index 72% rename from src/main/java/hyu/erica/v1/capstone/api/exception/GeneralException.java rename to src/main/java/hyu/erica/capstone/api/exception/GeneralException.java index aba86f5..7b8ef83 100644 --- a/src/main/java/hyu/erica/v1/capstone/api/exception/GeneralException.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/client/PlanClient.java b/src/main/java/hyu/erica/capstone/client/PlanClient.java similarity index 60% rename from src/main/java/hyu/erica/v1/capstone/client/PlanClient.java rename to src/main/java/hyu/erica/capstone/client/PlanClient.java index daa24a4..f08a397 100644 --- a/src/main/java/hyu/erica/v1/capstone/client/PlanClient.java +++ b/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 { diff --git a/src/main/java/hyu/erica/v1/capstone/config/SwaggerConfig.java b/src/main/java/hyu/erica/capstone/config/SwaggerConfig.java similarity index 97% rename from src/main/java/hyu/erica/v1/capstone/config/SwaggerConfig.java rename to src/main/java/hyu/erica/capstone/config/SwaggerConfig.java index aaf237f..7ce739f 100644 --- a/src/main/java/hyu/erica/v1/capstone/config/SwaggerConfig.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/config/WebSecurity.java b/src/main/java/hyu/erica/capstone/config/WebSecurity.java similarity index 90% rename from src/main/java/hyu/erica/v1/capstone/config/WebSecurity.java rename to src/main/java/hyu/erica/capstone/config/WebSecurity.java index 511a175..1fd6d91 100644 --- a/src/main/java/hyu/erica/v1/capstone/config/WebSecurity.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/Attraction.java b/src/main/java/hyu/erica/capstone/domain/Attraction.java similarity index 98% rename from src/main/java/hyu/erica/v1/capstone/domain/Attraction.java rename to src/main/java/hyu/erica/capstone/domain/Attraction.java index a05c08d..4063588 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/Attraction.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/Restaurant.java b/src/main/java/hyu/erica/capstone/domain/Restaurant.java similarity index 99% rename from src/main/java/hyu/erica/v1/capstone/domain/Restaurant.java rename to src/main/java/hyu/erica/capstone/domain/Restaurant.java index 4ec5bed..5317c56 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/Restaurant.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/Style.java b/src/main/java/hyu/erica/capstone/domain/Style.java similarity index 91% rename from src/main/java/hyu/erica/v1/capstone/domain/Style.java rename to src/main/java/hyu/erica/capstone/domain/Style.java index dffcb38..a1a1287 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/Style.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/TripPlan.java b/src/main/java/hyu/erica/capstone/domain/TripPlan.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/domain/TripPlan.java rename to src/main/java/hyu/erica/capstone/domain/TripPlan.java index 95e674c..c41bdac 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/TripPlan.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/TripScheduleItem.java b/src/main/java/hyu/erica/capstone/domain/TripScheduleItem.java similarity index 94% rename from src/main/java/hyu/erica/v1/capstone/domain/TripScheduleItem.java rename to src/main/java/hyu/erica/capstone/domain/TripScheduleItem.java index 782c84b..d198ade 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/TripScheduleItem.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/User.java b/src/main/java/hyu/erica/capstone/domain/User.java similarity index 85% rename from src/main/java/hyu/erica/v1/capstone/domain/User.java rename to src/main/java/hyu/erica/capstone/domain/User.java index e1514ff..8db3a2e 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/User.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/base/BaseEntity.java b/src/main/java/hyu/erica/capstone/domain/base/BaseEntity.java similarity index 92% rename from src/main/java/hyu/erica/v1/capstone/domain/base/BaseEntity.java rename to src/main/java/hyu/erica/capstone/domain/base/BaseEntity.java index ee0d9ff..758342d 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/base/BaseEntity.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/City.java b/src/main/java/hyu/erica/capstone/domain/enums/City.java similarity index 58% rename from src/main/java/hyu/erica/v1/capstone/domain/enums/City.java rename to src/main/java/hyu/erica/capstone/domain/enums/City.java index 1293396..bf21044 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/City.java +++ b/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 diff --git a/src/main/java/hyu/erica/capstone/domain/enums/Gender.java b/src/main/java/hyu/erica/capstone/domain/enums/Gender.java new file mode 100644 index 0000000..9a0c86c --- /dev/null +++ b/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 +} diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/PhoneService.java b/src/main/java/hyu/erica/capstone/domain/enums/PhoneService.java similarity index 56% rename from src/main/java/hyu/erica/v1/capstone/domain/enums/PhoneService.java rename to src/main/java/hyu/erica/capstone/domain/enums/PhoneService.java index b4bd7f4..bd47aeb 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/PhoneService.java +++ b/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, diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/PlaceType.java b/src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java similarity index 55% rename from src/main/java/hyu/erica/v1/capstone/domain/enums/PlaceType.java rename to src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java index b6705dc..2d16be3 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/PlaceType.java +++ b/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 diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/ThirdPartyLogin.java b/src/main/java/hyu/erica/capstone/domain/enums/ThirdPartyLogin.java similarity index 56% rename from src/main/java/hyu/erica/v1/capstone/domain/enums/ThirdPartyLogin.java rename to src/main/java/hyu/erica/capstone/domain/enums/ThirdPartyLogin.java index f64e4a9..61bc695 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/ThirdPartyLogin.java +++ b/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 diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/TripPlanStatus.java b/src/main/java/hyu/erica/capstone/domain/enums/TripPlanStatus.java similarity index 58% rename from src/main/java/hyu/erica/v1/capstone/domain/enums/TripPlanStatus.java rename to src/main/java/hyu/erica/capstone/domain/enums/TripPlanStatus.java index bed7dd2..79c13d5 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/TripPlanStatus.java +++ b/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 diff --git a/src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferAttraction.java b/src/main/java/hyu/erica/capstone/domain/mapping/PreferAttraction.java similarity index 83% rename from src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferAttraction.java rename to src/main/java/hyu/erica/capstone/domain/mapping/PreferAttraction.java index 1f51428..df3a7c1 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferAttraction.java +++ b/src/main/java/hyu/erica/capstone/domain/mapping/PreferAttraction.java @@ -1,11 +1,11 @@ -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; @@ -13,6 +13,7 @@ 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; diff --git a/src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferRestaurant.java b/src/main/java/hyu/erica/capstone/domain/mapping/PreferRestaurant.java similarity index 84% rename from src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferRestaurant.java rename to src/main/java/hyu/erica/capstone/domain/mapping/PreferRestaurant.java index e29aa2b..dd25279 100644 --- a/src/main/java/hyu/erica/v1/capstone/domain/mapping/PreferRestaurant.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/AttractionRepository.java b/src/main/java/hyu/erica/capstone/repository/AttractionRepository.java similarity index 77% rename from src/main/java/hyu/erica/v1/capstone/repository/AttractionRepository.java rename to src/main/java/hyu/erica/capstone/repository/AttractionRepository.java index bd46c7b..6bc3bbf 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/AttractionRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/PreferAttractionRepository.java b/src/main/java/hyu/erica/capstone/repository/PreferAttractionRepository.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/repository/PreferAttractionRepository.java rename to src/main/java/hyu/erica/capstone/repository/PreferAttractionRepository.java index aadb392..1a00e8b 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/PreferAttractionRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/PreferRestaurantRepository.java b/src/main/java/hyu/erica/capstone/repository/PreferRestaurantRepository.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/repository/PreferRestaurantRepository.java rename to src/main/java/hyu/erica/capstone/repository/PreferRestaurantRepository.java index 0ca94e9..dd441ec 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/PreferRestaurantRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/RestaurantRepository.java b/src/main/java/hyu/erica/capstone/repository/RestaurantRepository.java similarity index 78% rename from src/main/java/hyu/erica/v1/capstone/repository/RestaurantRepository.java rename to src/main/java/hyu/erica/capstone/repository/RestaurantRepository.java index ab2bc01..66c67be 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/RestaurantRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/StyleRepository.java b/src/main/java/hyu/erica/capstone/repository/StyleRepository.java similarity index 51% rename from src/main/java/hyu/erica/v1/capstone/repository/StyleRepository.java rename to src/main/java/hyu/erica/capstone/repository/StyleRepository.java index 7685003..308acdb 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/StyleRepository.java +++ b/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 { diff --git a/src/main/java/hyu/erica/v1/capstone/repository/TripPlanRepository.java b/src/main/java/hyu/erica/capstone/repository/TripPlanRepository.java similarity index 75% rename from src/main/java/hyu/erica/v1/capstone/repository/TripPlanRepository.java rename to src/main/java/hyu/erica/capstone/repository/TripPlanRepository.java index 179f93f..35893a1 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/TripPlanRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/TripScheduleItemRepository.java b/src/main/java/hyu/erica/capstone/repository/TripScheduleItemRepository.java similarity index 80% rename from src/main/java/hyu/erica/v1/capstone/repository/TripScheduleItemRepository.java rename to src/main/java/hyu/erica/capstone/repository/TripScheduleItemRepository.java index 21cec6b..3b032b9 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/TripScheduleItemRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/repository/UserRepository.java b/src/main/java/hyu/erica/capstone/repository/UserRepository.java similarity index 78% rename from src/main/java/hyu/erica/v1/capstone/repository/UserRepository.java rename to src/main/java/hyu/erica/capstone/repository/UserRepository.java index 8c82cb5..abe13c7 100644 --- a/src/main/java/hyu/erica/v1/capstone/repository/UserRepository.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/security/JwtAuthenticationFilter.java b/src/main/java/hyu/erica/capstone/security/JwtAuthenticationFilter.java similarity index 93% rename from src/main/java/hyu/erica/v1/capstone/security/JwtAuthenticationFilter.java rename to src/main/java/hyu/erica/capstone/security/JwtAuthenticationFilter.java index 5e82bab..068c38f 100644 --- a/src/main/java/hyu/erica/v1/capstone/security/JwtAuthenticationFilter.java +++ b/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; diff --git a/src/main/java/hyu/erica/v1/capstone/security/JwtTokenProvider.java b/src/main/java/hyu/erica/capstone/security/JwtTokenProvider.java similarity index 87% rename from src/main/java/hyu/erica/v1/capstone/security/JwtTokenProvider.java rename to src/main/java/hyu/erica/capstone/security/JwtTokenProvider.java index 644bc37..4f56e8e 100644 --- a/src/main/java/hyu/erica/v1/capstone/security/JwtTokenProvider.java +++ b/src/main/java/hyu/erica/capstone/security/JwtTokenProvider.java @@ -1,9 +1,10 @@ -package hyu.erica.v1.capstone.security; +package hyu.erica.capstone.security; -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.MalformedJwtException; import io.jsonwebtoken.SignatureAlgorithm; @@ -11,7 +12,12 @@ import io.jsonwebtoken.security.Keys; import jakarta.servlet.http.HttpServletRequest; import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.security.SignatureException; +import java.util.Base64; import java.util.Date; +import java.util.Objects; +import java.util.concurrent.TimeUnit; import javax.crypto.SecretKey; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,6 +26,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; @Slf4j @Service diff --git a/src/main/java/hyu/erica/v1/capstone/security/details/CustomUserDetails.java b/src/main/java/hyu/erica/capstone/security/details/CustomUserDetails.java similarity index 95% rename from src/main/java/hyu/erica/v1/capstone/security/details/CustomUserDetails.java rename to src/main/java/hyu/erica/capstone/security/details/CustomUserDetails.java index 0a3d6f0..d8afc00 100644 --- a/src/main/java/hyu/erica/v1/capstone/security/details/CustomUserDetails.java +++ b/src/main/java/hyu/erica/capstone/security/details/CustomUserDetails.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.security.details; +package hyu.erica.capstone.security.details; import java.util.Collection; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/security/utils/SecurityUtils.java b/src/main/java/hyu/erica/capstone/security/utils/SecurityUtils.java similarity index 83% rename from src/main/java/hyu/erica/v1/capstone/security/utils/SecurityUtils.java rename to src/main/java/hyu/erica/capstone/security/utils/SecurityUtils.java index 2894a5f..d1940c3 100644 --- a/src/main/java/hyu/erica/v1/capstone/security/utils/SecurityUtils.java +++ b/src/main/java/hyu/erica/capstone/security/utils/SecurityUtils.java @@ -1,7 +1,8 @@ -package hyu.erica.v1.capstone.security.utils; +package hyu.erica.capstone.security.utils; -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import java.util.Objects; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/hyu/erica/v1/capstone/service/async/StyleBackgroundTaskService.java b/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java similarity index 74% rename from src/main/java/hyu/erica/v1/capstone/service/async/StyleBackgroundTaskService.java rename to src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java index e323aaa..b7e0c29 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/async/StyleBackgroundTaskService.java +++ b/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java @@ -1,25 +1,26 @@ -package hyu.erica.v1.capstone.service.async; - -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.client.PlanClient; -import hyu.erica.v1.capstone.domain.Attraction; -import hyu.erica.v1.capstone.domain.Restaurant; -import hyu.erica.v1.capstone.domain.Style; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.User; -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.v1.capstone.repository.AttractionRepository; -import hyu.erica.v1.capstone.repository.PreferAttractionRepository; -import hyu.erica.v1.capstone.repository.PreferRestaurantRepository; -import hyu.erica.v1.capstone.repository.RestaurantRepository; -import hyu.erica.v1.capstone.repository.TripPlanRepository; -import hyu.erica.v1.capstone.repository.UserRepository; -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; +package hyu.erica.capstone.service.async; + +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.client.PlanClient; +import hyu.erica.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.Style; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.User; +import hyu.erica.capstone.domain.enums.TripPlanStatus; +import hyu.erica.capstone.domain.mapping.PreferAttraction; +import hyu.erica.capstone.domain.mapping.PreferRestaurant; +import hyu.erica.capstone.repository.AttractionRepository; +import hyu.erica.capstone.repository.PreferAttractionRepository; +import hyu.erica.capstone.repository.PreferRestaurantRepository; +import hyu.erica.capstone.repository.RestaurantRepository; +import hyu.erica.capstone.repository.TripPlanRepository; +import hyu.erica.capstone.repository.UserRepository; +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 hyu.erica.capstone.web.dto.style.request.UserStyleRequestDTO; import java.util.concurrent.CompletableFuture; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/hyu/erica/v1/capstone/service/auth/AuthService.java b/src/main/java/hyu/erica/capstone/service/auth/AuthService.java similarity index 75% rename from src/main/java/hyu/erica/v1/capstone/service/auth/AuthService.java rename to src/main/java/hyu/erica/capstone/service/auth/AuthService.java index ea3192a..1e42748 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/auth/AuthService.java +++ b/src/main/java/hyu/erica/capstone/service/auth/AuthService.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.service.auth; +package hyu.erica.capstone.service.auth; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/hyu/erica/v1/capstone/service/auth/impl/AuthServiceImpl.java b/src/main/java/hyu/erica/capstone/service/auth/impl/AuthServiceImpl.java similarity index 80% rename from src/main/java/hyu/erica/v1/capstone/service/auth/impl/AuthServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/auth/impl/AuthServiceImpl.java index 63f6979..5362e01 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/auth/impl/AuthServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/auth/impl/AuthServiceImpl.java @@ -1,12 +1,13 @@ -package hyu.erica.v1.capstone.service.auth.impl; +package hyu.erica.capstone.service.auth.impl; -import hyu.erica.v1.capstone.domain.User; -import hyu.erica.v1.capstone.repository.UserRepository; -import hyu.erica.v1.capstone.security.details.CustomUserDetails; -import hyu.erica.v1.capstone.service.auth.AuthService; +import hyu.erica.capstone.domain.User; +import hyu.erica.capstone.repository.UserRepository; +import hyu.erica.capstone.security.details.CustomUserDetails; +import hyu.erica.capstone.service.auth.AuthService; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; diff --git a/src/main/java/hyu/erica/capstone/service/style/StyleCommandService.java b/src/main/java/hyu/erica/capstone/service/style/StyleCommandService.java new file mode 100644 index 0000000..84820e4 --- /dev/null +++ b/src/main/java/hyu/erica/capstone/service/style/StyleCommandService.java @@ -0,0 +1,16 @@ +package hyu.erica.capstone.service.style; + +import hyu.erica.capstone.web.dto.style.request.UserStyleRequestDTO; +import hyu.erica.capstone.web.dto.style.response.UserStyleFinalResponseDTO; +import hyu.erica.capstone.web.dto.style.response.UserStyleInitResponseDTO; +import hyu.erica.capstone.web.dto.style.response.UserStyleResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.TripPlanResponseDTO; + +public interface StyleCommandService { + + UserStyleInitResponseDTO initStyle(Long userId); + + UserStyleResponseDTO updateStyle(Long userId, Long styleId, UserStyleRequestDTO request); + + TripPlanResponseDTO submitStyle(Long styleId, Long userId); +} diff --git a/src/main/java/hyu/erica/capstone/service/style/StyleQueryService.java b/src/main/java/hyu/erica/capstone/service/style/StyleQueryService.java new file mode 100644 index 0000000..9f3c1f3 --- /dev/null +++ b/src/main/java/hyu/erica/capstone/service/style/StyleQueryService.java @@ -0,0 +1,8 @@ +package hyu.erica.capstone.service.style; + +import hyu.erica.capstone.web.dto.style.response.UserStyleResponseDTO; + +public interface StyleQueryService { + + UserStyleResponseDTO getStyle(Long styleId, Long userId); +} diff --git a/src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleCommandServiceImpl.java b/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java similarity index 71% rename from src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleCommandServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java index 1677771..0d5053f 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleCommandServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java @@ -1,21 +1,25 @@ -package hyu.erica.v1.capstone.service.style.impl; - -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Style; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.User; -import hyu.erica.v1.capstone.domain.enums.City; -import hyu.erica.v1.capstone.domain.enums.TripPlanStatus; -import hyu.erica.v1.capstone.repository.StyleRepository; -import hyu.erica.v1.capstone.repository.TripPlanRepository; -import hyu.erica.v1.capstone.repository.UserRepository; -import hyu.erica.v1.capstone.service.async.StyleBackgroundTaskService; -import hyu.erica.v1.capstone.service.style.StyleCommandService; -import hyu.erica.v1.capstone.web.dto.style.request.UserStyleRequestDTO; -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleInitResponseDTO; -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.TripPlanResponseDTO; +package hyu.erica.capstone.service.style.impl; + +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Style; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.User; +import hyu.erica.capstone.domain.enums.City; +import hyu.erica.capstone.domain.enums.TripPlanStatus; +import hyu.erica.capstone.repository.AttractionRepository; +import hyu.erica.capstone.repository.PreferAttractionRepository; +import hyu.erica.capstone.repository.PreferRestaurantRepository; +import hyu.erica.capstone.repository.RestaurantRepository; +import hyu.erica.capstone.repository.StyleRepository; +import hyu.erica.capstone.repository.TripPlanRepository; +import hyu.erica.capstone.repository.UserRepository; +import hyu.erica.capstone.service.async.StyleBackgroundTaskService; +import hyu.erica.capstone.service.style.StyleCommandService; +import hyu.erica.capstone.web.dto.style.request.UserStyleRequestDTO; +import hyu.erica.capstone.web.dto.style.response.UserStyleInitResponseDTO; +import hyu.erica.capstone.web.dto.style.response.UserStyleResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.TripPlanResponseDTO; import jakarta.persistence.EntityManager; import java.util.Objects; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleQueryServiceImpl.java b/src/main/java/hyu/erica/capstone/service/style/impl/StyleQueryServiceImpl.java similarity index 65% rename from src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleQueryServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/style/impl/StyleQueryServiceImpl.java index 4aef17f..68a9155 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/style/impl/StyleQueryServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/style/impl/StyleQueryServiceImpl.java @@ -1,13 +1,13 @@ -package hyu.erica.v1.capstone.service.style.impl; +package hyu.erica.capstone.service.style.impl; -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Style; -import hyu.erica.v1.capstone.domain.User; -import hyu.erica.v1.capstone.repository.StyleRepository; -import hyu.erica.v1.capstone.repository.UserRepository; -import hyu.erica.v1.capstone.service.style.StyleQueryService; -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleResponseDTO; +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Style; +import hyu.erica.capstone.domain.User; +import hyu.erica.capstone.repository.StyleRepository; +import hyu.erica.capstone.repository.UserRepository; +import hyu.erica.capstone.service.style.StyleQueryService; +import hyu.erica.capstone.web.dto.style.response.UserStyleResponseDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanCommandService.java b/src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanCommandService.java similarity index 50% rename from src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanCommandService.java rename to src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanCommandService.java index 486fb98..f91e409 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanCommandService.java +++ b/src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanCommandService.java @@ -1,8 +1,8 @@ -package hyu.erica.v1.capstone.service.tripPlan; +package hyu.erica.capstone.service.tripPlan; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveAttractionRequestDTO; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; +import hyu.erica.capstone.web.dto.trip.request.SaveAttractionRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; +import hyu.erica.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; public interface TripPlanCommandService { diff --git a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanQueryService.java b/src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanQueryService.java similarity index 57% rename from src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanQueryService.java rename to src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanQueryService.java index 42de190..1e83bf8 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/TripPlanQueryService.java +++ b/src/main/java/hyu/erica/capstone/service/tripPlan/TripPlanQueryService.java @@ -1,12 +1,12 @@ -package hyu.erica.v1.capstone.service.tripPlan; - -import hyu.erica.v1.capstone.web.dto.tripPlan.response.TripPlanResultResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionDetailResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionListResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionSearchResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantDetailResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantListResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantSearchResponseDTO; +package hyu.erica.capstone.service.tripPlan; + +import hyu.erica.capstone.web.dto.tripPlan.response.TripPlanResultResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionDetailResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionListResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionSearchResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantDetailResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantListResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantSearchResponseDTO; public interface TripPlanQueryService { diff --git a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java b/src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java similarity index 84% rename from src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java index db6fd75..bf233aa 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanCommandServiceImpl.java @@ -1,32 +1,34 @@ -package hyu.erica.v1.capstone.service.tripPlan.impl; +package hyu.erica.capstone.service.tripPlan.impl; import static java.time.temporal.ChronoUnit.DAYS; -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Attraction; -import hyu.erica.v1.capstone.domain.Restaurant; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.TripScheduleItem; -import hyu.erica.v1.capstone.domain.enums.PlaceType; -import hyu.erica.v1.capstone.domain.mapping.PreferAttraction; -import hyu.erica.v1.capstone.domain.mapping.PreferRestaurant; -import hyu.erica.v1.capstone.repository.AttractionRepository; -import hyu.erica.v1.capstone.repository.PreferAttractionRepository; -import hyu.erica.v1.capstone.repository.PreferRestaurantRepository; -import hyu.erica.v1.capstone.repository.RestaurantRepository; -import hyu.erica.v1.capstone.repository.TripPlanRepository; -import hyu.erica.v1.capstone.repository.TripScheduleItemRepository; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanCommandService; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveAttractionRequestDTO; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; -import hyu.erica.v1.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest.ScheduleOrderItemDTO; +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.TripScheduleItem; +import hyu.erica.capstone.domain.enums.PlaceType; +import hyu.erica.capstone.domain.mapping.PreferAttraction; +import hyu.erica.capstone.domain.mapping.PreferRestaurant; +import hyu.erica.capstone.repository.AttractionRepository; +import hyu.erica.capstone.repository.PreferAttractionRepository; +import hyu.erica.capstone.repository.PreferRestaurantRepository; +import hyu.erica.capstone.repository.RestaurantRepository; +import hyu.erica.capstone.repository.TripPlanRepository; +import hyu.erica.capstone.repository.TripScheduleItemRepository; +import hyu.erica.capstone.service.tripPlan.TripPlanCommandService; +import hyu.erica.capstone.web.dto.trip.request.SaveAttractionRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; +import hyu.erica.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; +import hyu.erica.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest.ScheduleOrderItemDTO; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java b/src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java similarity index 70% rename from src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java index 018bd91..2e30fde 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/tripPlan/impl/TripPlanQueryServiceImpl.java @@ -1,28 +1,28 @@ -package hyu.erica.v1.capstone.service.tripPlan.impl; - -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Attraction; -import hyu.erica.v1.capstone.domain.Restaurant; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.TripScheduleItem; -import hyu.erica.v1.capstone.domain.mapping.PreferAttraction; -import hyu.erica.v1.capstone.domain.mapping.PreferRestaurant; -import hyu.erica.v1.capstone.repository.AttractionRepository; -import hyu.erica.v1.capstone.repository.PreferAttractionRepository; -import hyu.erica.v1.capstone.repository.PreferRestaurantRepository; -import hyu.erica.v1.capstone.repository.RestaurantRepository; -import hyu.erica.v1.capstone.repository.TripPlanRepository; -import hyu.erica.v1.capstone.repository.TripScheduleItemRepository; -import hyu.erica.v1.capstone.repository.UserRepository; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanQueryService; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.TripPlanResultResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionDetailResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionListResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction.AttractionSearchResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantDetailResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantListResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant.RestaurantSearchResponseDTO; +package hyu.erica.capstone.service.tripPlan.impl; + +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.TripScheduleItem; +import hyu.erica.capstone.domain.mapping.PreferAttraction; +import hyu.erica.capstone.domain.mapping.PreferRestaurant; +import hyu.erica.capstone.repository.AttractionRepository; +import hyu.erica.capstone.repository.PreferAttractionRepository; +import hyu.erica.capstone.repository.PreferRestaurantRepository; +import hyu.erica.capstone.repository.RestaurantRepository; +import hyu.erica.capstone.repository.TripPlanRepository; +import hyu.erica.capstone.repository.TripScheduleItemRepository; +import hyu.erica.capstone.repository.UserRepository; +import hyu.erica.capstone.service.tripPlan.TripPlanQueryService; +import hyu.erica.capstone.web.dto.tripPlan.response.TripPlanResultResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionDetailResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionListResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.attraction.AttractionSearchResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantDetailResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantListResponseDTO; +import hyu.erica.capstone.web.dto.tripPlan.response.restaurant.RestaurantSearchResponseDTO; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/hyu/erica/v1/capstone/service/user/UserCommandService.java b/src/main/java/hyu/erica/capstone/service/user/UserCommandService.java similarity index 50% rename from src/main/java/hyu/erica/v1/capstone/service/user/UserCommandService.java rename to src/main/java/hyu/erica/capstone/service/user/UserCommandService.java index 516a0ac..ea84cad 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/user/UserCommandService.java +++ b/src/main/java/hyu/erica/capstone/service/user/UserCommandService.java @@ -1,9 +1,9 @@ -package hyu.erica.v1.capstone.service.user; +package hyu.erica.capstone.service.user; -import hyu.erica.v1.capstone.web.dto.user.request.SignInRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.SignUpRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.UpdateInfoRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.response.MyTripPlanResponse; +import hyu.erica.capstone.web.dto.user.request.SignInRequestDTO; +import hyu.erica.capstone.web.dto.user.request.SignUpRequestDTO; +import hyu.erica.capstone.web.dto.user.request.UpdateInfoRequestDTO; +import hyu.erica.capstone.web.dto.user.response.MyTripPlanResponse; public interface UserCommandService { diff --git a/src/main/java/hyu/erica/v1/capstone/service/user/impl/UserCommandServiceImpl.java b/src/main/java/hyu/erica/capstone/service/user/impl/UserCommandServiceImpl.java similarity index 77% rename from src/main/java/hyu/erica/v1/capstone/service/user/impl/UserCommandServiceImpl.java rename to src/main/java/hyu/erica/capstone/service/user/impl/UserCommandServiceImpl.java index d1c96c3..c3a279f 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/user/impl/UserCommandServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/user/impl/UserCommandServiceImpl.java @@ -1,17 +1,17 @@ -package hyu.erica.v1.capstone.service.user.impl; - -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.User; -import hyu.erica.v1.capstone.repository.TripPlanRepository; -import hyu.erica.v1.capstone.repository.UserRepository; -import hyu.erica.v1.capstone.security.JwtTokenProvider; -import hyu.erica.v1.capstone.service.user.UserCommandService; -import hyu.erica.v1.capstone.web.dto.user.request.SignInRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.SignUpRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.UpdateInfoRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.response.MyTripPlanResponse; +package hyu.erica.capstone.service.user.impl; + +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.User; +import hyu.erica.capstone.repository.TripPlanRepository; +import hyu.erica.capstone.repository.UserRepository; +import hyu.erica.capstone.security.JwtTokenProvider; +import hyu.erica.capstone.service.user.UserCommandService; +import hyu.erica.capstone.web.dto.user.request.SignInRequestDTO; +import hyu.erica.capstone.web.dto.user.request.SignUpRequestDTO; +import hyu.erica.capstone.web.dto.user.request.UpdateInfoRequestDTO; +import hyu.erica.capstone.web.dto.user.response.MyTripPlanResponse; import java.util.List; import java.util.Objects; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/service/util/CsvImportService.java b/src/main/java/hyu/erica/capstone/service/util/CsvImportService.java similarity index 93% rename from src/main/java/hyu/erica/v1/capstone/service/util/CsvImportService.java rename to src/main/java/hyu/erica/capstone/service/util/CsvImportService.java index 73aed84..d4f74d8 100644 --- a/src/main/java/hyu/erica/v1/capstone/service/util/CsvImportService.java +++ b/src/main/java/hyu/erica/capstone/service/util/CsvImportService.java @@ -1,11 +1,13 @@ -package hyu.erica.v1.capstone.service.util; - -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Attraction; -import hyu.erica.v1.capstone.domain.Restaurant; -import hyu.erica.v1.capstone.repository.AttractionRepository; -import hyu.erica.v1.capstone.repository.RestaurantRepository; +package hyu.erica.capstone.service.util; + +import static java.lang.Double.parseDouble; + +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Restaurant; +import hyu.erica.capstone.repository.AttractionRepository; +import hyu.erica.capstone.repository.RestaurantRepository; import java.io.BufferedReader; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/hyu/erica/v1/capstone/web/controller/DefaultController.java b/src/main/java/hyu/erica/capstone/web/controller/DefaultController.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/web/controller/DefaultController.java rename to src/main/java/hyu/erica/capstone/web/controller/DefaultController.java index 5d64536..cefd85c 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/controller/DefaultController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/DefaultController.java @@ -1,8 +1,8 @@ -package hyu.erica.v1.capstone.web.controller; +package hyu.erica.capstone.web.controller; -import hyu.erica.v1.capstone.api.ApiResponse; -import hyu.erica.v1.capstone.api.code.status.SuccessStatus; -import hyu.erica.v1.capstone.service.util.CsvImportService; +import hyu.erica.capstone.api.ApiResponse; +import hyu.erica.capstone.api.code.status.SuccessStatus; +import hyu.erica.capstone.service.util.CsvImportService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/web/controller/PlanController.java b/src/main/java/hyu/erica/capstone/web/controller/PlanController.java similarity index 88% rename from src/main/java/hyu/erica/v1/capstone/web/controller/PlanController.java rename to src/main/java/hyu/erica/capstone/web/controller/PlanController.java index b99b4d6..ad3830f 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/controller/PlanController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/PlanController.java @@ -1,20 +1,25 @@ -package hyu.erica.v1.capstone.web.controller; +package hyu.erica.capstone.web.controller; -import hyu.erica.v1.capstone.api.ApiResponse; -import hyu.erica.v1.capstone.api.code.status.SuccessStatus; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanCommandService; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanQueryService; -import hyu.erica.v1.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; +import hyu.erica.capstone.api.ApiResponse; +import hyu.erica.capstone.api.code.status.SuccessStatus; +import hyu.erica.capstone.service.tripPlan.TripPlanCommandService; +import hyu.erica.capstone.service.tripPlan.TripPlanQueryService; +import hyu.erica.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest; +import hyu.erica.capstone.web.dto.tripPlan.request.UpdateAllScheduleOrderRequest.ScheduleOrderItemDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @Tag(name = "여행 계획", description = "여행 계획 관련 API") diff --git a/src/main/java/hyu/erica/v1/capstone/web/controller/StyleController.java b/src/main/java/hyu/erica/capstone/web/controller/StyleController.java similarity index 90% rename from src/main/java/hyu/erica/v1/capstone/web/controller/StyleController.java rename to src/main/java/hyu/erica/capstone/web/controller/StyleController.java index 792f1b1..5e0c56d 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/controller/StyleController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/StyleController.java @@ -1,12 +1,12 @@ -package hyu.erica.v1.capstone.web.controller; +package hyu.erica.capstone.web.controller; -import hyu.erica.v1.capstone.api.ApiResponse; -import hyu.erica.v1.capstone.api.code.status.SuccessStatus; -import hyu.erica.v1.capstone.security.utils.SecurityUtils; -import hyu.erica.v1.capstone.service.style.StyleCommandService; -import hyu.erica.v1.capstone.service.style.StyleQueryService; -import hyu.erica.v1.capstone.web.dto.style.request.UserStyleRequestDTO; +import hyu.erica.capstone.api.ApiResponse; +import hyu.erica.capstone.api.code.status.SuccessStatus; +import hyu.erica.capstone.security.utils.SecurityUtils; +import hyu.erica.capstone.service.style.StyleCommandService; +import hyu.erica.capstone.service.style.StyleQueryService; +import hyu.erica.capstone.web.dto.style.request.UserStyleRequestDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/web/controller/TripPlanController.java b/src/main/java/hyu/erica/capstone/web/controller/TripPlanController.java similarity index 88% rename from src/main/java/hyu/erica/v1/capstone/web/controller/TripPlanController.java rename to src/main/java/hyu/erica/capstone/web/controller/TripPlanController.java index 436e3af..7873932 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/controller/TripPlanController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/TripPlanController.java @@ -1,11 +1,17 @@ -package hyu.erica.v1.capstone.web.controller; - -import hyu.erica.v1.capstone.api.ApiResponse; -import hyu.erica.v1.capstone.api.code.status.SuccessStatus; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanCommandService; -import hyu.erica.v1.capstone.service.tripPlan.TripPlanQueryService; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveAttractionRequestDTO; -import hyu.erica.v1.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; +package hyu.erica.capstone.web.controller; + +import hyu.erica.capstone.api.ApiResponse; +import hyu.erica.capstone.api.code.status.SuccessStatus; +import hyu.erica.capstone.service.tripPlan.TripPlanCommandService; +import hyu.erica.capstone.service.tripPlan.TripPlanQueryService; +import hyu.erica.capstone.web.dto.trip.request.AdditionalInfoRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.PreferActivitiesRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.SaveAttractionRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.SaveRestaurantRequestDTO; +import hyu.erica.capstone.web.dto.trip.request.TripPeriodRequestDTO; +import hyu.erica.capstone.web.dto.trip.response.AdditionalInfoResponseDTO; +import hyu.erica.capstone.web.dto.trip.response.PreferActivitiesResponseDTO; +import hyu.erica.capstone.web.dto.trip.response.TripPeriodResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/hyu/erica/v1/capstone/web/controller/UserController.java b/src/main/java/hyu/erica/capstone/web/controller/UserController.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/web/controller/UserController.java rename to src/main/java/hyu/erica/capstone/web/controller/UserController.java index 96d5f34..14f8f53 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/controller/UserController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/UserController.java @@ -1,18 +1,19 @@ -package hyu.erica.v1.capstone.web.controller; +package hyu.erica.capstone.web.controller; -import hyu.erica.v1.capstone.api.ApiResponse; -import hyu.erica.v1.capstone.api.code.status.SuccessStatus; -import hyu.erica.v1.capstone.security.utils.SecurityUtils; -import hyu.erica.v1.capstone.service.user.UserCommandService; -import hyu.erica.v1.capstone.web.dto.user.request.SignInRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.SignUpRequestDTO; -import hyu.erica.v1.capstone.web.dto.user.request.UpdateInfoRequestDTO; +import hyu.erica.capstone.api.ApiResponse; +import hyu.erica.capstone.api.code.status.SuccessStatus; +import hyu.erica.capstone.security.utils.SecurityUtils; +import hyu.erica.capstone.service.user.UserCommandService; +import hyu.erica.capstone.web.dto.user.request.SignInRequestDTO; +import hyu.erica.capstone.web.dto.user.request.SignUpRequestDTO; +import hyu.erica.capstone.web.dto.user.request.UpdateInfoRequestDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/client/AttractionRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/client/AttractionRequestDTO.java similarity index 86% rename from src/main/java/hyu/erica/v1/capstone/web/dto/client/AttractionRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/client/AttractionRequestDTO.java index f9593aa..c6c7e16 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/client/AttractionRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/client/AttractionRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.client; +package hyu.erica.capstone.web.dto.client; import jakarta.persistence.criteria.CriteriaBuilder.In; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/client/RestaurantRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/client/RestaurantRequestDTO.java similarity index 83% rename from src/main/java/hyu/erica/v1/capstone/web/dto/client/RestaurantRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/client/RestaurantRequestDTO.java index 48bb694..aff6528 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/client/RestaurantRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/client/RestaurantRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.client; +package hyu.erica.capstone.web.dto.client; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/client/StyleRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java similarity index 90% rename from src/main/java/hyu/erica/v1/capstone/web/dto/client/StyleRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java index a3ccb00..2695847 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/client/StyleRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.client; +package hyu.erica.capstone.web.dto.client; import java.time.LocalDate; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/style/request/UserStyleRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/web/dto/style/request/UserStyleRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java index 1df8c88..3c3ac80 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/style/request/UserStyleRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.style.request; +package hyu.erica.capstone.web.dto.style.request; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java similarity index 86% rename from src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java index 4e5a32b..157cd38 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleFinalResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.style.response; +package hyu.erica.capstone.web.dto.style.response; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleInitResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleInitResponseDTO.java similarity index 79% rename from src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleInitResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleInitResponseDTO.java index c39a8cf..ae15e5f 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleInitResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleInitResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.style.response; +package hyu.erica.capstone.web.dto.style.response; public record UserStyleInitResponseDTO(Long userId, Long styleId) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java similarity index 79% rename from src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java index cc30fc4..957c76c 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/style/response/UserStyleResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java @@ -1,7 +1,8 @@ -package hyu.erica.v1.capstone.web.dto.style.response; +package hyu.erica.capstone.web.dto.style.response; -import hyu.erica.v1.capstone.domain.Style; +import hyu.erica.capstone.domain.Style; import java.time.LocalDate; +import java.time.LocalDateTime; public record UserStyleResponseDTO(String city, LocalDate startDate, LocalDate endDate, String preferActivity, String requirement) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java similarity index 56% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java index 0cf01e7..6a5ff54 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/request/AdditionalInfoRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.request; +package hyu.erica.capstone.web.dto.trip.request; public record AdditionalInfoRequestDTO(String additionalInfo) { } diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java similarity index 57% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java index dbf819c..96498f5 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/request/PreferActivitiesRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.request; +package hyu.erica.capstone.web.dto.trip.request; public record PreferActivitiesRequestDTO(String preferActivities) { } diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java similarity index 64% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java index 2186173..254b3b2 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveAttractionRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.request; +package hyu.erica.capstone.web.dto.trip.request; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java similarity index 64% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java index 6a9baae..e3e1a1f 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/request/SaveRestaurantRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.request; +package hyu.erica.capstone.web.dto.trip.request; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/TripPeriodRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/request/TripPeriodRequestDTO.java similarity index 73% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/TripPeriodRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/request/TripPeriodRequestDTO.java index 9c8cb23..5235187 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/request/TripPeriodRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/request/TripPeriodRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.request; +package hyu.erica.capstone.web.dto.trip.request; import java.time.LocalDate; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java similarity index 79% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java index aece7e3..f9d6f39 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AdditionalInfoResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.response; +package hyu.erica.capstone.web.dto.trip.response; public record AdditionalInfoResponseDTO (String additionalInfo){ public static AdditionalInfoResponseDTO of(String additionalInfo) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionListResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionListResponseDTO.java similarity index 79% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionListResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionListResponseDTO.java index 4918baf..39c2c90 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionListResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionListResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.trip.response; +package hyu.erica.capstone.web.dto.trip.response; -import hyu.erica.v1.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Attraction; import java.util.List; public record AttractionListResponseDTO(List attractions, Integer totalAttractions) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionResponseDTO.java similarity index 67% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionResponseDTO.java index 6c493cc..14ef3e6 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/AttractionResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/response/AttractionResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.trip.response; +package hyu.erica.capstone.web.dto.trip.response; -import hyu.erica.v1.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Attraction; public record AttractionResponseDTO(String image, String name) { public static AttractionResponseDTO of(Attraction attraction) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java similarity index 80% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java index 5857aaa..7817b82 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/response/PreferActivitiesResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.response; +package hyu.erica.capstone.web.dto.trip.response; public record PreferActivitiesResponseDTO (String preferActivities) { public static PreferActivitiesResponseDTO of(String preferActivities) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/TripPeriodResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/trip/response/TripPeriodResponseDTO.java similarity index 87% rename from src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/TripPeriodResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/trip/response/TripPeriodResponseDTO.java index 382dfc9..4dd09be 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/trip/response/TripPeriodResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/trip/response/TripPeriodResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.trip.response; +package hyu.erica.capstone.web.dto.trip.response; import java.time.LocalDate; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java similarity index 78% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java index 7aa7f8c..f7a17e7 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/request/UpdateAllScheduleOrderRequest.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.request; +package hyu.erica.capstone.web.dto.tripPlan.request; -import hyu.erica.v1.capstone.domain.enums.PlaceType; +import hyu.erica.capstone.domain.enums.PlaceType; import java.util.List; public record UpdateAllScheduleOrderRequest( diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java similarity index 66% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java index d00cbd9..d4363c8 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response; +package hyu.erica.capstone.web.dto.tripPlan.response; -import hyu.erica.v1.capstone.domain.enums.TripPlanStatus; +import hyu.erica.capstone.domain.enums.TripPlanStatus; public record TripPlanResponseDTO(Long tripPlanId, TripPlanStatus status) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java similarity index 90% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java index c63b2a4..4202003 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/TripPlanResultResponseDTO.java @@ -1,12 +1,12 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response; +package hyu.erica.capstone.web.dto.tripPlan.response; -import hyu.erica.v1.capstone.api.code.status.ErrorStatus; -import hyu.erica.v1.capstone.api.exception.GeneralException; -import hyu.erica.v1.capstone.domain.Attraction; -import hyu.erica.v1.capstone.domain.Restaurant; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.TripScheduleItem; -import hyu.erica.v1.capstone.domain.enums.PlaceType; +import hyu.erica.capstone.api.code.status.ErrorStatus; +import hyu.erica.capstone.api.exception.GeneralException; +import hyu.erica.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.TripScheduleItem; +import hyu.erica.capstone.domain.enums.PlaceType; import java.time.LocalDate; import java.util.Comparator; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java index efc1787..20bf3aa 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction; +package hyu.erica.capstone.web.dto.tripPlan.response.attraction; -import hyu.erica.v1.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Attraction; public record AttractionDetailResponseDTO (Long attractionId, String name, String imageUrl, String address, String phone, String description, String usageDay) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java similarity index 83% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java index b759a72..c6da087 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction; +package hyu.erica.capstone.web.dto.tripPlan.response.attraction; -import hyu.erica.v1.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Attraction; import java.util.List; public record AttractionListResponseDTO(List attractions, int totalElements) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java index 5528ebc..eaf4eae 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction; +package hyu.erica.capstone.web.dto.tripPlan.response.attraction; public record AttractionResponseDTO(Long attractionId, String name, String imageUrl, String address) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java index fe802c3..ac9c163 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionSearchResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.attraction; +package hyu.erica.capstone.web.dto.tripPlan.response.attraction; -import hyu.erica.v1.capstone.domain.Attraction; +import hyu.erica.capstone.domain.Attraction; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java index 92eee7e..952dfa5 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant; +package hyu.erica.capstone.web.dto.tripPlan.response.restaurant; -import hyu.erica.v1.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.Restaurant; public record RestaurantDetailResponseDTO ( Long restaurantId, String name, String imageUrl, String address, String phone, String description, String usageDay){ diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java similarity index 81% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java index 7f3ad5a..c4cb260 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantListResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant; +package hyu.erica.capstone.web.dto.tripPlan.response.restaurant; -import hyu.erica.v1.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.Restaurant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java similarity index 73% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java index 206b854..b752316 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant; +package hyu.erica.capstone.web.dto.tripPlan.response.restaurant; -import hyu.erica.v1.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.Restaurant; public record RestaurantResponseDTO(Long restaurantId, String name, String imageUrl, String address) { diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java index 0887112..4bf332e 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantSearchResponseDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.tripPlan.response.restaurant; +package hyu.erica.capstone.web.dto.tripPlan.response.restaurant; -import hyu.erica.v1.capstone.domain.Restaurant; +import hyu.erica.capstone.domain.Restaurant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignInRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/user/request/SignInRequestDTO.java similarity index 56% rename from src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignInRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/user/request/SignInRequestDTO.java index 2d2abb4..9f27c8c 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignInRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/user/request/SignInRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.user.request; +package hyu.erica.capstone.web.dto.user.request; public record SignInRequestDTO (String email, String password) { } diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignUpRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/user/request/SignUpRequestDTO.java similarity index 72% rename from src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignUpRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/user/request/SignUpRequestDTO.java index d885d24..467983d 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/SignUpRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/user/request/SignUpRequestDTO.java @@ -1,6 +1,6 @@ -package hyu.erica.v1.capstone.web.dto.user.request; +package hyu.erica.capstone.web.dto.user.request; -import hyu.erica.v1.capstone.domain.enums.PhoneService; +import hyu.erica.capstone.domain.enums.PhoneService; import java.time.LocalDate; public record SignUpRequestDTO (String email, String password, String name, String phoneNumber, LocalDate birthDate, diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/UpdateInfoRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/user/request/UpdateInfoRequestDTO.java similarity index 65% rename from src/main/java/hyu/erica/v1/capstone/web/dto/user/request/UpdateInfoRequestDTO.java rename to src/main/java/hyu/erica/capstone/web/dto/user/request/UpdateInfoRequestDTO.java index 1e74687..c2e5f65 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/user/request/UpdateInfoRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/user/request/UpdateInfoRequestDTO.java @@ -1,4 +1,4 @@ -package hyu.erica.v1.capstone.web.dto.user.request; +package hyu.erica.capstone.web.dto.user.request; public record UpdateInfoRequestDTO (String nickname, String phoneNumber, String profileImage) { } diff --git a/src/main/java/hyu/erica/v1/capstone/web/dto/user/response/MyTripPlanResponse.java b/src/main/java/hyu/erica/capstone/web/dto/user/response/MyTripPlanResponse.java similarity index 89% rename from src/main/java/hyu/erica/v1/capstone/web/dto/user/response/MyTripPlanResponse.java rename to src/main/java/hyu/erica/capstone/web/dto/user/response/MyTripPlanResponse.java index 7139db2..febe505 100644 --- a/src/main/java/hyu/erica/v1/capstone/web/dto/user/response/MyTripPlanResponse.java +++ b/src/main/java/hyu/erica/capstone/web/dto/user/response/MyTripPlanResponse.java @@ -1,8 +1,9 @@ -package hyu.erica.v1.capstone.web.dto.user.response; +package hyu.erica.capstone.web.dto.user.response; -import hyu.erica.v1.capstone.domain.TripPlan; -import hyu.erica.v1.capstone.domain.enums.TripPlanStatus; +import hyu.erica.capstone.domain.TripPlan; +import hyu.erica.capstone.domain.enums.TripPlanStatus; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; public record MyTripPlanResponse (List tripPlans, int totalElements) { diff --git a/src/main/java/hyu/erica/v1/capstone/domain/enums/Gender.java b/src/main/java/hyu/erica/v1/capstone/domain/enums/Gender.java deleted file mode 100644 index c518120..0000000 --- a/src/main/java/hyu/erica/v1/capstone/domain/enums/Gender.java +++ /dev/null @@ -1,5 +0,0 @@ -package hyu.erica.v1.capstone.domain.enums; - -public enum Gender { - MALE, FEMALE -} diff --git a/src/main/java/hyu/erica/v1/capstone/service/style/StyleCommandService.java b/src/main/java/hyu/erica/v1/capstone/service/style/StyleCommandService.java deleted file mode 100644 index fd87a73..0000000 --- a/src/main/java/hyu/erica/v1/capstone/service/style/StyleCommandService.java +++ /dev/null @@ -1,15 +0,0 @@ -package hyu.erica.v1.capstone.service.style; - -import hyu.erica.v1.capstone.web.dto.style.request.UserStyleRequestDTO; -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleInitResponseDTO; -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleResponseDTO; -import hyu.erica.v1.capstone.web.dto.tripPlan.response.TripPlanResponseDTO; - -public interface StyleCommandService { - - UserStyleInitResponseDTO initStyle(Long userId); - - UserStyleResponseDTO updateStyle(Long userId, Long styleId, UserStyleRequestDTO request); - - TripPlanResponseDTO submitStyle(Long styleId, Long userId); -} diff --git a/src/main/java/hyu/erica/v1/capstone/service/style/StyleQueryService.java b/src/main/java/hyu/erica/v1/capstone/service/style/StyleQueryService.java deleted file mode 100644 index ec5a27b..0000000 --- a/src/main/java/hyu/erica/v1/capstone/service/style/StyleQueryService.java +++ /dev/null @@ -1,8 +0,0 @@ -package hyu.erica.v1.capstone.service.style; - -import hyu.erica.v1.capstone.web.dto.style.response.UserStyleResponseDTO; - -public interface StyleQueryService { - - UserStyleResponseDTO getStyle(Long styleId, Long userId); -} diff --git a/src/main/java/hyu/erica/v2/capstone/global/entity/BaseEntity.java b/src/main/java/hyu/erica/v2/capstone/global/entity/BaseEntity.java deleted file mode 100644 index 01a4757..0000000 --- a/src/main/java/hyu/erica/v2/capstone/global/entity/BaseEntity.java +++ /dev/null @@ -1,29 +0,0 @@ -package hyu.erica.v2.capstone.global.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.EntityListeners; -import jakarta.persistence.MappedSuperclass; -import java.time.LocalDateTime; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; - -@MappedSuperclass -@EntityListeners(AuditingEntityListener.class) -public abstract class BaseEntity { - - @CreatedDate - @Column(updatable = false, nullable = false) - private LocalDateTime createdAt; - - @LastModifiedDate - private LocalDateTime updatedAt; - - public LocalDateTime getCreatedAt() { - return createdAt; - } - - public LocalDateTime getUpdatedAt() { - return updatedAt; - } -} diff --git a/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/TripPlan.java b/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/TripPlan.java deleted file mode 100644 index 733bf82..0000000 --- a/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/TripPlan.java +++ /dev/null @@ -1,72 +0,0 @@ -package hyu.erica.v2.capstone.tripPlan.domain; - - -import hyu.erica.v2.capstone.global.entity.BaseEntity; -import hyu.erica.v2.capstone.tripPlan.domain.enums.TripPlanStatus; -import hyu.erica.v2.capstone.tripPlan.exception.InvalidTripPlanDateException; -import hyu.erica.v2.capstone.user.domain.User; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; -import java.time.LocalDate; - -@Table(name = "trip_plan") -@Entity -public class TripPlan extends BaseEntity { - - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(name = "title", nullable = false) - private String title; - - @Column(name = "description", nullable = false) - private String description; - - @Column(name = "profile_image", nullable = false) - private String profileImage; - - @Column(name = "start_date", nullable = false) - private LocalDate startDate; - - @Column(name = "end_date", nullable = false) - private LocalDate endDate; - - @Enumerated(value = EnumType.STRING) - @Column(name = "status", nullable = false) - private TripPlanStatus tripPlanStatus; - - @ManyToOne - @JoinColumn(name = "user_id") - private User user; - - protected TripPlan() { - - } - - public TripPlan(final String title, final String description, final String profileImage, - final LocalDate startDate, final LocalDate endDate, final User user) { - validateTripDate(startDate, endDate); - this.title = title; - this.description = description; - this.profileImage = profileImage; - this.startDate = startDate; - this.endDate = endDate; - this.user = user; - this.tripPlanStatus = TripPlanStatus.PROGRESSING; - } - - private void validateTripDate(final LocalDate startDate, final LocalDate endDate) { - if (endDate.isBefore(startDate)) { - throw new InvalidTripPlanDateException(); - } - } - -} diff --git a/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/enums/TripPlanStatus.java b/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/enums/TripPlanStatus.java deleted file mode 100644 index 0c38bc7..0000000 --- a/src/main/java/hyu/erica/v2/capstone/tripPlan/domain/enums/TripPlanStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package hyu.erica.v2.capstone.tripPlan.domain.enums; - -public enum TripPlanStatus { - PROGRESSING, DONE, FAILED -} diff --git a/src/main/java/hyu/erica/v2/capstone/tripPlan/exception/InvalidTripPlanDateException.java b/src/main/java/hyu/erica/v2/capstone/tripPlan/exception/InvalidTripPlanDateException.java deleted file mode 100644 index 02d56dd..0000000 --- a/src/main/java/hyu/erica/v2/capstone/tripPlan/exception/InvalidTripPlanDateException.java +++ /dev/null @@ -1,10 +0,0 @@ -package hyu.erica.v2.capstone.tripPlan.exception; - -public class InvalidTripPlanDateException extends RuntimeException{ - - public InvalidTripPlanDateException() { - super("여행 종료일은 여행 시작일 이후여야 합니다."); - } - - -} diff --git a/src/main/java/hyu/erica/v2/capstone/user/domain/User.java b/src/main/java/hyu/erica/v2/capstone/user/domain/User.java deleted file mode 100644 index 974a8df..0000000 --- a/src/main/java/hyu/erica/v2/capstone/user/domain/User.java +++ /dev/null @@ -1,63 +0,0 @@ -package hyu.erica.v2.capstone.user.domain; - -import hyu.erica.v2.capstone.global.entity.BaseEntity; -import hyu.erica.v2.capstone.user.domain.enums.Gender; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.time.LocalDate; - -@Table(name = "users") -@Entity -public class User extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(name = "name", nullable = false) - private String name; - - @Column(name = "nickname", nullable = false) - private String nickname; - - @Column(name = "email", nullable = false) - private String email; - - @Column(name = "password", nullable = false) - private String password; - - @Column(name = "birthday", nullable = false) - private LocalDate birthday; - - @Column(name = "gender", nullable = false) - @Enumerated(EnumType.STRING) - private Gender gender; - - @Column(name = "profile_image", nullable = false) - private String profileImage; - - @Column(name = "phone_number", nullable = false) - private String phoneNumber; - - protected User() { - - } - - public User(String name, String nickname, String email, String password, - LocalDate birthday, Gender gender, String profileImage, String phoneNumber ) { - this.name = name; - this.nickname = nickname; - this.email = email; - this.password = password; - this.birthday = birthday; - this.gender = gender; - this.profileImage = profileImage; - this.phoneNumber = phoneNumber; - } -} diff --git a/src/main/java/hyu/erica/v2/capstone/user/domain/enums/Gender.java b/src/main/java/hyu/erica/v2/capstone/user/domain/enums/Gender.java deleted file mode 100644 index e9e687a..0000000 --- a/src/main/java/hyu/erica/v2/capstone/user/domain/enums/Gender.java +++ /dev/null @@ -1,5 +0,0 @@ -package hyu.erica.v2.capstone.user.domain.enums; - -public enum Gender { - MALE, FEMALE -} diff --git a/src/test/java/hyu/erica/capstone/CapstoneApplicationTests.java b/src/test/java/hyu/erica/capstone/CapstoneApplicationTests.java index bcb2ac3..a91ac53 100644 --- a/src/test/java/hyu/erica/capstone/CapstoneApplicationTests.java +++ b/src/test/java/hyu/erica/capstone/CapstoneApplicationTests.java @@ -1,10 +1,9 @@ package hyu.erica.capstone; -import hyu.erica.v1.capstone.CapstoneApplication; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest(classes = CapstoneApplication.class) +@SpringBootTest class CapstoneApplicationTests { @Test diff --git a/src/test/java/hyu/erica/capstone/v2/common/fixture/UserFixtures.java b/src/test/java/hyu/erica/capstone/v2/common/fixture/UserFixtures.java deleted file mode 100644 index f2a3419..0000000 --- a/src/test/java/hyu/erica/capstone/v2/common/fixture/UserFixtures.java +++ /dev/null @@ -1,13 +0,0 @@ -package hyu.erica.capstone.v2.common.fixture; - -import hyu.erica.v2.capstone.user.domain.User; -import hyu.erica.v2.capstone.user.domain.enums.Gender; -import java.time.LocalDate; - -public class UserFixtures { - - public static User createNewUser() { - return new User("name", "nickname", "email@naver.com", "password", - LocalDate.MAX, Gender.MALE, "profileImage", "phoneNumber"); - } -} diff --git a/src/test/java/hyu/erica/capstone/v2/tripPlan/domain/TripPlanTest.java b/src/test/java/hyu/erica/capstone/v2/tripPlan/domain/TripPlanTest.java deleted file mode 100644 index 90d70d8..0000000 --- a/src/test/java/hyu/erica/capstone/v2/tripPlan/domain/TripPlanTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package hyu.erica.capstone.v2.tripPlan.domain; - -import static hyu.erica.capstone.v2.common.fixture.UserFixtures.createNewUser; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; - -import hyu.erica.capstone.v2.common.fixture.UserFixtures; -import hyu.erica.v2.capstone.tripPlan.domain.TripPlan; -import hyu.erica.v2.capstone.tripPlan.exception.InvalidTripPlanDateException; -import java.time.LocalDate; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class TripPlanTest { - - @DisplayName("여행 계획을 생성한다.") - @Test - void 여행_계획을_생성한다() { - assertDoesNotThrow( () ->new TripPlan("부산 여행", "재미 있겠다!", "기본 이미지", - LocalDate.MIN, LocalDate.MAX, createNewUser())); - } - - @DisplayName("여행 시작일은 종료일 이전이어야 한다.") - @Test - void 여행_시작일은_종료일_이전이어야_한다() { - assertThatThrownBy(() -> new TripPlan("부산 여행", "재미 있겠다!", "기본 이미지", - LocalDate.MAX, LocalDate.MIN, createNewUser())).isInstanceOf(InvalidTripPlanDateException.class); - } -}