From f7f49bea2d0745a98b5d161846c76dfe036f9eec Mon Sep 17 00:00:00 2001 From: pkl0912 Date: Wed, 4 Sep 2024 18:53:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#64=20[refactor]=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppealCareerController.java | 2 +- .../dto/request/AddAppealCareersRequest.java | 2 +- .../domain/{ => model}/AppealCareer.java | 6 +-- .../repository/AppealCareerRepository.java | 6 +-- .../service/AppealCareerService.java | 18 ++++---- .../career/controller/CareerController.java | 4 +- .../career/{ => domain}/dto/CareerDTO.java | 2 +- .../dto/request/SaveCareerRequest.java | 4 +- .../dto/response/GetCareerDetailResponse.java | 2 +- .../dto/response/GetCareersResponse.java | 4 +- .../career/domain/{ => model}/Career.java | 2 +- .../career/domain/{ => model}/Category.java | 2 +- .../repository/CareerRepository.java | 4 +- .../career/service/CareerService.java | 14 +++--- .../controller/IntReviewController.java | 6 +-- .../dto/request/PostIntReviewRequest.java | 2 +- .../dto/response/IntReviewDetailResponse.java | 2 +- .../domain/{ => model}/IntReview.java | 4 +- .../repository/IntReviewRepository.java | 6 +-- .../int_review/service/IntReviewService.java | 19 ++++---- .../controller/MidReviewController.java | 4 +- .../dto/request/PostMidReviewRequest.java | 2 +- .../dto/response/MidReviewDetailResponse.java | 2 +- .../domain/{ => model}/MidReview.java | 4 +- .../repository/MidReviewRepository.java | 6 +-- .../mid_review/service/MidReviewService.java | 19 ++++---- .../controller/ScheduleController.java | 6 +-- .../schedule/{ => domain}/dto/AlwaysDTO.java | 2 +- .../{ => domain}/dto/CompanyReviewDTO.java | 3 +- .../dto/CompanyReviewDetailDTO.java | 2 +- .../{ => domain}/dto/DateScheduleDTO.java | 2 +- .../schedule/{ => domain}/dto/FastDTO.java | 2 +- .../schedule/{ => domain}/dto/StageDTO.java | 4 +- .../dto/request/SchedulePostRequest.java | 4 +- .../UpdateScheduleProgressRequest.java | 4 +- .../dto/response/AlwaysResponse.java | 4 +- .../response/CompanyReviewListResponse.java | 4 +- .../response/DateClickScheduleResponse.java | 4 +- .../dto/response/FastReviewListResponse.java | 4 +- .../dto/response/ScheduleResponse.java | 4 +- .../schedule/domain/{ => model}/Progress.java | 2 +- .../schedule/domain/{ => model}/Schedule.java | 5 +-- .../repository/ScheduleRepository.java | 6 +-- .../schedule/service/ScheduleService.java | 25 ++++++----- .../controller/SelfIntroController.java | 2 +- .../{ => domain}/dto/SelfIntroDTO.java | 2 +- .../dto/request/SaveSelfIntroRequest.java | 10 +++++ .../domain/{ => model}/SelfIntro.java | 5 +-- .../repository/SelfIntroRepository.java | 7 ++- .../dto/request/SaveSelfIntroRequest.java | 10 ----- .../self_intro/service/SelfIntroService.java | 18 ++++---- .../stage/controller/StageController.java | 7 ++- .../{ => domain}/dto/AppealCareerDTO.java | 2 +- .../stage/{ => domain}/dto/IntReviewDTO.java | 2 +- .../stage/{ => domain}/dto/MidReviewDTO.java | 2 +- .../stage/{ => domain}/dto/StageDTO.java | 2 +- .../dto/request/AddStageRequest.java | 4 +- .../dto/request/UpdateStageStatusRequest.java | 4 +- .../dto/response/AddStageResponse.java | 2 +- .../response/GetDocumentStageResponse.java | 6 +-- .../response/GetInterviewStageResponse.java | 13 ++++++ .../dto/response/GetMidStageResponse.java | 9 ++++ .../dto/response/GetStagesResponse.java | 4 +- .../stage/domain/{ => model}/Stage.java | 5 +-- .../stage/domain/{ => model}/Status.java | 2 +- .../stage/domain/{ => model}/Type.java | 2 +- .../repository/StageRepository.java | 10 ++--- .../response/GetInterviewStageResponse.java | 13 ------ .../dto/response/GetMidStageResponse.java | 9 ---- .../stage/service/StageService.java | 45 +++++++++---------- .../todo/controller/TodoController.java | 4 +- .../todo/{ => domain}/dto/TodoDTO.java | 2 +- .../todo/domain/dto/request/TodoRequest.java | 6 +++ .../domain/dto/response/TodoResponse.java | 10 +++++ .../todo/domain/{ => model}/Todo.java | 2 +- .../repository/TodoRepository.java | 5 +-- .../todo/dto/request/TodoRequest.java | 6 --- .../todo/dto/response/TodoResponse.java | 10 ----- .../letscareer/todo/service/TodoService.java | 13 +++--- .../repository/UserRepository.java | 2 +- 80 files changed, 238 insertions(+), 254 deletions(-) rename src/main/java/com/example/letscareer/appealCareer/{ => domain}/dto/request/AddAppealCareersRequest.java (60%) rename src/main/java/com/example/letscareer/appealCareer/domain/{ => model}/AppealCareer.java (72%) rename src/main/java/com/example/letscareer/appealCareer/{ => domain}/repository/AppealCareerRepository.java (60%) rename src/main/java/com/example/letscareer/career/{ => domain}/dto/CareerDTO.java (82%) rename src/main/java/com/example/letscareer/career/{ => domain}/dto/request/SaveCareerRequest.java (71%) rename src/main/java/com/example/letscareer/career/{ => domain}/dto/response/GetCareerDetailResponse.java (84%) rename src/main/java/com/example/letscareer/career/{ => domain}/dto/response/GetCareersResponse.java (55%) rename src/main/java/com/example/letscareer/career/domain/{ => model}/Career.java (93%) rename src/main/java/com/example/letscareer/career/domain/{ => model}/Category.java (84%) rename src/main/java/com/example/letscareer/career/{ => domain}/repository/CareerRepository.java (81%) rename src/main/java/com/example/letscareer/int_review/{ => domain}/dto/request/PostIntReviewRequest.java (63%) rename src/main/java/com/example/letscareer/int_review/{ => domain}/dto/response/IntReviewDetailResponse.java (83%) rename src/main/java/com/example/letscareer/int_review/domain/{ => model}/IntReview.java (85%) rename src/main/java/com/example/letscareer/int_review/{ => domain}/repository/IntReviewRepository.java (78%) rename src/main/java/com/example/letscareer/mid_review/{ => domain}/dto/request/PostMidReviewRequest.java (59%) rename src/main/java/com/example/letscareer/mid_review/{ => domain}/dto/response/MidReviewDetailResponse.java (81%) rename src/main/java/com/example/letscareer/mid_review/domain/{ => model}/MidReview.java (84%) rename src/main/java/com/example/letscareer/mid_review/{ => domain}/repository/MidReviewRepository.java (78%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/AlwaysDTO.java (74%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/CompanyReviewDTO.java (77%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/CompanyReviewDetailDTO.java (81%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/DateScheduleDTO.java (79%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/FastDTO.java (70%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/StageDTO.java (68%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/request/SchedulePostRequest.java (75%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/request/UpdateScheduleProgressRequest.java (61%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/response/AlwaysResponse.java (52%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/response/CompanyReviewListResponse.java (55%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/response/DateClickScheduleResponse.java (56%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/response/FastReviewListResponse.java (58%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/dto/response/ScheduleResponse.java (62%) rename src/main/java/com/example/letscareer/schedule/domain/{ => model}/Progress.java (80%) rename src/main/java/com/example/letscareer/schedule/domain/{ => model}/Schedule.java (86%) rename src/main/java/com/example/letscareer/schedule/{ => domain}/repository/ScheduleRepository.java (74%) rename src/main/java/com/example/letscareer/self_intro/{ => domain}/dto/SelfIntroDTO.java (65%) create mode 100644 src/main/java/com/example/letscareer/self_intro/domain/dto/request/SaveSelfIntroRequest.java rename src/main/java/com/example/letscareer/self_intro/domain/{ => model}/SelfIntro.java (76%) rename src/main/java/com/example/letscareer/self_intro/{ => domain}/repository/SelfIntroRepository.java (59%) delete mode 100644 src/main/java/com/example/letscareer/self_intro/dto/request/SaveSelfIntroRequest.java rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/AppealCareerDTO.java (68%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/IntReviewDTO.java (71%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/MidReviewDTO.java (68%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/StageDTO.java (78%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/request/AddStageRequest.java (68%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/request/UpdateStageStatusRequest.java (61%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/response/AddStageResponse.java (77%) rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/response/GetDocumentStageResponse.java (52%) create mode 100644 src/main/java/com/example/letscareer/stage/domain/dto/response/GetInterviewStageResponse.java create mode 100644 src/main/java/com/example/letscareer/stage/domain/dto/response/GetMidStageResponse.java rename src/main/java/com/example/letscareer/stage/{ => domain}/dto/response/GetStagesResponse.java (67%) rename src/main/java/com/example/letscareer/stage/domain/{ => model}/Stage.java (81%) rename src/main/java/com/example/letscareer/stage/domain/{ => model}/Status.java (79%) rename src/main/java/com/example/letscareer/stage/domain/{ => model}/Type.java (78%) rename src/main/java/com/example/letscareer/stage/{ => domain}/repository/StageRepository.java (83%) delete mode 100644 src/main/java/com/example/letscareer/stage/dto/response/GetInterviewStageResponse.java delete mode 100644 src/main/java/com/example/letscareer/stage/dto/response/GetMidStageResponse.java rename src/main/java/com/example/letscareer/todo/{ => domain}/dto/TodoDTO.java (61%) create mode 100644 src/main/java/com/example/letscareer/todo/domain/dto/request/TodoRequest.java create mode 100644 src/main/java/com/example/letscareer/todo/domain/dto/response/TodoResponse.java rename src/main/java/com/example/letscareer/todo/domain/{ => model}/Todo.java (91%) rename src/main/java/com/example/letscareer/todo/{ => domain}/repository/TodoRepository.java (74%) delete mode 100644 src/main/java/com/example/letscareer/todo/dto/request/TodoRequest.java delete mode 100644 src/main/java/com/example/letscareer/todo/dto/response/TodoResponse.java rename src/main/java/com/example/letscareer/user/{ => domain}/repository/UserRepository.java (85%) diff --git a/src/main/java/com/example/letscareer/appealCareer/controller/AppealCareerController.java b/src/main/java/com/example/letscareer/appealCareer/controller/AppealCareerController.java index 26bfc27..2d1d537 100644 --- a/src/main/java/com/example/letscareer/appealCareer/controller/AppealCareerController.java +++ b/src/main/java/com/example/letscareer/appealCareer/controller/AppealCareerController.java @@ -1,6 +1,6 @@ package com.example.letscareer.appealCareer.controller; -import com.example.letscareer.appealCareer.dto.request.AddAppealCareersRequest; +import com.example.letscareer.appealCareer.domain.dto.request.AddAppealCareersRequest; import com.example.letscareer.appealCareer.service.AppealCareerService; import com.example.letscareer.common.dto.ApiResponse; import com.example.letscareer.common.dto.ErrorResponse; diff --git a/src/main/java/com/example/letscareer/appealCareer/dto/request/AddAppealCareersRequest.java b/src/main/java/com/example/letscareer/appealCareer/domain/dto/request/AddAppealCareersRequest.java similarity index 60% rename from src/main/java/com/example/letscareer/appealCareer/dto/request/AddAppealCareersRequest.java rename to src/main/java/com/example/letscareer/appealCareer/domain/dto/request/AddAppealCareersRequest.java index 317b533..b18a73a 100644 --- a/src/main/java/com/example/letscareer/appealCareer/dto/request/AddAppealCareersRequest.java +++ b/src/main/java/com/example/letscareer/appealCareer/domain/dto/request/AddAppealCareersRequest.java @@ -1,4 +1,4 @@ -package com.example.letscareer.appealCareer.dto.request; +package com.example.letscareer.appealCareer.domain.dto.request; import java.util.List; diff --git a/src/main/java/com/example/letscareer/appealCareer/domain/AppealCareer.java b/src/main/java/com/example/letscareer/appealCareer/domain/model/AppealCareer.java similarity index 72% rename from src/main/java/com/example/letscareer/appealCareer/domain/AppealCareer.java rename to src/main/java/com/example/letscareer/appealCareer/domain/model/AppealCareer.java index 42f7466..0ff05a5 100644 --- a/src/main/java/com/example/letscareer/appealCareer/domain/AppealCareer.java +++ b/src/main/java/com/example/letscareer/appealCareer/domain/model/AppealCareer.java @@ -1,8 +1,8 @@ -package com.example.letscareer.appealCareer.domain; +package com.example.letscareer.appealCareer.domain.model; -import com.example.letscareer.career.domain.Career; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.career.domain.model.Career; +import com.example.letscareer.stage.domain.model.Stage; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/letscareer/appealCareer/repository/AppealCareerRepository.java b/src/main/java/com/example/letscareer/appealCareer/domain/repository/AppealCareerRepository.java similarity index 60% rename from src/main/java/com/example/letscareer/appealCareer/repository/AppealCareerRepository.java rename to src/main/java/com/example/letscareer/appealCareer/domain/repository/AppealCareerRepository.java index 9bc0ada..63fc942 100644 --- a/src/main/java/com/example/letscareer/appealCareer/repository/AppealCareerRepository.java +++ b/src/main/java/com/example/letscareer/appealCareer/domain/repository/AppealCareerRepository.java @@ -1,7 +1,7 @@ -package com.example.letscareer.appealCareer.repository; +package com.example.letscareer.appealCareer.domain.repository; -import com.example.letscareer.appealCareer.domain.AppealCareer; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.appealCareer.domain.model.AppealCareer; +import com.example.letscareer.stage.domain.model.Stage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/letscareer/appealCareer/service/AppealCareerService.java b/src/main/java/com/example/letscareer/appealCareer/service/AppealCareerService.java index 0abec38..6c71ca0 100644 --- a/src/main/java/com/example/letscareer/appealCareer/service/AppealCareerService.java +++ b/src/main/java/com/example/letscareer/appealCareer/service/AppealCareerService.java @@ -1,16 +1,16 @@ package com.example.letscareer.appealCareer.service; -import com.example.letscareer.appealCareer.domain.AppealCareer; -import com.example.letscareer.appealCareer.dto.request.AddAppealCareersRequest; -import com.example.letscareer.appealCareer.repository.AppealCareerRepository; -import com.example.letscareer.career.repository.CareerRepository; +import com.example.letscareer.appealCareer.domain.model.AppealCareer; +import com.example.letscareer.appealCareer.domain.dto.request.AddAppealCareersRequest; +import com.example.letscareer.appealCareer.domain.repository.AppealCareerRepository; +import com.example.letscareer.career.domain.repository.CareerRepository; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/career/controller/CareerController.java b/src/main/java/com/example/letscareer/career/controller/CareerController.java index 22f370c..47332a5 100644 --- a/src/main/java/com/example/letscareer/career/controller/CareerController.java +++ b/src/main/java/com/example/letscareer/career/controller/CareerController.java @@ -1,6 +1,6 @@ package com.example.letscareer.career.controller; -import com.example.letscareer.career.dto.request.SaveCareerRequest; +import com.example.letscareer.career.domain.dto.request.SaveCareerRequest; import com.example.letscareer.career.service.CareerService; import com.example.letscareer.common.dto.ApiResponse; import com.example.letscareer.common.dto.ErrorResponse; @@ -10,7 +10,7 @@ import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; import com.example.letscareer.common.exception.model.ValidationException; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/career/dto/CareerDTO.java b/src/main/java/com/example/letscareer/career/domain/dto/CareerDTO.java similarity index 82% rename from src/main/java/com/example/letscareer/career/dto/CareerDTO.java rename to src/main/java/com/example/letscareer/career/domain/dto/CareerDTO.java index 0dd6553..832cf94 100644 --- a/src/main/java/com/example/letscareer/career/dto/CareerDTO.java +++ b/src/main/java/com/example/letscareer/career/domain/dto/CareerDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.career.dto; +package com.example.letscareer.career.domain.dto; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/career/dto/request/SaveCareerRequest.java b/src/main/java/com/example/letscareer/career/domain/dto/request/SaveCareerRequest.java similarity index 71% rename from src/main/java/com/example/letscareer/career/dto/request/SaveCareerRequest.java rename to src/main/java/com/example/letscareer/career/domain/dto/request/SaveCareerRequest.java index 29b508d..a87afe5 100644 --- a/src/main/java/com/example/letscareer/career/dto/request/SaveCareerRequest.java +++ b/src/main/java/com/example/letscareer/career/domain/dto/request/SaveCareerRequest.java @@ -1,6 +1,6 @@ -package com.example.letscareer.career.dto.request; +package com.example.letscareer.career.domain.dto.request; -import com.example.letscareer.career.domain.Category; +import com.example.letscareer.career.domain.model.Category; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/career/dto/response/GetCareerDetailResponse.java b/src/main/java/com/example/letscareer/career/domain/dto/response/GetCareerDetailResponse.java similarity index 84% rename from src/main/java/com/example/letscareer/career/dto/response/GetCareerDetailResponse.java rename to src/main/java/com/example/letscareer/career/domain/dto/response/GetCareerDetailResponse.java index 5de3e7d..ce3bcd3 100644 --- a/src/main/java/com/example/letscareer/career/dto/response/GetCareerDetailResponse.java +++ b/src/main/java/com/example/letscareer/career/domain/dto/response/GetCareerDetailResponse.java @@ -1,4 +1,4 @@ -package com.example.letscareer.career.dto.response; +package com.example.letscareer.career.domain.dto.response; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/career/dto/response/GetCareersResponse.java b/src/main/java/com/example/letscareer/career/domain/dto/response/GetCareersResponse.java similarity index 55% rename from src/main/java/com/example/letscareer/career/dto/response/GetCareersResponse.java rename to src/main/java/com/example/letscareer/career/domain/dto/response/GetCareersResponse.java index 3fb6426..8e840bf 100644 --- a/src/main/java/com/example/letscareer/career/dto/response/GetCareersResponse.java +++ b/src/main/java/com/example/letscareer/career/domain/dto/response/GetCareersResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.career.dto.response; +package com.example.letscareer.career.domain.dto.response; -import com.example.letscareer.career.dto.CareerDTO; +import com.example.letscareer.career.domain.dto.CareerDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/career/domain/Career.java b/src/main/java/com/example/letscareer/career/domain/model/Career.java similarity index 93% rename from src/main/java/com/example/letscareer/career/domain/Career.java rename to src/main/java/com/example/letscareer/career/domain/model/Career.java index f85feae..5c93084 100644 --- a/src/main/java/com/example/letscareer/career/domain/Career.java +++ b/src/main/java/com/example/letscareer/career/domain/model/Career.java @@ -1,4 +1,4 @@ -package com.example.letscareer.career.domain; +package com.example.letscareer.career.domain.model; import com.example.letscareer.user.domain.User; diff --git a/src/main/java/com/example/letscareer/career/domain/Category.java b/src/main/java/com/example/letscareer/career/domain/model/Category.java similarity index 84% rename from src/main/java/com/example/letscareer/career/domain/Category.java rename to src/main/java/com/example/letscareer/career/domain/model/Category.java index dbd47c8..f66b342 100644 --- a/src/main/java/com/example/letscareer/career/domain/Category.java +++ b/src/main/java/com/example/letscareer/career/domain/model/Category.java @@ -1,4 +1,4 @@ -package com.example.letscareer.career.domain; +package com.example.letscareer.career.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/letscareer/career/repository/CareerRepository.java b/src/main/java/com/example/letscareer/career/domain/repository/CareerRepository.java similarity index 81% rename from src/main/java/com/example/letscareer/career/repository/CareerRepository.java rename to src/main/java/com/example/letscareer/career/domain/repository/CareerRepository.java index 3925b75..e6c95fc 100644 --- a/src/main/java/com/example/letscareer/career/repository/CareerRepository.java +++ b/src/main/java/com/example/letscareer/career/domain/repository/CareerRepository.java @@ -1,6 +1,6 @@ -package com.example.letscareer.career.repository; +package com.example.letscareer.career.domain.repository; -import com.example.letscareer.career.domain.Career; +import com.example.letscareer.career.domain.model.Career; import com.example.letscareer.user.domain.User; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/letscareer/career/service/CareerService.java b/src/main/java/com/example/letscareer/career/service/CareerService.java index 641a503..c8e87e5 100644 --- a/src/main/java/com/example/letscareer/career/service/CareerService.java +++ b/src/main/java/com/example/letscareer/career/service/CareerService.java @@ -1,17 +1,17 @@ package com.example.letscareer.career.service; -import com.example.letscareer.career.domain.Career; -import com.example.letscareer.career.dto.CareerDTO; -import com.example.letscareer.career.dto.request.SaveCareerRequest; -import com.example.letscareer.career.dto.response.GetCareerDetailResponse; -import com.example.letscareer.career.dto.response.GetCareersResponse; -import com.example.letscareer.career.repository.CareerRepository; +import com.example.letscareer.career.domain.model.Career; +import com.example.letscareer.career.domain.dto.CareerDTO; +import com.example.letscareer.career.domain.dto.request.SaveCareerRequest; +import com.example.letscareer.career.domain.dto.response.GetCareerDetailResponse; +import com.example.letscareer.career.domain.dto.response.GetCareersResponse; +import com.example.letscareer.career.domain.repository.CareerRepository; import com.example.letscareer.common.exception.enums.ErrorCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; import com.example.letscareer.common.exception.model.ValidationException; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/int_review/controller/IntReviewController.java b/src/main/java/com/example/letscareer/int_review/controller/IntReviewController.java index 68cf370..bde9532 100644 --- a/src/main/java/com/example/letscareer/int_review/controller/IntReviewController.java +++ b/src/main/java/com/example/letscareer/int_review/controller/IntReviewController.java @@ -7,11 +7,9 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.int_review.dto.request.PostIntReviewRequest; -import com.example.letscareer.int_review.dto.response.IntReviewDetailResponse; +import com.example.letscareer.int_review.domain.dto.request.PostIntReviewRequest; +import com.example.letscareer.int_review.domain.dto.response.IntReviewDetailResponse; import com.example.letscareer.int_review.service.IntReviewService; -import com.example.letscareer.mid_review.dto.request.PostMidReviewRequest; -import com.example.letscareer.mid_review.dto.response.MidReviewDetailResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/int_review/dto/request/PostIntReviewRequest.java b/src/main/java/com/example/letscareer/int_review/domain/dto/request/PostIntReviewRequest.java similarity index 63% rename from src/main/java/com/example/letscareer/int_review/dto/request/PostIntReviewRequest.java rename to src/main/java/com/example/letscareer/int_review/domain/dto/request/PostIntReviewRequest.java index 68e5f2a..2210df7 100644 --- a/src/main/java/com/example/letscareer/int_review/dto/request/PostIntReviewRequest.java +++ b/src/main/java/com/example/letscareer/int_review/domain/dto/request/PostIntReviewRequest.java @@ -1,4 +1,4 @@ -package com.example.letscareer.int_review.dto.request; +package com.example.letscareer.int_review.domain.dto.request; public record PostIntReviewRequest( String details, diff --git a/src/main/java/com/example/letscareer/int_review/dto/response/IntReviewDetailResponse.java b/src/main/java/com/example/letscareer/int_review/domain/dto/response/IntReviewDetailResponse.java similarity index 83% rename from src/main/java/com/example/letscareer/int_review/dto/response/IntReviewDetailResponse.java rename to src/main/java/com/example/letscareer/int_review/domain/dto/response/IntReviewDetailResponse.java index 1bbd759..53fdf11 100644 --- a/src/main/java/com/example/letscareer/int_review/dto/response/IntReviewDetailResponse.java +++ b/src/main/java/com/example/letscareer/int_review/domain/dto/response/IntReviewDetailResponse.java @@ -1,4 +1,4 @@ -package com.example.letscareer.int_review.dto.response; +package com.example.letscareer.int_review.domain.dto.response; import jakarta.persistence.Lob; diff --git a/src/main/java/com/example/letscareer/int_review/domain/IntReview.java b/src/main/java/com/example/letscareer/int_review/domain/model/IntReview.java similarity index 85% rename from src/main/java/com/example/letscareer/int_review/domain/IntReview.java rename to src/main/java/com/example/letscareer/int_review/domain/model/IntReview.java index 9acd001..ff473cb 100644 --- a/src/main/java/com/example/letscareer/int_review/domain/IntReview.java +++ b/src/main/java/com/example/letscareer/int_review/domain/model/IntReview.java @@ -1,6 +1,6 @@ -package com.example.letscareer.int_review.domain; +package com.example.letscareer.int_review.domain.model; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.stage.domain.model.Stage; import com.example.letscareer.user.domain.User; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/letscareer/int_review/repository/IntReviewRepository.java b/src/main/java/com/example/letscareer/int_review/domain/repository/IntReviewRepository.java similarity index 78% rename from src/main/java/com/example/letscareer/int_review/repository/IntReviewRepository.java rename to src/main/java/com/example/letscareer/int_review/domain/repository/IntReviewRepository.java index b676627..4b0bc3c 100644 --- a/src/main/java/com/example/letscareer/int_review/repository/IntReviewRepository.java +++ b/src/main/java/com/example/letscareer/int_review/domain/repository/IntReviewRepository.java @@ -1,7 +1,7 @@ -package com.example.letscareer.int_review.repository; +package com.example.letscareer.int_review.domain.repository; -import com.example.letscareer.int_review.domain.IntReview; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.int_review.domain.model.IntReview; +import com.example.letscareer.stage.domain.model.Stage; import com.example.letscareer.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/letscareer/int_review/service/IntReviewService.java b/src/main/java/com/example/letscareer/int_review/service/IntReviewService.java index 78720f1..3ef6204 100644 --- a/src/main/java/com/example/letscareer/int_review/service/IntReviewService.java +++ b/src/main/java/com/example/letscareer/int_review/service/IntReviewService.java @@ -1,17 +1,16 @@ package com.example.letscareer.int_review.service; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.int_review.domain.IntReview; -import com.example.letscareer.int_review.dto.request.PostIntReviewRequest; -import com.example.letscareer.int_review.dto.response.IntReviewDetailResponse; -import com.example.letscareer.int_review.repository.IntReviewRepository; -import com.example.letscareer.mid_review.domain.MidReview; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.int_review.domain.model.IntReview; +import com.example.letscareer.int_review.domain.dto.request.PostIntReviewRequest; +import com.example.letscareer.int_review.domain.dto.response.IntReviewDetailResponse; +import com.example.letscareer.int_review.domain.repository.IntReviewRepository; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/mid_review/controller/MidReviewController.java b/src/main/java/com/example/letscareer/mid_review/controller/MidReviewController.java index 8fbbaf3..16ab16f 100644 --- a/src/main/java/com/example/letscareer/mid_review/controller/MidReviewController.java +++ b/src/main/java/com/example/letscareer/mid_review/controller/MidReviewController.java @@ -7,8 +7,8 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.mid_review.dto.request.PostMidReviewRequest; -import com.example.letscareer.mid_review.dto.response.MidReviewDetailResponse; +import com.example.letscareer.mid_review.domain.dto.request.PostMidReviewRequest; +import com.example.letscareer.mid_review.domain.dto.response.MidReviewDetailResponse; import com.example.letscareer.mid_review.service.MidReviewService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/mid_review/dto/request/PostMidReviewRequest.java b/src/main/java/com/example/letscareer/mid_review/domain/dto/request/PostMidReviewRequest.java similarity index 59% rename from src/main/java/com/example/letscareer/mid_review/dto/request/PostMidReviewRequest.java rename to src/main/java/com/example/letscareer/mid_review/domain/dto/request/PostMidReviewRequest.java index 4b9fedd..56cbe03 100644 --- a/src/main/java/com/example/letscareer/mid_review/dto/request/PostMidReviewRequest.java +++ b/src/main/java/com/example/letscareer/mid_review/domain/dto/request/PostMidReviewRequest.java @@ -1,4 +1,4 @@ -package com.example.letscareer.mid_review.dto.request; +package com.example.letscareer.mid_review.domain.dto.request; public record PostMidReviewRequest( String free_review, diff --git a/src/main/java/com/example/letscareer/mid_review/dto/response/MidReviewDetailResponse.java b/src/main/java/com/example/letscareer/mid_review/domain/dto/response/MidReviewDetailResponse.java similarity index 81% rename from src/main/java/com/example/letscareer/mid_review/dto/response/MidReviewDetailResponse.java rename to src/main/java/com/example/letscareer/mid_review/domain/dto/response/MidReviewDetailResponse.java index 89ec1db..824ddbf 100644 --- a/src/main/java/com/example/letscareer/mid_review/dto/response/MidReviewDetailResponse.java +++ b/src/main/java/com/example/letscareer/mid_review/domain/dto/response/MidReviewDetailResponse.java @@ -1,4 +1,4 @@ -package com.example.letscareer.mid_review.dto.response; +package com.example.letscareer.mid_review.domain.dto.response; import jakarta.persistence.Lob; diff --git a/src/main/java/com/example/letscareer/mid_review/domain/MidReview.java b/src/main/java/com/example/letscareer/mid_review/domain/model/MidReview.java similarity index 84% rename from src/main/java/com/example/letscareer/mid_review/domain/MidReview.java rename to src/main/java/com/example/letscareer/mid_review/domain/model/MidReview.java index adc20bd..8e41523 100644 --- a/src/main/java/com/example/letscareer/mid_review/domain/MidReview.java +++ b/src/main/java/com/example/letscareer/mid_review/domain/model/MidReview.java @@ -1,6 +1,6 @@ -package com.example.letscareer.mid_review.domain; +package com.example.letscareer.mid_review.domain.model; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.stage.domain.model.Stage; import com.example.letscareer.user.domain.User; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/letscareer/mid_review/repository/MidReviewRepository.java b/src/main/java/com/example/letscareer/mid_review/domain/repository/MidReviewRepository.java similarity index 78% rename from src/main/java/com/example/letscareer/mid_review/repository/MidReviewRepository.java rename to src/main/java/com/example/letscareer/mid_review/domain/repository/MidReviewRepository.java index d976e26..45d3099 100644 --- a/src/main/java/com/example/letscareer/mid_review/repository/MidReviewRepository.java +++ b/src/main/java/com/example/letscareer/mid_review/domain/repository/MidReviewRepository.java @@ -1,7 +1,7 @@ -package com.example.letscareer.mid_review.repository; +package com.example.letscareer.mid_review.domain.repository; -import com.example.letscareer.mid_review.domain.MidReview; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.mid_review.domain.model.MidReview; +import com.example.letscareer.stage.domain.model.Stage; import com.example.letscareer.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/letscareer/mid_review/service/MidReviewService.java b/src/main/java/com/example/letscareer/mid_review/service/MidReviewService.java index b9ca45e..b4fcc14 100644 --- a/src/main/java/com/example/letscareer/mid_review/service/MidReviewService.java +++ b/src/main/java/com/example/letscareer/mid_review/service/MidReviewService.java @@ -1,17 +1,16 @@ package com.example.letscareer.mid_review.service; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.int_review.repository.IntReviewRepository; -import com.example.letscareer.mid_review.domain.MidReview; -import com.example.letscareer.mid_review.dto.request.PostMidReviewRequest; -import com.example.letscareer.mid_review.dto.response.MidReviewDetailResponse; -import com.example.letscareer.mid_review.repository.MidReviewRepository; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.mid_review.domain.model.MidReview; +import com.example.letscareer.mid_review.domain.dto.request.PostMidReviewRequest; +import com.example.letscareer.mid_review.domain.dto.response.MidReviewDetailResponse; +import com.example.letscareer.mid_review.domain.repository.MidReviewRepository; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/schedule/controller/ScheduleController.java b/src/main/java/com/example/letscareer/schedule/controller/ScheduleController.java index 99c5c06..3a3088c 100644 --- a/src/main/java/com/example/letscareer/schedule/controller/ScheduleController.java +++ b/src/main/java/com/example/letscareer/schedule/controller/ScheduleController.java @@ -7,9 +7,9 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.schedule.dto.request.SchedulePostRequest; -import com.example.letscareer.schedule.dto.request.UpdateScheduleProgressRequest; -import com.example.letscareer.schedule.dto.response.*; +import com.example.letscareer.schedule.domain.dto.request.SchedulePostRequest; +import com.example.letscareer.schedule.domain.dto.request.UpdateScheduleProgressRequest; +import com.example.letscareer.schedule.domain.dto.response.*; import com.example.letscareer.schedule.service.ScheduleService; import lombok.RequiredArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/example/letscareer/schedule/dto/AlwaysDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/AlwaysDTO.java similarity index 74% rename from src/main/java/com/example/letscareer/schedule/dto/AlwaysDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/AlwaysDTO.java index ed1d1de..9d105be 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/AlwaysDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/AlwaysDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; public record AlwaysDTO( Long scheduleId, diff --git a/src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDTO.java similarity index 77% rename from src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDTO.java index 700b258..0872469 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDTO.java @@ -1,7 +1,6 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; import java.util.List; -import java.util.Map; public record CompanyReviewDTO( String company, diff --git a/src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDetailDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDetailDTO.java similarity index 81% rename from src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDetailDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDetailDTO.java index 400e71e..5243732 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/CompanyReviewDetailDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/CompanyReviewDetailDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; import java.time.LocalDate; diff --git a/src/main/java/com/example/letscareer/schedule/dto/DateScheduleDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/DateScheduleDTO.java similarity index 79% rename from src/main/java/com/example/letscareer/schedule/dto/DateScheduleDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/DateScheduleDTO.java index 14fa29e..4fe02f1 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/DateScheduleDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/DateScheduleDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; public record DateScheduleDTO( Long scheduleId, diff --git a/src/main/java/com/example/letscareer/schedule/dto/FastDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/FastDTO.java similarity index 70% rename from src/main/java/com/example/letscareer/schedule/dto/FastDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/FastDTO.java index e18a08b..d2b4976 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/FastDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/FastDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; public record FastDTO( Long stageId, diff --git a/src/main/java/com/example/letscareer/schedule/dto/StageDTO.java b/src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java similarity index 68% rename from src/main/java/com/example/letscareer/schedule/dto/StageDTO.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java index c627653..9440d8f 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/StageDTO.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/StageDTO.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto; +package com.example.letscareer.schedule.domain.dto; -import com.example.letscareer.schedule.domain.Progress; +import com.example.letscareer.schedule.domain.model.Progress; import java.time.LocalDate; diff --git a/src/main/java/com/example/letscareer/schedule/dto/request/SchedulePostRequest.java b/src/main/java/com/example/letscareer/schedule/domain/dto/request/SchedulePostRequest.java similarity index 75% rename from src/main/java/com/example/letscareer/schedule/dto/request/SchedulePostRequest.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/request/SchedulePostRequest.java index 7f99560..1d069bc 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/request/SchedulePostRequest.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/request/SchedulePostRequest.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.request; +package com.example.letscareer.schedule.domain.dto.request; -import com.example.letscareer.stage.domain.Type; +import com.example.letscareer.stage.domain.model.Type; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/schedule/dto/request/UpdateScheduleProgressRequest.java b/src/main/java/com/example/letscareer/schedule/domain/dto/request/UpdateScheduleProgressRequest.java similarity index 61% rename from src/main/java/com/example/letscareer/schedule/dto/request/UpdateScheduleProgressRequest.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/request/UpdateScheduleProgressRequest.java index 8790a8d..8d9aa8a 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/request/UpdateScheduleProgressRequest.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/request/UpdateScheduleProgressRequest.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.request; +package com.example.letscareer.schedule.domain.dto.request; -import com.example.letscareer.schedule.domain.Progress; +import com.example.letscareer.schedule.domain.model.Progress; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/schedule/dto/response/AlwaysResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/AlwaysResponse.java similarity index 52% rename from src/main/java/com/example/letscareer/schedule/dto/response/AlwaysResponse.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/response/AlwaysResponse.java index 42692d6..b835fd9 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/response/AlwaysResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/AlwaysResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.response; +package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.dto.AlwaysDTO; +import com.example.letscareer.schedule.domain.dto.AlwaysDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/schedule/dto/response/CompanyReviewListResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/CompanyReviewListResponse.java similarity index 55% rename from src/main/java/com/example/letscareer/schedule/dto/response/CompanyReviewListResponse.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/response/CompanyReviewListResponse.java index cf07169..8a8d6fd 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/response/CompanyReviewListResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/CompanyReviewListResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.response; +package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.dto.CompanyReviewDTO; +import com.example.letscareer.schedule.domain.dto.CompanyReviewDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/schedule/dto/response/DateClickScheduleResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/DateClickScheduleResponse.java similarity index 56% rename from src/main/java/com/example/letscareer/schedule/dto/response/DateClickScheduleResponse.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/response/DateClickScheduleResponse.java index 46b187b..b6a5e7f 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/response/DateClickScheduleResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/DateClickScheduleResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.response; +package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.dto.DateScheduleDTO; +import com.example.letscareer.schedule.domain.dto.DateScheduleDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/schedule/dto/response/FastReviewListResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/FastReviewListResponse.java similarity index 58% rename from src/main/java/com/example/letscareer/schedule/dto/response/FastReviewListResponse.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/response/FastReviewListResponse.java index 441cc75..4cb8abc 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/response/FastReviewListResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/FastReviewListResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.response; +package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.dto.FastDTO; +import com.example.letscareer.schedule.domain.dto.FastDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/schedule/dto/response/ScheduleResponse.java b/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java similarity index 62% rename from src/main/java/com/example/letscareer/schedule/dto/response/ScheduleResponse.java rename to src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java index 6a3def5..9a47fb5 100644 --- a/src/main/java/com/example/letscareer/schedule/dto/response/ScheduleResponse.java +++ b/src/main/java/com/example/letscareer/schedule/domain/dto/response/ScheduleResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.schedule.dto.response; +package com.example.letscareer.schedule.domain.dto.response; -import com.example.letscareer.schedule.dto.StageDTO; +import com.example.letscareer.schedule.domain.dto.StageDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/schedule/domain/Progress.java b/src/main/java/com/example/letscareer/schedule/domain/model/Progress.java similarity index 80% rename from src/main/java/com/example/letscareer/schedule/domain/Progress.java rename to src/main/java/com/example/letscareer/schedule/domain/model/Progress.java index 6bdfd94..812af32 100644 --- a/src/main/java/com/example/letscareer/schedule/domain/Progress.java +++ b/src/main/java/com/example/letscareer/schedule/domain/model/Progress.java @@ -1,4 +1,4 @@ -package com.example.letscareer.schedule.domain; +package com.example.letscareer.schedule.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/letscareer/schedule/domain/Schedule.java b/src/main/java/com/example/letscareer/schedule/domain/model/Schedule.java similarity index 86% rename from src/main/java/com/example/letscareer/schedule/domain/Schedule.java rename to src/main/java/com/example/letscareer/schedule/domain/model/Schedule.java index 9d58993..5692dba 100644 --- a/src/main/java/com/example/letscareer/schedule/domain/Schedule.java +++ b/src/main/java/com/example/letscareer/schedule/domain/model/Schedule.java @@ -1,12 +1,11 @@ -package com.example.letscareer.schedule.domain; +package com.example.letscareer.schedule.domain.model; -import com.example.letscareer.stage.domain.Stage; +import com.example.letscareer.stage.domain.model.Stage; import com.example.letscareer.user.domain.User; import jakarta.persistence.*; import lombok.*; import org.antlr.v4.runtime.misc.NotNull; -import java.util.Date; import java.util.List; @Entity diff --git a/src/main/java/com/example/letscareer/schedule/repository/ScheduleRepository.java b/src/main/java/com/example/letscareer/schedule/domain/repository/ScheduleRepository.java similarity index 74% rename from src/main/java/com/example/letscareer/schedule/repository/ScheduleRepository.java rename to src/main/java/com/example/letscareer/schedule/domain/repository/ScheduleRepository.java index 87ddaaf..fa28083 100644 --- a/src/main/java/com/example/letscareer/schedule/repository/ScheduleRepository.java +++ b/src/main/java/com/example/letscareer/schedule/domain/repository/ScheduleRepository.java @@ -1,12 +1,10 @@ -package com.example.letscareer.schedule.repository; +package com.example.letscareer.schedule.domain.repository; -import com.example.letscareer.schedule.domain.Schedule; +import com.example.letscareer.schedule.domain.model.Schedule; import com.example.letscareer.user.domain.User; -import io.lettuce.core.dynamic.annotation.Param; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java index 7beee03..7aad329 100644 --- a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java +++ b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java @@ -1,20 +1,21 @@ package com.example.letscareer.schedule.service; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.int_review.repository.IntReviewRepository; -import com.example.letscareer.mid_review.repository.MidReviewRepository; -import com.example.letscareer.schedule.domain.Progress; -import com.example.letscareer.schedule.domain.Schedule; +import com.example.letscareer.int_review.domain.repository.IntReviewRepository; +import com.example.letscareer.mid_review.domain.repository.MidReviewRepository; +import com.example.letscareer.schedule.domain.model.Progress; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.dto.*; +import com.example.letscareer.schedule.domain.dto.response.*; import com.example.letscareer.schedule.dto.*; -import com.example.letscareer.schedule.dto.request.SchedulePostRequest; -import com.example.letscareer.schedule.dto.request.UpdateScheduleProgressRequest; -import com.example.letscareer.schedule.dto.response.*; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.domain.Status; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.schedule.domain.dto.request.SchedulePostRequest; +import com.example.letscareer.schedule.domain.dto.request.UpdateScheduleProgressRequest; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.model.Status; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/com/example/letscareer/self_intro/controller/SelfIntroController.java b/src/main/java/com/example/letscareer/self_intro/controller/SelfIntroController.java index 07cf34c..61f20a4 100644 --- a/src/main/java/com/example/letscareer/self_intro/controller/SelfIntroController.java +++ b/src/main/java/com/example/letscareer/self_intro/controller/SelfIntroController.java @@ -6,7 +6,7 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.self_intro.dto.request.SaveSelfIntroRequest; +import com.example.letscareer.self_intro.domain.dto.request.SaveSelfIntroRequest; import com.example.letscareer.self_intro.service.SelfIntroService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/self_intro/dto/SelfIntroDTO.java b/src/main/java/com/example/letscareer/self_intro/domain/dto/SelfIntroDTO.java similarity index 65% rename from src/main/java/com/example/letscareer/self_intro/dto/SelfIntroDTO.java rename to src/main/java/com/example/letscareer/self_intro/domain/dto/SelfIntroDTO.java index 3b4dfef..13f538b 100644 --- a/src/main/java/com/example/letscareer/self_intro/dto/SelfIntroDTO.java +++ b/src/main/java/com/example/letscareer/self_intro/domain/dto/SelfIntroDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.self_intro.dto; +package com.example.letscareer.self_intro.domain.dto; public record SelfIntroDTO( String title, diff --git a/src/main/java/com/example/letscareer/self_intro/domain/dto/request/SaveSelfIntroRequest.java b/src/main/java/com/example/letscareer/self_intro/domain/dto/request/SaveSelfIntroRequest.java new file mode 100644 index 0000000..244b1ee --- /dev/null +++ b/src/main/java/com/example/letscareer/self_intro/domain/dto/request/SaveSelfIntroRequest.java @@ -0,0 +1,10 @@ +package com.example.letscareer.self_intro.domain.dto.request; + +import com.example.letscareer.self_intro.domain.dto.SelfIntroDTO; + +import java.util.List; + +public record SaveSelfIntroRequest( + List selfIntros +) { +} diff --git a/src/main/java/com/example/letscareer/self_intro/domain/SelfIntro.java b/src/main/java/com/example/letscareer/self_intro/domain/model/SelfIntro.java similarity index 76% rename from src/main/java/com/example/letscareer/self_intro/domain/SelfIntro.java rename to src/main/java/com/example/letscareer/self_intro/domain/model/SelfIntro.java index 2a8322c..a255220 100644 --- a/src/main/java/com/example/letscareer/self_intro/domain/SelfIntro.java +++ b/src/main/java/com/example/letscareer/self_intro/domain/model/SelfIntro.java @@ -1,7 +1,6 @@ -package com.example.letscareer.self_intro.domain; +package com.example.letscareer.self_intro.domain.model; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.user.domain.User; +import com.example.letscareer.stage.domain.model.Stage; import jakarta.persistence.*; import lombok.*; import org.antlr.v4.runtime.misc.NotNull; diff --git a/src/main/java/com/example/letscareer/self_intro/repository/SelfIntroRepository.java b/src/main/java/com/example/letscareer/self_intro/domain/repository/SelfIntroRepository.java similarity index 59% rename from src/main/java/com/example/letscareer/self_intro/repository/SelfIntroRepository.java rename to src/main/java/com/example/letscareer/self_intro/domain/repository/SelfIntroRepository.java index da4a200..2c7806a 100644 --- a/src/main/java/com/example/letscareer/self_intro/repository/SelfIntroRepository.java +++ b/src/main/java/com/example/letscareer/self_intro/domain/repository/SelfIntroRepository.java @@ -1,8 +1,7 @@ -package com.example.letscareer.self_intro.repository; +package com.example.letscareer.self_intro.domain.repository; -import com.example.letscareer.self_intro.domain.SelfIntro; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.user.domain.User; +import com.example.letscareer.self_intro.domain.model.SelfIntro; +import com.example.letscareer.stage.domain.model.Stage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/letscareer/self_intro/dto/request/SaveSelfIntroRequest.java b/src/main/java/com/example/letscareer/self_intro/dto/request/SaveSelfIntroRequest.java deleted file mode 100644 index 1272738..0000000 --- a/src/main/java/com/example/letscareer/self_intro/dto/request/SaveSelfIntroRequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.letscareer.self_intro.dto.request; - -import com.example.letscareer.self_intro.dto.SelfIntroDTO; - -import java.util.List; - -public record SaveSelfIntroRequest( - List selfIntros -) { -} diff --git a/src/main/java/com/example/letscareer/self_intro/service/SelfIntroService.java b/src/main/java/com/example/letscareer/self_intro/service/SelfIntroService.java index 033c6a0..2289168 100644 --- a/src/main/java/com/example/letscareer/self_intro/service/SelfIntroService.java +++ b/src/main/java/com/example/letscareer/self_intro/service/SelfIntroService.java @@ -1,16 +1,16 @@ package com.example.letscareer.self_intro.service; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.self_intro.domain.SelfIntro; -import com.example.letscareer.self_intro.dto.SelfIntroDTO; -import com.example.letscareer.self_intro.dto.request.SaveSelfIntroRequest; -import com.example.letscareer.self_intro.repository.SelfIntroRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.self_intro.domain.model.SelfIntro; +import com.example.letscareer.self_intro.domain.dto.SelfIntroDTO; +import com.example.letscareer.self_intro.domain.dto.request.SaveSelfIntroRequest; +import com.example.letscareer.self_intro.domain.repository.SelfIntroRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/stage/controller/StageController.java b/src/main/java/com/example/letscareer/stage/controller/StageController.java index 86c95a6..84691af 100644 --- a/src/main/java/com/example/letscareer/stage/controller/StageController.java +++ b/src/main/java/com/example/letscareer/stage/controller/StageController.java @@ -7,10 +7,9 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.common.exception.model.ValidationException; -import com.example.letscareer.stage.dto.request.AddStageRequest; -import com.example.letscareer.stage.dto.request.UpdateStageStatusRequest; -import com.example.letscareer.stage.dto.response.AddStageResponse; +import com.example.letscareer.stage.domain.dto.request.AddStageRequest; +import com.example.letscareer.stage.domain.dto.request.UpdateStageStatusRequest; +import com.example.letscareer.stage.domain.dto.response.AddStageResponse; import com.example.letscareer.stage.service.StageService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/stage/dto/AppealCareerDTO.java b/src/main/java/com/example/letscareer/stage/domain/dto/AppealCareerDTO.java similarity index 68% rename from src/main/java/com/example/letscareer/stage/dto/AppealCareerDTO.java rename to src/main/java/com/example/letscareer/stage/domain/dto/AppealCareerDTO.java index 4bbbf0d..16286b5 100644 --- a/src/main/java/com/example/letscareer/stage/dto/AppealCareerDTO.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/AppealCareerDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.dto; +package com.example.letscareer.stage.domain.dto; public record AppealCareerDTO( Long careerId, diff --git a/src/main/java/com/example/letscareer/stage/dto/IntReviewDTO.java b/src/main/java/com/example/letscareer/stage/domain/dto/IntReviewDTO.java similarity index 71% rename from src/main/java/com/example/letscareer/stage/dto/IntReviewDTO.java rename to src/main/java/com/example/letscareer/stage/domain/dto/IntReviewDTO.java index d29cd91..a4f9d4e 100644 --- a/src/main/java/com/example/letscareer/stage/dto/IntReviewDTO.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/IntReviewDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.dto; +package com.example.letscareer.stage.domain.dto; public record IntReviewDTO( Long reviewId, diff --git a/src/main/java/com/example/letscareer/stage/dto/MidReviewDTO.java b/src/main/java/com/example/letscareer/stage/domain/dto/MidReviewDTO.java similarity index 68% rename from src/main/java/com/example/letscareer/stage/dto/MidReviewDTO.java rename to src/main/java/com/example/letscareer/stage/domain/dto/MidReviewDTO.java index 330faf2..b769d35 100644 --- a/src/main/java/com/example/letscareer/stage/dto/MidReviewDTO.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/MidReviewDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.dto; +package com.example.letscareer.stage.domain.dto; public record MidReviewDTO( Long reviewId, diff --git a/src/main/java/com/example/letscareer/stage/dto/StageDTO.java b/src/main/java/com/example/letscareer/stage/domain/dto/StageDTO.java similarity index 78% rename from src/main/java/com/example/letscareer/stage/dto/StageDTO.java rename to src/main/java/com/example/letscareer/stage/domain/dto/StageDTO.java index 04513b2..f983b2c 100644 --- a/src/main/java/com/example/letscareer/stage/dto/StageDTO.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/StageDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.dto; +package com.example.letscareer.stage.domain.dto; public record StageDTO( diff --git a/src/main/java/com/example/letscareer/stage/dto/request/AddStageRequest.java b/src/main/java/com/example/letscareer/stage/domain/dto/request/AddStageRequest.java similarity index 68% rename from src/main/java/com/example/letscareer/stage/dto/request/AddStageRequest.java rename to src/main/java/com/example/letscareer/stage/domain/dto/request/AddStageRequest.java index 1928a05..77ac2d2 100644 --- a/src/main/java/com/example/letscareer/stage/dto/request/AddStageRequest.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/request/AddStageRequest.java @@ -1,6 +1,6 @@ -package com.example.letscareer.stage.dto.request; +package com.example.letscareer.stage.domain.dto.request; -import com.example.letscareer.stage.domain.Type; +import com.example.letscareer.stage.domain.model.Type; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/stage/dto/request/UpdateStageStatusRequest.java b/src/main/java/com/example/letscareer/stage/domain/dto/request/UpdateStageStatusRequest.java similarity index 61% rename from src/main/java/com/example/letscareer/stage/dto/request/UpdateStageStatusRequest.java rename to src/main/java/com/example/letscareer/stage/domain/dto/request/UpdateStageStatusRequest.java index ae722b2..cfb2c7b 100644 --- a/src/main/java/com/example/letscareer/stage/dto/request/UpdateStageStatusRequest.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/request/UpdateStageStatusRequest.java @@ -1,6 +1,6 @@ -package com.example.letscareer.stage.dto.request; +package com.example.letscareer.stage.domain.dto.request; -import com.example.letscareer.stage.domain.Status; +import com.example.letscareer.stage.domain.model.Status; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/src/main/java/com/example/letscareer/stage/dto/response/AddStageResponse.java b/src/main/java/com/example/letscareer/stage/domain/dto/response/AddStageResponse.java similarity index 77% rename from src/main/java/com/example/letscareer/stage/dto/response/AddStageResponse.java rename to src/main/java/com/example/letscareer/stage/domain/dto/response/AddStageResponse.java index 2ff7cff..5ce232d 100644 --- a/src/main/java/com/example/letscareer/stage/dto/response/AddStageResponse.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/response/AddStageResponse.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.dto.response; +package com.example.letscareer.stage.domain.dto.response; import java.time.LocalDate; diff --git a/src/main/java/com/example/letscareer/stage/dto/response/GetDocumentStageResponse.java b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetDocumentStageResponse.java similarity index 52% rename from src/main/java/com/example/letscareer/stage/dto/response/GetDocumentStageResponse.java rename to src/main/java/com/example/letscareer/stage/domain/dto/response/GetDocumentStageResponse.java index 95d25d8..c318bdd 100644 --- a/src/main/java/com/example/letscareer/stage/dto/response/GetDocumentStageResponse.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetDocumentStageResponse.java @@ -1,7 +1,7 @@ -package com.example.letscareer.stage.dto.response; +package com.example.letscareer.stage.domain.dto.response; -import com.example.letscareer.self_intro.dto.SelfIntroDTO; -import com.example.letscareer.stage.dto.AppealCareerDTO; +import com.example.letscareer.self_intro.domain.dto.SelfIntroDTO; +import com.example.letscareer.stage.domain.dto.AppealCareerDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/stage/domain/dto/response/GetInterviewStageResponse.java b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetInterviewStageResponse.java new file mode 100644 index 0000000..7cdc1da --- /dev/null +++ b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetInterviewStageResponse.java @@ -0,0 +1,13 @@ +package com.example.letscareer.stage.domain.dto.response; + +import com.example.letscareer.stage.domain.dto.AppealCareerDTO; +import com.example.letscareer.stage.domain.dto.IntReviewDTO; + +import java.util.List; + +public record GetInterviewStageResponse( + boolean reviewAvailable, + IntReviewDTO review, + List appealCareers +) { +} diff --git a/src/main/java/com/example/letscareer/stage/domain/dto/response/GetMidStageResponse.java b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetMidStageResponse.java new file mode 100644 index 0000000..fc295e3 --- /dev/null +++ b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetMidStageResponse.java @@ -0,0 +1,9 @@ +package com.example.letscareer.stage.domain.dto.response; + +import com.example.letscareer.stage.domain.dto.MidReviewDTO; + +public record GetMidStageResponse( + boolean reviewAvailable, + MidReviewDTO review +) { +} diff --git a/src/main/java/com/example/letscareer/stage/dto/response/GetStagesResponse.java b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetStagesResponse.java similarity index 67% rename from src/main/java/com/example/letscareer/stage/dto/response/GetStagesResponse.java rename to src/main/java/com/example/letscareer/stage/domain/dto/response/GetStagesResponse.java index 538d958..fd4b1c9 100644 --- a/src/main/java/com/example/letscareer/stage/dto/response/GetStagesResponse.java +++ b/src/main/java/com/example/letscareer/stage/domain/dto/response/GetStagesResponse.java @@ -1,6 +1,6 @@ -package com.example.letscareer.stage.dto.response; +package com.example.letscareer.stage.domain.dto.response; -import com.example.letscareer.stage.dto.StageDTO; +import com.example.letscareer.stage.domain.dto.StageDTO; import java.util.List; diff --git a/src/main/java/com/example/letscareer/stage/domain/Stage.java b/src/main/java/com/example/letscareer/stage/domain/model/Stage.java similarity index 81% rename from src/main/java/com/example/letscareer/stage/domain/Stage.java rename to src/main/java/com/example/letscareer/stage/domain/model/Stage.java index a3f9600..2cefbc0 100644 --- a/src/main/java/com/example/letscareer/stage/domain/Stage.java +++ b/src/main/java/com/example/letscareer/stage/domain/model/Stage.java @@ -1,9 +1,8 @@ -package com.example.letscareer.stage.domain; +package com.example.letscareer.stage.domain.model; -import com.example.letscareer.schedule.domain.Schedule; +import com.example.letscareer.schedule.domain.model.Schedule; import jakarta.persistence.*; import lombok.*; -import org.hibernate.annotations.Check; import java.time.LocalDate; diff --git a/src/main/java/com/example/letscareer/stage/domain/Status.java b/src/main/java/com/example/letscareer/stage/domain/model/Status.java similarity index 79% rename from src/main/java/com/example/letscareer/stage/domain/Status.java rename to src/main/java/com/example/letscareer/stage/domain/model/Status.java index 68f2565..37977ee 100644 --- a/src/main/java/com/example/letscareer/stage/domain/Status.java +++ b/src/main/java/com/example/letscareer/stage/domain/model/Status.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.domain; +package com.example.letscareer.stage.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/letscareer/stage/domain/Type.java b/src/main/java/com/example/letscareer/stage/domain/model/Type.java similarity index 78% rename from src/main/java/com/example/letscareer/stage/domain/Type.java rename to src/main/java/com/example/letscareer/stage/domain/model/Type.java index 5444eb0..a1ad27a 100644 --- a/src/main/java/com/example/letscareer/stage/domain/Type.java +++ b/src/main/java/com/example/letscareer/stage/domain/model/Type.java @@ -1,4 +1,4 @@ -package com.example.letscareer.stage.domain; +package com.example.letscareer.stage.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/letscareer/stage/repository/StageRepository.java b/src/main/java/com/example/letscareer/stage/domain/repository/StageRepository.java similarity index 83% rename from src/main/java/com/example/letscareer/stage/repository/StageRepository.java rename to src/main/java/com/example/letscareer/stage/domain/repository/StageRepository.java index eeb87f5..2f2d3ef 100644 --- a/src/main/java/com/example/letscareer/stage/repository/StageRepository.java +++ b/src/main/java/com/example/letscareer/stage/domain/repository/StageRepository.java @@ -1,9 +1,8 @@ -package com.example.letscareer.stage.repository; +package com.example.letscareer.stage.domain.repository; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.domain.Type; -import com.example.letscareer.user.domain.User; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.model.Type; import io.lettuce.core.dynamic.annotation.Param; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,7 +11,6 @@ import org.springframework.stereotype.Repository; import java.time.LocalDate; -import java.util.Date; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/letscareer/stage/dto/response/GetInterviewStageResponse.java b/src/main/java/com/example/letscareer/stage/dto/response/GetInterviewStageResponse.java deleted file mode 100644 index 5e0cdd4..0000000 --- a/src/main/java/com/example/letscareer/stage/dto/response/GetInterviewStageResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.letscareer.stage.dto.response; - -import com.example.letscareer.stage.dto.AppealCareerDTO; -import com.example.letscareer.stage.dto.IntReviewDTO; - -import java.util.List; - -public record GetInterviewStageResponse( - boolean reviewAvailable, - IntReviewDTO review, - List appealCareers -) { -} diff --git a/src/main/java/com/example/letscareer/stage/dto/response/GetMidStageResponse.java b/src/main/java/com/example/letscareer/stage/dto/response/GetMidStageResponse.java deleted file mode 100644 index 837dd78..0000000 --- a/src/main/java/com/example/letscareer/stage/dto/response/GetMidStageResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.letscareer.stage.dto.response; - -import com.example.letscareer.stage.dto.MidReviewDTO; - -public record GetMidStageResponse( - boolean reviewAvailable, - MidReviewDTO review -) { -} diff --git a/src/main/java/com/example/letscareer/stage/service/StageService.java b/src/main/java/com/example/letscareer/stage/service/StageService.java index 0cfb0cc..75c0302 100644 --- a/src/main/java/com/example/letscareer/stage/service/StageService.java +++ b/src/main/java/com/example/letscareer/stage/service/StageService.java @@ -1,30 +1,29 @@ package com.example.letscareer.stage.service; -import com.example.letscareer.appealCareer.domain.AppealCareer; -import com.example.letscareer.appealCareer.repository.AppealCareerRepository; +import com.example.letscareer.appealCareer.domain.repository.AppealCareerRepository; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.int_review.domain.IntReview; -import com.example.letscareer.int_review.repository.IntReviewRepository; -import com.example.letscareer.mid_review.domain.MidReview; -import com.example.letscareer.mid_review.repository.MidReviewRepository; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.schedule.repository.ScheduleRepository; -import com.example.letscareer.self_intro.domain.SelfIntro; -import com.example.letscareer.self_intro.dto.SelfIntroDTO; -import com.example.letscareer.self_intro.repository.SelfIntroRepository; -import com.example.letscareer.stage.domain.Stage; -import com.example.letscareer.stage.domain.Status; -import com.example.letscareer.stage.domain.Type; -import com.example.letscareer.stage.dto.AppealCareerDTO; -import com.example.letscareer.stage.dto.IntReviewDTO; -import com.example.letscareer.stage.dto.MidReviewDTO; -import com.example.letscareer.stage.dto.StageDTO; -import com.example.letscareer.stage.dto.request.AddStageRequest; -import com.example.letscareer.stage.dto.request.UpdateStageStatusRequest; -import com.example.letscareer.stage.dto.response.*; -import com.example.letscareer.stage.repository.StageRepository; +import com.example.letscareer.int_review.domain.model.IntReview; +import com.example.letscareer.int_review.domain.repository.IntReviewRepository; +import com.example.letscareer.mid_review.domain.model.MidReview; +import com.example.letscareer.mid_review.domain.repository.MidReviewRepository; +import com.example.letscareer.schedule.domain.model.Schedule; +import com.example.letscareer.schedule.domain.repository.ScheduleRepository; +import com.example.letscareer.self_intro.domain.model.SelfIntro; +import com.example.letscareer.self_intro.domain.dto.SelfIntroDTO; +import com.example.letscareer.self_intro.domain.repository.SelfIntroRepository; +import com.example.letscareer.stage.domain.model.Stage; +import com.example.letscareer.stage.domain.model.Status; +import com.example.letscareer.stage.domain.model.Type; +import com.example.letscareer.stage.domain.dto.AppealCareerDTO; +import com.example.letscareer.stage.domain.dto.IntReviewDTO; +import com.example.letscareer.stage.domain.dto.MidReviewDTO; +import com.example.letscareer.stage.domain.dto.StageDTO; +import com.example.letscareer.stage.domain.dto.request.AddStageRequest; +import com.example.letscareer.stage.domain.dto.request.UpdateStageStatusRequest; +import com.example.letscareer.stage.domain.dto.response.*; +import com.example.letscareer.stage.domain.repository.StageRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/letscareer/todo/controller/TodoController.java b/src/main/java/com/example/letscareer/todo/controller/TodoController.java index b97f404..f4e6511 100644 --- a/src/main/java/com/example/letscareer/todo/controller/TodoController.java +++ b/src/main/java/com/example/letscareer/todo/controller/TodoController.java @@ -7,8 +7,8 @@ import com.example.letscareer.common.exception.enums.SuccessCode; import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.todo.dto.request.TodoRequest; -import com.example.letscareer.todo.dto.response.TodoResponse; +import com.example.letscareer.todo.domain.dto.request.TodoRequest; +import com.example.letscareer.todo.domain.dto.response.TodoResponse; import com.example.letscareer.todo.service.TodoService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/letscareer/todo/dto/TodoDTO.java b/src/main/java/com/example/letscareer/todo/domain/dto/TodoDTO.java similarity index 61% rename from src/main/java/com/example/letscareer/todo/dto/TodoDTO.java rename to src/main/java/com/example/letscareer/todo/domain/dto/TodoDTO.java index 79c941c..28163b1 100644 --- a/src/main/java/com/example/letscareer/todo/dto/TodoDTO.java +++ b/src/main/java/com/example/letscareer/todo/domain/dto/TodoDTO.java @@ -1,4 +1,4 @@ -package com.example.letscareer.todo.dto; +package com.example.letscareer.todo.domain.dto; public record TodoDTO( String todo, diff --git a/src/main/java/com/example/letscareer/todo/domain/dto/request/TodoRequest.java b/src/main/java/com/example/letscareer/todo/domain/dto/request/TodoRequest.java new file mode 100644 index 0000000..2505616 --- /dev/null +++ b/src/main/java/com/example/letscareer/todo/domain/dto/request/TodoRequest.java @@ -0,0 +1,6 @@ +package com.example.letscareer.todo.domain.dto.request; + +public record TodoRequest( + String todo +) { +} diff --git a/src/main/java/com/example/letscareer/todo/domain/dto/response/TodoResponse.java b/src/main/java/com/example/letscareer/todo/domain/dto/response/TodoResponse.java new file mode 100644 index 0000000..b1dbae0 --- /dev/null +++ b/src/main/java/com/example/letscareer/todo/domain/dto/response/TodoResponse.java @@ -0,0 +1,10 @@ +package com.example.letscareer.todo.domain.dto.response; + +import com.example.letscareer.todo.domain.dto.TodoDTO; + +import java.util.List; + +public record TodoResponse( + List todos +) { +} diff --git a/src/main/java/com/example/letscareer/todo/domain/Todo.java b/src/main/java/com/example/letscareer/todo/domain/model/Todo.java similarity index 91% rename from src/main/java/com/example/letscareer/todo/domain/Todo.java rename to src/main/java/com/example/letscareer/todo/domain/model/Todo.java index 6dcfb76..078d484 100644 --- a/src/main/java/com/example/letscareer/todo/domain/Todo.java +++ b/src/main/java/com/example/letscareer/todo/domain/model/Todo.java @@ -1,4 +1,4 @@ -package com.example.letscareer.todo.domain; +package com.example.letscareer.todo.domain.model; import com.example.letscareer.user.domain.User; import jakarta.persistence.*; diff --git a/src/main/java/com/example/letscareer/todo/repository/TodoRepository.java b/src/main/java/com/example/letscareer/todo/domain/repository/TodoRepository.java similarity index 74% rename from src/main/java/com/example/letscareer/todo/repository/TodoRepository.java rename to src/main/java/com/example/letscareer/todo/domain/repository/TodoRepository.java index 22d1e1e..8813a3f 100644 --- a/src/main/java/com/example/letscareer/todo/repository/TodoRepository.java +++ b/src/main/java/com/example/letscareer/todo/domain/repository/TodoRepository.java @@ -1,7 +1,6 @@ -package com.example.letscareer.todo.repository; +package com.example.letscareer.todo.domain.repository; -import com.example.letscareer.schedule.domain.Schedule; -import com.example.letscareer.todo.domain.Todo; +import com.example.letscareer.todo.domain.model.Todo; import com.example.letscareer.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/letscareer/todo/dto/request/TodoRequest.java b/src/main/java/com/example/letscareer/todo/dto/request/TodoRequest.java deleted file mode 100644 index c1339bb..0000000 --- a/src/main/java/com/example/letscareer/todo/dto/request/TodoRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.letscareer.todo.dto.request; - -public record TodoRequest( - String todo -) { -} diff --git a/src/main/java/com/example/letscareer/todo/dto/response/TodoResponse.java b/src/main/java/com/example/letscareer/todo/dto/response/TodoResponse.java deleted file mode 100644 index feb78ee..0000000 --- a/src/main/java/com/example/letscareer/todo/dto/response/TodoResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.letscareer.todo.dto.response; - -import com.example.letscareer.todo.dto.TodoDTO; - -import java.util.List; - -public record TodoResponse( - List todos -) { -} diff --git a/src/main/java/com/example/letscareer/todo/service/TodoService.java b/src/main/java/com/example/letscareer/todo/service/TodoService.java index 5aca349..9669555 100644 --- a/src/main/java/com/example/letscareer/todo/service/TodoService.java +++ b/src/main/java/com/example/letscareer/todo/service/TodoService.java @@ -2,20 +2,19 @@ import com.example.letscareer.common.exception.model.BadRequestException; import com.example.letscareer.common.exception.model.NotFoundException; -import com.example.letscareer.todo.domain.Todo; -import com.example.letscareer.todo.dto.TodoDTO; -import com.example.letscareer.todo.dto.request.TodoRequest; -import com.example.letscareer.todo.dto.response.TodoResponse; -import com.example.letscareer.todo.repository.TodoRepository; +import com.example.letscareer.todo.domain.model.Todo; +import com.example.letscareer.todo.domain.dto.TodoDTO; +import com.example.letscareer.todo.domain.dto.request.TodoRequest; +import com.example.letscareer.todo.domain.dto.response.TodoResponse; +import com.example.letscareer.todo.domain.repository.TodoRepository; import com.example.letscareer.user.domain.User; -import com.example.letscareer.user.repository.UserRepository; +import com.example.letscareer.user.domain.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; -import java.util.OptionalInt; import java.util.stream.Collectors; import static com.example.letscareer.common.exception.enums.ErrorCode.*; diff --git a/src/main/java/com/example/letscareer/user/repository/UserRepository.java b/src/main/java/com/example/letscareer/user/domain/repository/UserRepository.java similarity index 85% rename from src/main/java/com/example/letscareer/user/repository/UserRepository.java rename to src/main/java/com/example/letscareer/user/domain/repository/UserRepository.java index 0c34c6f..09acbf7 100644 --- a/src/main/java/com/example/letscareer/user/repository/UserRepository.java +++ b/src/main/java/com/example/letscareer/user/domain/repository/UserRepository.java @@ -1,4 +1,4 @@ -package com.example.letscareer.user.repository; +package com.example.letscareer.user.domain.repository; import com.example.letscareer.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; From ed5f6ca3cfdec1f0ff36285f2f44e543a58d99c8 Mon Sep 17 00:00:00 2001 From: pkl0912 Date: Wed, 4 Sep 2024 18:57:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#64=20[refactor]=20import=20=EB=AC=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/letscareer/schedule/service/ScheduleService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java index 7aad329..2998ef1 100644 --- a/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java +++ b/src/main/java/com/example/letscareer/schedule/service/ScheduleService.java @@ -7,7 +7,6 @@ import com.example.letscareer.schedule.domain.model.Schedule; import com.example.letscareer.schedule.domain.dto.*; import com.example.letscareer.schedule.domain.dto.response.*; -import com.example.letscareer.schedule.dto.*; import com.example.letscareer.schedule.domain.dto.request.SchedulePostRequest; import com.example.letscareer.schedule.domain.dto.request.UpdateScheduleProgressRequest; import com.example.letscareer.schedule.domain.repository.ScheduleRepository;