From 82aa9dffa6a329df54c0a11bf301cd995d7dd8d0 Mon Sep 17 00:00:00 2001 From: Jieun Kim <83564946+iamjieunkim@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:40:45 +0900 Subject: [PATCH] =?UTF-8?q?refactor:lesson=ED=8C=A8=ED=82=A4=EC=A7=80?= =?UTF-8?q?=EB=AA=85=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/comment/entity/Comment.java | 2 +- .../comment/service/CommentService.java | 4 +- .../controller/StudentLessonController.java | 2 +- .../dto/LessonApplicationResponseDto.java | 2 +- .../student/dto/LessonDetailResponseDto.java | 4 +- .../student/dto/LessonSearchResponseDto.java | 4 +- .../dto/MyLessonApplicationResponseDto.java | 2 +- .../mapper/LessonApplicationMapper.java | 2 +- .../student/mapper/LessonApplyMapper.java | 2 +- .../student/mapper/LessonSearchMapper.java | 2 +- .../student/mapper/LessonSimpleMapper.java | 2 +- .../student/service/StudentLessonService.java | 26 ++++++------ .../controller/AdminLessonController.java | 32 +++++++-------- .../controller/LocationCsvController.java | 4 +- .../dto/ApplicationActionRequestDto.java | 4 +- .../dto/ApplicationProcessResponseDto.java | 4 +- .../dto/CreatedLessonDto.java | 4 +- .../dto/CreatedLessonListResponseDto.java | 2 +- .../dto/CreatedLessonListWrapperDto.java | 2 +- .../dto/LessonApplicationListResponseDto.java | 2 +- .../dto/LessonApplicationListWrapperDto.java | 2 +- .../dto/LessonApplicationResponseDto.java | 4 +- .../dto/LessonCreateRequestDto.java | 4 +- .../dto/LessonResponseDto.java | 6 +-- .../dto/ParticipantDto.java | 2 +- .../dto/ParticipantListResponseDto.java | 2 +- .../dto/ParticipantListWrapperDto.java | 2 +- .../entity/ApplicationAction.java | 2 +- .../entity/ApplicationStatus.java | 2 +- .../{admin => teacher}/entity/Category.java | 2 +- .../{admin => teacher}/entity/Lesson.java | 2 +- .../entity/LessonApplication.java | 2 +- .../entity/LessonImage.java | 2 +- .../entity/LessonParticipant.java | 2 +- .../entity/LessonStatus.java | 2 +- .../{admin => teacher}/entity/Location.java | 2 +- .../mapper/CreatedLessonMapper.java | 10 ++--- .../mapper/LessonApplicationMapper.java | 10 ++--- .../mapper/LessonMapper.java | 10 ++--- .../mapper/LessonParticipantMapper.java | 10 ++--- .../LessonApplicationRepository.java | 8 ++-- .../repository/LessonImageRepository.java | 6 +-- .../LessonParticipantRepository.java | 4 +- .../repository/LessonRepository.java | 8 ++-- .../repository/LocationRepository.java | 4 +- .../service/AdminLessonService.java | 40 +++++++++---------- .../service/LocationCsvService.java | 8 ++-- .../domain/payment/entity/Payment.java | 2 +- .../payment/service/PaymentService.java | 5 +-- .../profile/controller/ProfileController.java | 2 +- .../profile/dto/ProfileCreatedLessonDto.java | 2 +- .../profile/mapper/ProfileLessonMapper.java | 2 +- .../profile/service/ProfileLessonService.java | 6 +-- .../ranking/controller/RankingController.java | 2 +- .../ranking/dto/RankingResponseDto.java | 2 +- .../ranking/repository/RankingRepository.java | 2 +- .../ranking/service/RankingService.java | 2 +- .../trainus/domain/review/entity/Review.java | 2 +- .../domain/review/service/ReviewService.java | 6 +-- .../global/config/MockDataInitializer.java | 6 +-- .../controller/CommentControllerTest.java | 6 +-- .../controller/ReviewControllerTest.java | 10 ++--- 62 files changed, 161 insertions(+), 162 deletions(-) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/controller/AdminLessonController.java (82%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/controller/LocationCsvController.java (91%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/ApplicationActionRequestDto.java (67%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/ApplicationProcessResponseDto.java (68%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/CreatedLessonDto.java (73%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/CreatedLessonListResponseDto.java (77%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/CreatedLessonListWrapperDto.java (65%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/LessonApplicationListResponseDto.java (81%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/LessonApplicationListWrapperDto.java (70%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/LessonApplicationResponseDto.java (72%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/LessonCreateRequestDto.java (94%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/LessonResponseDto.java (71%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/ParticipantDto.java (82%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/ParticipantListResponseDto.java (78%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/dto/ParticipantListWrapperDto.java (65%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/ApplicationAction.java (69%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/ApplicationStatus.java (66%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/Category.java (88%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/Lesson.java (98%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/LessonApplication.java (96%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/LessonImage.java (94%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/LessonParticipant.java (95%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/LessonStatus.java (87%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/entity/Location.java (92%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/mapper/CreatedLessonMapper.java (77%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/mapper/LessonApplicationMapper.java (79%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/mapper/LessonMapper.java (89%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/mapper/LessonParticipantMapper.java (79%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/repository/LessonApplicationRepository.java (77%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/repository/LessonImageRepository.java (57%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/repository/LessonParticipantRepository.java (61%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/repository/LessonRepository.java (89%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/repository/LocationRepository.java (71%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/service/AdminLessonService.java (87%) rename src/main/java/com/threestar/trainus/domain/lesson/{admin => teacher}/service/LocationCsvService.java (85%) diff --git a/src/main/java/com/threestar/trainus/domain/comment/entity/Comment.java b/src/main/java/com/threestar/trainus/domain/comment/entity/Comment.java index a02aced..cc99587 100644 --- a/src/main/java/com/threestar/trainus/domain/comment/entity/Comment.java +++ b/src/main/java/com/threestar/trainus/domain/comment/entity/Comment.java @@ -1,6 +1,6 @@ package com.threestar.trainus.domain.comment.entity; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.global.entity.BaseDateEntity; diff --git a/src/main/java/com/threestar/trainus/domain/comment/service/CommentService.java b/src/main/java/com/threestar/trainus/domain/comment/service/CommentService.java index 48cf9ba..2eb49b5 100644 --- a/src/main/java/com/threestar/trainus/domain/comment/service/CommentService.java +++ b/src/main/java/com/threestar/trainus/domain/comment/service/CommentService.java @@ -11,8 +11,8 @@ import com.threestar.trainus.domain.comment.entity.Comment; import com.threestar.trainus.domain.comment.mapper.CommentMapper; import com.threestar.trainus.domain.comment.repository.CommentRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.domain.user.service.UserService; import com.threestar.trainus.global.utils.PageLimitCalculator; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/controller/StudentLessonController.java b/src/main/java/com/threestar/trainus/domain/lesson/student/controller/StudentLessonController.java index 85e39db..d81e5c0 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/controller/StudentLessonController.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/controller/StudentLessonController.java @@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.threestar.trainus.domain.lesson.admin.entity.Category; import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto; import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto; import com.threestar.trainus.domain.lesson.student.dto.LessonSearchListResponseDto; @@ -20,6 +19,7 @@ import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListResponseDto; import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListWrapperDto; import com.threestar.trainus.domain.lesson.student.service.StudentLessonService; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import com.threestar.trainus.global.annotation.LoginUser; import com.threestar.trainus.global.dto.PageRequestDto; import com.threestar.trainus.global.exception.domain.ErrorCode; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonApplicationResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonApplicationResponseDto.java index 194e4c7..31b45b0 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonApplicationResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonApplicationResponseDto.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonDetailResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonDetailResponseDto.java index 929e45f..d4ee043 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonDetailResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonDetailResponseDto.java @@ -3,8 +3,8 @@ import java.time.LocalDateTime; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonSearchResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonSearchResponseDto.java index 52d688d..d0b15d1 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonSearchResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonSearchResponseDto.java @@ -3,8 +3,8 @@ import java.time.LocalDateTime; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; public record LessonSearchResponseDto( long id, diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/MyLessonApplicationResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/MyLessonApplicationResponseDto.java index 5b6cdb9..07fe26f 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/dto/MyLessonApplicationResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/dto/MyLessonApplicationResponseDto.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplicationMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplicationMapper.java index 8c6482c..9b80f9e 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplicationMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplicationMapper.java @@ -2,10 +2,10 @@ import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; import com.threestar.trainus.domain.lesson.student.dto.LessonSummaryResponseDto; import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListResponseDto; import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplyMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplyMapper.java index 8074b94..4ab5852 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplyMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonApplyMapper.java @@ -2,8 +2,8 @@ import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSearchMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSearchMapper.java index 4c693aa..ed56f87 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSearchMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSearchMapper.java @@ -2,8 +2,8 @@ import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; import com.threestar.trainus.domain.lesson.student.dto.LessonSearchResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import com.threestar.trainus.domain.metadata.dto.ProfileMetadataResponseDto; import com.threestar.trainus.domain.profile.entity.Profile; import com.threestar.trainus.domain.user.entity.User; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSimpleMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSimpleMapper.java index 5fd85d8..9d4732a 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSimpleMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/mapper/LessonSimpleMapper.java @@ -1,7 +1,7 @@ package com.threestar.trainus.domain.lesson.student.mapper; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; import com.threestar.trainus.domain.lesson.student.dto.LessonSimpleResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/student/service/StudentLessonService.java b/src/main/java/com/threestar/trainus/domain/lesson/student/service/StudentLessonService.java index 3ea609b..75adf10 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/student/service/StudentLessonService.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/student/service/StudentLessonService.java @@ -7,19 +7,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; -import com.threestar.trainus.domain.lesson.admin.entity.LessonImage; -import com.threestar.trainus.domain.lesson.admin.entity.LessonParticipant; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonMapper; -import com.threestar.trainus.domain.lesson.admin.repository.LessonApplicationRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonImageRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonParticipantRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; -import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService; import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto; import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto; import com.threestar.trainus.domain.lesson.student.dto.LessonSearchListResponseDto; @@ -30,6 +17,19 @@ import com.threestar.trainus.domain.lesson.student.mapper.LessonApplyMapper; import com.threestar.trainus.domain.lesson.student.mapper.LessonSearchMapper; import com.threestar.trainus.domain.lesson.student.mapper.LessonSimpleMapper; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonImage; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonParticipant; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonMapper; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonApplicationRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonImageRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonParticipantRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService; import com.threestar.trainus.domain.metadata.dto.ProfileMetadataResponseDto; import com.threestar.trainus.domain.metadata.service.ProfileMetadataService; import com.threestar.trainus.domain.profile.entity.Profile; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/controller/AdminLessonController.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/AdminLessonController.java similarity index 82% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/controller/AdminLessonController.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/AdminLessonController.java index cac3fff..adba36e 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/controller/AdminLessonController.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/AdminLessonController.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.controller; +package com.threestar.trainus.domain.lesson.teacher.controller; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.threestar.trainus.domain.lesson.admin.dto.ApplicationActionRequestDto; -import com.threestar.trainus.domain.lesson.admin.dto.ApplicationProcessResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonCreateRequestDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationAction; -import com.threestar.trainus.domain.lesson.admin.mapper.CreatedLessonMapper; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonApplicationMapper; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonParticipantMapper; -import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService; +import com.threestar.trainus.domain.lesson.teacher.dto.ApplicationActionRequestDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ApplicationProcessResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonCreateRequestDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationAction; +import com.threestar.trainus.domain.lesson.teacher.mapper.CreatedLessonMapper; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonApplicationMapper; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonParticipantMapper; +import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService; import com.threestar.trainus.global.annotation.LoginUser; import com.threestar.trainus.global.dto.PageRequestDto; import com.threestar.trainus.global.exception.domain.ErrorCode; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/controller/LocationCsvController.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/LocationCsvController.java similarity index 91% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/controller/LocationCsvController.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/LocationCsvController.java index 47a7496..a8332f9 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/controller/LocationCsvController.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/LocationCsvController.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.controller; +package com.threestar.trainus.domain.lesson.teacher.controller; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.threestar.trainus.domain.lesson.admin.service.LocationCsvService; +import com.threestar.trainus.domain.lesson.teacher.service.LocationCsvService; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationActionRequestDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationActionRequestDto.java similarity index 67% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationActionRequestDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationActionRequestDto.java index 19c2b6d..160dcfc 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationActionRequestDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationActionRequestDto.java @@ -1,6 +1,6 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationAction; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationAction; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationProcessResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationProcessResponseDto.java similarity index 68% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationProcessResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationProcessResponseDto.java index d3b2886..3bdfc43 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ApplicationProcessResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ApplicationProcessResponseDto.java @@ -1,8 +1,8 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonDto.java similarity index 73% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonDto.java index 47678ba..1ba0695 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonDto.java @@ -1,8 +1,8 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListResponseDto.java similarity index 77% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListResponseDto.java index f079335..a592fbe 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListResponseDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.util.List; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListWrapperDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListWrapperDto.java similarity index 65% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListWrapperDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListWrapperDto.java index 5084245..a25c338 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/CreatedLessonListWrapperDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/CreatedLessonListWrapperDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.util.List; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListResponseDto.java similarity index 81% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListResponseDto.java index 434dba0..758e365 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListResponseDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListWrapperDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListWrapperDto.java similarity index 70% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListWrapperDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListWrapperDto.java index 47eacd7..389ffd3 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationListWrapperDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationListWrapperDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.util.List; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationResponseDto.java similarity index 72% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationResponseDto.java index 0929982..b625875 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonApplicationResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonApplicationResponseDto.java @@ -1,8 +1,8 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; import com.threestar.trainus.domain.profile.dto.ProfileResponseDto; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonCreateRequestDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonCreateRequestDto.java similarity index 94% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonCreateRequestDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonCreateRequestDto.java index 1b6fb08..f2aa805 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonCreateRequestDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonCreateRequestDto.java @@ -1,9 +1,9 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonResponseDto.java similarity index 71% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonResponseDto.java index 8a30795..ab64a88 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/LessonResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/LessonResponseDto.java @@ -1,10 +1,10 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantDto.java similarity index 82% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantDto.java index 21f3062..e9eff99 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.time.LocalDateTime; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListResponseDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListResponseDto.java similarity index 78% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListResponseDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListResponseDto.java index ff09652..eb5d456 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListResponseDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.util.List; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListWrapperDto.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListWrapperDto.java similarity index 65% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListWrapperDto.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListWrapperDto.java index 9ab0a8a..e962bf3 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/dto/ParticipantListWrapperDto.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/dto/ParticipantListWrapperDto.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.dto; +package com.threestar.trainus.domain.lesson.teacher.dto; import java.util.List; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationAction.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationAction.java similarity index 69% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationAction.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationAction.java index 16035b3..827f240 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationAction.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationAction.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; /** * 강사가 레슨 신청에 대해 승인, 거절을 선택할 수 있음 diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationStatus.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationStatus.java similarity index 66% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationStatus.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationStatus.java index f3f53d0..fcebb30 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/ApplicationStatus.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/ApplicationStatus.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; /** * 레슨 신청 상태를 나타내는 enum diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Category.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Category.java similarity index 88% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Category.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Category.java index a407b22..7189237 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Category.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Category.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; public enum Category { GYM, diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Lesson.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Lesson.java similarity index 98% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Lesson.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Lesson.java index 26470eb..a83e782 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Lesson.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Lesson.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; import java.time.LocalDateTime; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonApplication.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonApplication.java similarity index 96% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonApplication.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonApplication.java index 30dbfd5..857d83d 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonApplication.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonApplication.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.global.entity.BaseDateEntity; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonImage.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonImage.java similarity index 94% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonImage.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonImage.java index 93b55c2..ba02a39 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonImage.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonImage.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonParticipant.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonParticipant.java similarity index 95% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonParticipant.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonParticipant.java index 10dd66b..82d516a 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonParticipant.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonParticipant.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; import java.time.LocalDateTime; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonStatus.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonStatus.java similarity index 87% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonStatus.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonStatus.java index 5f35f46..891cb24 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/LessonStatus.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/LessonStatus.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; /** * 레슨 진행 상태를 나태내는 enum diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Location.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Location.java similarity index 92% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Location.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Location.java index 453e145..6efe7b9 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/entity/Location.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Location.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.entity; +package com.threestar.trainus.domain.lesson.teacher.entity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/CreatedLessonMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/CreatedLessonMapper.java similarity index 77% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/CreatedLessonMapper.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/CreatedLessonMapper.java index 5544f67..c11b996 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/CreatedLessonMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/CreatedLessonMapper.java @@ -1,11 +1,11 @@ -package com.threestar.trainus.domain.lesson.admin.mapper; +package com.threestar.trainus.domain.lesson.teacher.mapper; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonDto; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonDto; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; public class CreatedLessonMapper { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonApplicationMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonApplicationMapper.java similarity index 79% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonApplicationMapper.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonApplicationMapper.java index dae602e..0012bc4 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonApplicationMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonApplicationMapper.java @@ -1,11 +1,11 @@ -package com.threestar.trainus.domain.lesson.admin.mapper; +package com.threestar.trainus.domain.lesson.teacher.mapper; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationResponseDto; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; import com.threestar.trainus.domain.profile.dto.ProfileResponseDto; public class LessonApplicationMapper { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonMapper.java similarity index 89% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonMapper.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonMapper.java index 5169135..abbe2c6 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonMapper.java @@ -1,12 +1,12 @@ -package com.threestar.trainus.domain.lesson.admin.mapper; +package com.threestar.trainus.domain.lesson.teacher.mapper; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.dto.LessonCreateRequestDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonResponseDto; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonImage; import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonCreateRequestDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonImage; import com.threestar.trainus.domain.profile.entity.Profile; import com.threestar.trainus.domain.user.entity.User; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonParticipantMapper.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonParticipantMapper.java similarity index 79% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonParticipantMapper.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonParticipantMapper.java index 617d7db..9a1967f 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/mapper/LessonParticipantMapper.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/mapper/LessonParticipantMapper.java @@ -1,11 +1,11 @@ -package com.threestar.trainus.domain.lesson.admin.mapper; +package com.threestar.trainus.domain.lesson.teacher.mapper; import java.util.List; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantDto; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListWrapperDto; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListWrapperDto; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; import com.threestar.trainus.domain.profile.dto.ProfileResponseDto; public class LessonParticipantMapper { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonApplicationRepository.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonApplicationRepository.java similarity index 77% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonApplicationRepository.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonApplicationRepository.java index 213ec4e..ac398c6 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonApplicationRepository.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonApplicationRepository.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.repository; +package com.threestar.trainus.domain.lesson.teacher.repository; import java.util.Optional; @@ -6,9 +6,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; public interface LessonApplicationRepository extends JpaRepository { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonImageRepository.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonImageRepository.java similarity index 57% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonImageRepository.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonImageRepository.java index 4719b57..98f3524 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonImageRepository.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonImageRepository.java @@ -1,11 +1,11 @@ -package com.threestar.trainus.domain.lesson.admin.repository; +package com.threestar.trainus.domain.lesson.teacher.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonImage; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonImage; public interface LessonImageRepository extends JpaRepository { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonParticipantRepository.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonParticipantRepository.java similarity index 61% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonParticipantRepository.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonParticipantRepository.java index af2ed45..2509d78 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonParticipantRepository.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonParticipantRepository.java @@ -1,8 +1,8 @@ -package com.threestar.trainus.domain.lesson.admin.repository; +package com.threestar.trainus.domain.lesson.teacher.repository; import org.springframework.data.repository.CrudRepository; -import com.threestar.trainus.domain.lesson.admin.entity.LessonParticipant; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonParticipant; public interface LessonParticipantRepository extends CrudRepository { diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonRepository.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonRepository.java similarity index 89% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonRepository.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonRepository.java index d92bca6..340b943 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonRepository.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LessonRepository.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.repository; +package com.threestar.trainus.domain.lesson.teacher.repository; import java.time.LocalDateTime; import java.util.Optional; @@ -9,9 +9,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; public interface LessonRepository extends JpaRepository { //삭제되지 않은 레슨만 조회 diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LocationRepository.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LocationRepository.java similarity index 71% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LocationRepository.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LocationRepository.java index f8387bf..1d8329c 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LocationRepository.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LocationRepository.java @@ -1,8 +1,8 @@ -package com.threestar.trainus.domain.lesson.admin.repository; +package com.threestar.trainus.domain.lesson.teacher.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Location; +import com.threestar.trainus.domain.lesson.teacher.entity.Location; public interface LocationRepository extends JpaRepository { boolean existsByCityAndDistrictAndDongAndRi(String city, String district, String dong, String ri); diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/service/AdminLessonService.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/service/AdminLessonService.java similarity index 87% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/service/AdminLessonService.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/service/AdminLessonService.java index 5bc16e6..609e703 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/service/AdminLessonService.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/service/AdminLessonService.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.service; +package com.threestar.trainus.domain.lesson.teacher.service; import java.time.LocalDateTime; import java.util.List; @@ -10,25 +10,25 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.threestar.trainus.domain.lesson.admin.dto.ApplicationProcessResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonCreateRequestDto; -import com.threestar.trainus.domain.lesson.admin.dto.LessonResponseDto; -import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListResponseDto; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationAction; -import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication; -import com.threestar.trainus.domain.lesson.admin.entity.LessonImage; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; -import com.threestar.trainus.domain.lesson.admin.mapper.CreatedLessonMapper; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonApplicationMapper; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonMapper; -import com.threestar.trainus.domain.lesson.admin.mapper.LessonParticipantMapper; -import com.threestar.trainus.domain.lesson.admin.repository.LessonApplicationRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonImageRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.dto.ApplicationProcessResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonCreateRequestDto; +import com.threestar.trainus.domain.lesson.teacher.dto.LessonResponseDto; +import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListResponseDto; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationAction; +import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonImage; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.mapper.CreatedLessonMapper; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonApplicationMapper; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonMapper; +import com.threestar.trainus.domain.lesson.teacher.mapper.LessonParticipantMapper; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonApplicationRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonImageRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.domain.user.repository.UserRepository; import com.threestar.trainus.domain.user.service.UserService; diff --git a/src/main/java/com/threestar/trainus/domain/lesson/admin/service/LocationCsvService.java b/src/main/java/com/threestar/trainus/domain/lesson/teacher/service/LocationCsvService.java similarity index 85% rename from src/main/java/com/threestar/trainus/domain/lesson/admin/service/LocationCsvService.java rename to src/main/java/com/threestar/trainus/domain/lesson/teacher/service/LocationCsvService.java index 19b16e8..76496b6 100644 --- a/src/main/java/com/threestar/trainus/domain/lesson/admin/service/LocationCsvService.java +++ b/src/main/java/com/threestar/trainus/domain/lesson/teacher/service/LocationCsvService.java @@ -1,4 +1,4 @@ -package com.threestar.trainus.domain.lesson.admin.service; +package com.threestar.trainus.domain.lesson.teacher.service; import static com.threestar.trainus.global.exception.domain.ErrorCode.*; @@ -15,8 +15,8 @@ import com.opencsv.CSVReader; import com.opencsv.CSVReaderBuilder; import com.opencsv.exceptions.CsvException; -import com.threestar.trainus.domain.lesson.admin.entity.Location; -import com.threestar.trainus.domain.lesson.admin.repository.LocationRepository; +import com.threestar.trainus.domain.lesson.teacher.entity.Location; +import com.threestar.trainus.domain.lesson.teacher.repository.LocationRepository; import com.threestar.trainus.global.exception.handler.BusinessException; import lombok.RequiredArgsConstructor; @@ -31,7 +31,7 @@ public void processCsv(MultipartFile file) { List locations = new ArrayList<>(); try (Reader reader = new BufferedReader(new InputStreamReader(file.getInputStream())); - CSVReader csvReader = new CSVReaderBuilder(reader).withSkipLines(1).build()) { + CSVReader csvReader = new CSVReaderBuilder(reader).withSkipLines(1).build()) { String[] row; while ((row = csvReader.readNext()) != null) { diff --git a/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java b/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java index 9fdfc5a..7405be7 100644 --- a/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java +++ b/src/main/java/com/threestar/trainus/domain/payment/entity/Payment.java @@ -3,7 +3,7 @@ import java.time.LocalDateTime; import com.threestar.trainus.domain.coupon.user.entity.UserCoupon; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.global.entity.BaseDateEntity; diff --git a/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java b/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java index c5f5e43..be6ace2 100644 --- a/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java +++ b/src/main/java/com/threestar/trainus/domain/payment/service/PaymentService.java @@ -11,8 +11,8 @@ import com.threestar.trainus.domain.coupon.user.entity.CouponStatus; import com.threestar.trainus.domain.coupon.user.entity.UserCoupon; import com.threestar.trainus.domain.coupon.user.repository.UserCouponRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService; import com.threestar.trainus.domain.payment.dto.PaymentRequestDto; import com.threestar.trainus.domain.payment.dto.PaymentResponseDto; import com.threestar.trainus.domain.payment.dto.TossPaymentResponseDto; @@ -129,7 +129,6 @@ public void processCancel(TossPaymentResponseDto tossResponseDto) { DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; LocalDateTime requestAt = OffsetDateTime.parse(tossResponseDto.getRequestedAt(), formatter).toLocalDateTime(); - tossPayment.changeStatus(requestAt, null, PaymentStatus.CANCELED); tossPaymentRepository.save(tossPayment); diff --git a/src/main/java/com/threestar/trainus/domain/profile/controller/ProfileController.java b/src/main/java/com/threestar/trainus/domain/profile/controller/ProfileController.java index 0fae815..45362e4 100644 --- a/src/main/java/com/threestar/trainus/domain/profile/controller/ProfileController.java +++ b/src/main/java/com/threestar/trainus/domain/profile/controller/ProfileController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; import com.threestar.trainus.domain.profile.dto.ImageUpdateRequestDto; import com.threestar.trainus.domain.profile.dto.ImageUpdateResponseDto; import com.threestar.trainus.domain.profile.dto.IntroUpdateRequestDto; diff --git a/src/main/java/com/threestar/trainus/domain/profile/dto/ProfileCreatedLessonDto.java b/src/main/java/com/threestar/trainus/domain/profile/dto/ProfileCreatedLessonDto.java index d8c129a..864eb77 100644 --- a/src/main/java/com/threestar/trainus/domain/profile/dto/ProfileCreatedLessonDto.java +++ b/src/main/java/com/threestar/trainus/domain/profile/dto/ProfileCreatedLessonDto.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; import lombok.Builder; diff --git a/src/main/java/com/threestar/trainus/domain/profile/mapper/ProfileLessonMapper.java b/src/main/java/com/threestar/trainus/domain/profile/mapper/ProfileLessonMapper.java index 77fcbbb..b36fb1f 100644 --- a/src/main/java/com/threestar/trainus/domain/profile/mapper/ProfileLessonMapper.java +++ b/src/main/java/com/threestar/trainus/domain/profile/mapper/ProfileLessonMapper.java @@ -2,7 +2,7 @@ import java.util.List; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import com.threestar.trainus.domain.profile.dto.ProfileCreatedLessonDto; import com.threestar.trainus.domain.profile.dto.ProfileCreatedLessonListResponseDto; import com.threestar.trainus.domain.profile.dto.ProfileCreatedLessonListWrapperDto; diff --git a/src/main/java/com/threestar/trainus/domain/profile/service/ProfileLessonService.java b/src/main/java/com/threestar/trainus/domain/profile/service/ProfileLessonService.java index 0ed6193..9c36f77 100644 --- a/src/main/java/com/threestar/trainus/domain/profile/service/ProfileLessonService.java +++ b/src/main/java/com/threestar/trainus/domain/profile/service/ProfileLessonService.java @@ -7,9 +7,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; import com.threestar.trainus.domain.profile.dto.ProfileCreatedLessonListResponseDto; import com.threestar.trainus.domain.profile.mapper.ProfileLessonMapper; import com.threestar.trainus.domain.user.entity.User; diff --git a/src/main/java/com/threestar/trainus/domain/ranking/controller/RankingController.java b/src/main/java/com/threestar/trainus/domain/ranking/controller/RankingController.java index 6bc24d4..4ccf0d9 100644 --- a/src/main/java/com/threestar/trainus/domain/ranking/controller/RankingController.java +++ b/src/main/java/com/threestar/trainus/domain/ranking/controller/RankingController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.threestar.trainus.domain.lesson.admin.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import com.threestar.trainus.domain.ranking.dto.RankingResponseDto; import com.threestar.trainus.domain.ranking.service.RankingService; import com.threestar.trainus.global.unit.BaseResponse; diff --git a/src/main/java/com/threestar/trainus/domain/ranking/dto/RankingResponseDto.java b/src/main/java/com/threestar/trainus/domain/ranking/dto/RankingResponseDto.java index dcd0d20..2eb7bee 100644 --- a/src/main/java/com/threestar/trainus/domain/ranking/dto/RankingResponseDto.java +++ b/src/main/java/com/threestar/trainus/domain/ranking/dto/RankingResponseDto.java @@ -1,6 +1,6 @@ package com.threestar.trainus.domain.ranking.dto; -import com.threestar.trainus.domain.lesson.admin.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/threestar/trainus/domain/ranking/repository/RankingRepository.java b/src/main/java/com/threestar/trainus/domain/ranking/repository/RankingRepository.java index 565f123..2403800 100644 --- a/src/main/java/com/threestar/trainus/domain/ranking/repository/RankingRepository.java +++ b/src/main/java/com/threestar/trainus/domain/ranking/repository/RankingRepository.java @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.threestar.trainus.domain.lesson.admin.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import com.threestar.trainus.domain.metadata.entity.ProfileMetadata; import com.threestar.trainus.domain.ranking.dto.RankingData; diff --git a/src/main/java/com/threestar/trainus/domain/ranking/service/RankingService.java b/src/main/java/com/threestar/trainus/domain/ranking/service/RankingService.java index 65ff6ee..7c5a3ab 100644 --- a/src/main/java/com/threestar/trainus/domain/ranking/service/RankingService.java +++ b/src/main/java/com/threestar/trainus/domain/ranking/service/RankingService.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.threestar.trainus.domain.lesson.admin.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; import com.threestar.trainus.domain.ranking.dto.RankingData; import com.threestar.trainus.domain.ranking.dto.RankingResponseDto; import com.threestar.trainus.domain.ranking.repository.RankingRepository; diff --git a/src/main/java/com/threestar/trainus/domain/review/entity/Review.java b/src/main/java/com/threestar/trainus/domain/review/entity/Review.java index bdb44ee..0dac51a 100644 --- a/src/main/java/com/threestar/trainus/domain/review/entity/Review.java +++ b/src/main/java/com/threestar/trainus/domain/review/entity/Review.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.global.entity.BaseDateEntity; diff --git a/src/main/java/com/threestar/trainus/domain/review/service/ReviewService.java b/src/main/java/com/threestar/trainus/domain/review/service/ReviewService.java index 8c5f64b..2ef82a7 100644 --- a/src/main/java/com/threestar/trainus/domain/review/service/ReviewService.java +++ b/src/main/java/com/threestar/trainus/domain/review/service/ReviewService.java @@ -5,9 +5,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.repository.LessonParticipantRepository; -import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonParticipantRepository; +import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService; import com.threestar.trainus.domain.metadata.service.ProfileMetadataService; import com.threestar.trainus.domain.review.dto.ReviewCreateRequestDto; import com.threestar.trainus.domain.review.dto.ReviewCreateResponseDto; diff --git a/src/main/java/com/threestar/trainus/global/config/MockDataInitializer.java b/src/main/java/com/threestar/trainus/global/config/MockDataInitializer.java index 561812b..fe73b50 100644 --- a/src/main/java/com/threestar/trainus/global/config/MockDataInitializer.java +++ b/src/main/java/com/threestar/trainus/global/config/MockDataInitializer.java @@ -18,9 +18,9 @@ import com.threestar.trainus.domain.coupon.user.entity.UserCoupon; import com.threestar.trainus.domain.coupon.user.repository.CouponRepository; import com.threestar.trainus.domain.coupon.user.repository.UserCouponRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; import com.threestar.trainus.domain.metadata.entity.ProfileMetadata; import com.threestar.trainus.domain.metadata.mapper.ProfileMetadataMapper; import com.threestar.trainus.domain.metadata.repository.ProfileMetadataRepository; diff --git a/src/test/java/com/threestar/trainus/domain/comment/controller/CommentControllerTest.java b/src/test/java/com/threestar/trainus/domain/comment/controller/CommentControllerTest.java index 4cd8928..a5a0082 100644 --- a/src/test/java/com/threestar/trainus/domain/comment/controller/CommentControllerTest.java +++ b/src/test/java/com/threestar/trainus/domain/comment/controller/CommentControllerTest.java @@ -22,9 +22,9 @@ import com.threestar.trainus.domain.comment.dto.CommentCreateRequestDto; import com.threestar.trainus.domain.comment.entity.Comment; import com.threestar.trainus.domain.comment.repository.CommentRepository; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; import com.threestar.trainus.domain.user.entity.User; import com.threestar.trainus.domain.user.entity.UserRole; import com.threestar.trainus.domain.user.repository.UserRepository; diff --git a/src/test/java/com/threestar/trainus/domain/review/controller/ReviewControllerTest.java b/src/test/java/com/threestar/trainus/domain/review/controller/ReviewControllerTest.java index d5ae048..c4d3975 100644 --- a/src/test/java/com/threestar/trainus/domain/review/controller/ReviewControllerTest.java +++ b/src/test/java/com/threestar/trainus/domain/review/controller/ReviewControllerTest.java @@ -18,11 +18,11 @@ import org.springframework.test.web.servlet.MockMvc; import com.fasterxml.jackson.databind.ObjectMapper; -import com.threestar.trainus.domain.lesson.admin.entity.Category; -import com.threestar.trainus.domain.lesson.admin.entity.Lesson; -import com.threestar.trainus.domain.lesson.admin.entity.LessonParticipant; -import com.threestar.trainus.domain.lesson.admin.repository.LessonParticipantRepository; -import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository; +import com.threestar.trainus.domain.lesson.teacher.entity.Category; +import com.threestar.trainus.domain.lesson.teacher.entity.Lesson; +import com.threestar.trainus.domain.lesson.teacher.entity.LessonParticipant; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonParticipantRepository; +import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository; import com.threestar.trainus.domain.metadata.entity.ProfileMetadata; import com.threestar.trainus.domain.metadata.repository.ProfileMetadataRepository; import com.threestar.trainus.domain.review.dto.ReviewCreateRequestDto;