diff --git a/src/main/java/com/mjsec/lms/controller/AdminController.java b/src/main/java/com/mjsec/lms/admin/controller/AdminController.java similarity index 91% rename from src/main/java/com/mjsec/lms/controller/AdminController.java rename to src/main/java/com/mjsec/lms/admin/controller/AdminController.java index af63619..b2d14c4 100644 --- a/src/main/java/com/mjsec/lms/controller/AdminController.java +++ b/src/main/java/com/mjsec/lms/admin/controller/AdminController.java @@ -1,23 +1,21 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.dto.AllStudyGroupDto; -import com.mjsec.lms.dto.PendingUserDto; -import com.mjsec.lms.dto.StudyGroupDetailDto; -import com.mjsec.lms.dto.StudyGroupDto.StudyGroupRequestDto; -import com.mjsec.lms.dto.StudyGroupDto.StudyGroupUpdateDto; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.dto.UserAdminResponseDto; -import com.mjsec.lms.service.AdminService; -import com.mjsec.lms.service.StudyGroupService; -import com.mjsec.lms.type.ResponseMessage; +package com.mjsec.lms.admin.controller; + +import com.mjsec.lms.admin.dto.AllStudyGroupDto; +import com.mjsec.lms.auth.dto.PendingUserDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDetailDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDto.StudyGroupRequestDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDto.StudyGroupUpdateDto; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.admin.dto.UserAdminResponseDto; +import com.mjsec.lms.admin.service.AdminService; +import com.mjsec.lms.studygroup.service.StudyGroupService; +import com.mjsec.lms.common.type.ResponseMessage; import jakarta.validation.Valid; -import java.io.IOException; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/com/mjsec/lms/dto/AllStudyGroupDto.java b/src/main/java/com/mjsec/lms/admin/dto/AllStudyGroupDto.java similarity index 75% rename from src/main/java/com/mjsec/lms/dto/AllStudyGroupDto.java rename to src/main/java/com/mjsec/lms/admin/dto/AllStudyGroupDto.java index 825fa52..1d7c4c8 100644 --- a/src/main/java/com/mjsec/lms/dto/AllStudyGroupDto.java +++ b/src/main/java/com/mjsec/lms/admin/dto/AllStudyGroupDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.admin.dto; -import com.mjsec.lms.type.StudyStatus; +import com.mjsec.lms.studygroup.domain.type.StudyStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/UserAdminResponseDto.java b/src/main/java/com/mjsec/lms/admin/dto/UserAdminResponseDto.java similarity index 86% rename from src/main/java/com/mjsec/lms/dto/UserAdminResponseDto.java rename to src/main/java/com/mjsec/lms/admin/dto/UserAdminResponseDto.java index 7bf4e95..6aa7dac 100644 --- a/src/main/java/com/mjsec/lms/dto/UserAdminResponseDto.java +++ b/src/main/java/com/mjsec/lms/admin/dto/UserAdminResponseDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.admin.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/service/AdminService.java b/src/main/java/com/mjsec/lms/admin/service/AdminService.java similarity index 90% rename from src/main/java/com/mjsec/lms/service/AdminService.java rename to src/main/java/com/mjsec/lms/admin/service/AdminService.java index 23ab65f..a75a00c 100644 --- a/src/main/java/com/mjsec/lms/service/AdminService.java +++ b/src/main/java/com/mjsec/lms/admin/service/AdminService.java @@ -1,42 +1,43 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.AssignmentSubmission; -import com.mjsec.lms.domain.Attendance; -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.PendingUser; -import com.mjsec.lms.domain.Plan; -import com.mjsec.lms.domain.PlanComment; -import com.mjsec.lms.domain.StudyActivity; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.AllStudyGroupDto; -import com.mjsec.lms.dto.PendingUserDto; -import com.mjsec.lms.dto.StudyGroupDto.StudyGroupRequestDto; -import com.mjsec.lms.dto.StudyGroupDto.StudyGroupUpdateDto; -import com.mjsec.lms.dto.UserAdminResponseDto; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.AnnouncementRepository; -import com.mjsec.lms.repository.AttendanceRepository; -import com.mjsec.lms.repository.GroupMemberRepository; -import com.mjsec.lms.repository.PendingUserRepository; -import com.mjsec.lms.repository.PlanCommentRepository; -import com.mjsec.lms.repository.PlanRepository; -import com.mjsec.lms.repository.StudyActivityRepository; -import com.mjsec.lms.repository.StudyGroupRepository; -import com.mjsec.lms.repository.SubmissionRepository; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.GroupMemberRole; -import com.mjsec.lms.type.UserRole; -import com.mjsec.lms.type.StudyStatus; +package com.mjsec.lms.admin.service; + +import com.mjsec.lms.assignment.domain.AssignmentSubmission; +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.auth.domain.PendingUser; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.assignment.domain.PlanComment; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.admin.dto.AllStudyGroupDto; +import com.mjsec.lms.auth.dto.PendingUserDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDto.StudyGroupRequestDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDto.StudyGroupUpdateDto; +import com.mjsec.lms.admin.dto.UserAdminResponseDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.announcement.repository.AnnouncementRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.auth.repository.PendingUserRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; +import com.mjsec.lms.user.domain.type.UserRole; +import com.mjsec.lms.studygroup.domain.type.StudyStatus; import jakarta.transaction.Transactional; -import java.io.IOException; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import com.mjsec.lms.media.service.FileService; +import com.mjsec.lms.notification.external.WikiService; @Slf4j @Service diff --git a/src/main/java/com/mjsec/lms/controller/AnnouncementController.java b/src/main/java/com/mjsec/lms/announcement/controller/AnnouncementController.java similarity index 89% rename from src/main/java/com/mjsec/lms/controller/AnnouncementController.java rename to src/main/java/com/mjsec/lms/announcement/controller/AnnouncementController.java index 6bace1f..c27a29d 100644 --- a/src/main/java/com/mjsec/lms/controller/AnnouncementController.java +++ b/src/main/java/com/mjsec/lms/announcement/controller/AnnouncementController.java @@ -1,12 +1,12 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.domain.Announcement; -import com.mjsec.lms.dto.AnnouncementRequestDto; -import com.mjsec.lms.dto.AnnouncementResponseDto; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.mapper.AnnouncementMapper; -import com.mjsec.lms.service.AnnouncementService; -import com.mjsec.lms.type.ResponseMessage; +package com.mjsec.lms.announcement.controller; + +import com.mjsec.lms.announcement.domain.Announcement; +import com.mjsec.lms.announcement.dto.AnnouncementRequestDto; +import com.mjsec.lms.announcement.dto.AnnouncementResponseDto; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.announcement.dto.AnnouncementMapper; +import com.mjsec.lms.announcement.service.AnnouncementService; +import com.mjsec.lms.common.type.ResponseMessage; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/mjsec/lms/domain/Announcement.java b/src/main/java/com/mjsec/lms/announcement/domain/Announcement.java similarity index 75% rename from src/main/java/com/mjsec/lms/domain/Announcement.java rename to src/main/java/com/mjsec/lms/announcement/domain/Announcement.java index c6b01d8..9db8e43 100644 --- a/src/main/java/com/mjsec/lms/domain/Announcement.java +++ b/src/main/java/com/mjsec/lms/announcement/domain/Announcement.java @@ -1,15 +1,14 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.announcement.domain; import jakarta.persistence.*; import lombok.*; -import com.mjsec.lms.type.AnnouncementRole; +import com.mjsec.lms.announcement.domain.type.AnnouncementRole; import lombok.experimental.SuperBuilder; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; import jakarta.persistence.ManyToOne; import jakarta.persistence.JoinColumn; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter @Setter diff --git a/src/main/java/com/mjsec/lms/type/AnnouncementRole.java b/src/main/java/com/mjsec/lms/announcement/domain/type/AnnouncementRole.java similarity index 64% rename from src/main/java/com/mjsec/lms/type/AnnouncementRole.java rename to src/main/java/com/mjsec/lms/announcement/domain/type/AnnouncementRole.java index 8c28946..cba16c8 100644 --- a/src/main/java/com/mjsec/lms/type/AnnouncementRole.java +++ b/src/main/java/com/mjsec/lms/announcement/domain/type/AnnouncementRole.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.announcement.domain.type; public enum AnnouncementRole { NOTICE, diff --git a/src/main/java/com/mjsec/lms/mapper/AnnouncementMapper.java b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementMapper.java similarity index 81% rename from src/main/java/com/mjsec/lms/mapper/AnnouncementMapper.java rename to src/main/java/com/mjsec/lms/announcement/dto/AnnouncementMapper.java index 42fcf80..6f76b78 100644 --- a/src/main/java/com/mjsec/lms/mapper/AnnouncementMapper.java +++ b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementMapper.java @@ -1,9 +1,7 @@ -package com.mjsec.lms.mapper; +package com.mjsec.lms.announcement.dto; -import com.mjsec.lms.domain.Announcement; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.AnnouncementRequestDto; -import com.mjsec.lms.dto.AnnouncementResponseDto; +import com.mjsec.lms.announcement.domain.Announcement; +import com.mjsec.lms.user.domain.User; public class AnnouncementMapper { public static Announcement toEntity(AnnouncementRequestDto dto, User user) { diff --git a/src/main/java/com/mjsec/lms/dto/AnnouncementRequestDto.java b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementRequestDto.java similarity index 71% rename from src/main/java/com/mjsec/lms/dto/AnnouncementRequestDto.java rename to src/main/java/com/mjsec/lms/announcement/dto/AnnouncementRequestDto.java index d01139c..c9e6ddd 100644 --- a/src/main/java/com/mjsec/lms/dto/AnnouncementRequestDto.java +++ b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementRequestDto.java @@ -1,9 +1,8 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.announcement.dto; import jakarta.validation.constraints.NotNull; import lombok.Getter; -import java.time.LocalDateTime; -import com.mjsec.lms.type.AnnouncementRole; +import com.mjsec.lms.announcement.domain.type.AnnouncementRole; @ Getter public class AnnouncementRequestDto { diff --git a/src/main/java/com/mjsec/lms/dto/AnnouncementResponseDto.java b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementResponseDto.java similarity index 78% rename from src/main/java/com/mjsec/lms/dto/AnnouncementResponseDto.java rename to src/main/java/com/mjsec/lms/announcement/dto/AnnouncementResponseDto.java index de0d7f1..303b12d 100644 --- a/src/main/java/com/mjsec/lms/dto/AnnouncementResponseDto.java +++ b/src/main/java/com/mjsec/lms/announcement/dto/AnnouncementResponseDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.announcement.dto; -import com.mjsec.lms.type.AnnouncementRole; +import com.mjsec.lms.announcement.domain.type.AnnouncementRole; import lombok.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/mjsec/lms/repository/AnnouncementRepository.java b/src/main/java/com/mjsec/lms/announcement/repository/AnnouncementRepository.java similarity index 76% rename from src/main/java/com/mjsec/lms/repository/AnnouncementRepository.java rename to src/main/java/com/mjsec/lms/announcement/repository/AnnouncementRepository.java index 821a3df..cbbe79d 100644 --- a/src/main/java/com/mjsec/lms/repository/AnnouncementRepository.java +++ b/src/main/java/com/mjsec/lms/announcement/repository/AnnouncementRepository.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.announcement.repository; -import com.mjsec.lms.domain.Announcement; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.announcement.domain.Announcement; +import com.mjsec.lms.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/service/AnnouncementService.java b/src/main/java/com/mjsec/lms/announcement/service/AnnouncementService.java similarity index 90% rename from src/main/java/com/mjsec/lms/service/AnnouncementService.java rename to src/main/java/com/mjsec/lms/announcement/service/AnnouncementService.java index 01dcc2a..42f3c00 100644 --- a/src/main/java/com/mjsec/lms/service/AnnouncementService.java +++ b/src/main/java/com/mjsec/lms/announcement/service/AnnouncementService.java @@ -1,15 +1,15 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.Announcement; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.AnnouncementRequestDto; -import com.mjsec.lms.dto.AnnouncementResponseDto; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.mapper.AnnouncementMapper; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.UserRole; -import org.springframework.http.ResponseEntity; +package com.mjsec.lms.announcement.service; + +import com.mjsec.lms.announcement.domain.Announcement; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.announcement.dto.AnnouncementRequestDto; +import com.mjsec.lms.announcement.dto.AnnouncementResponseDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.announcement.dto.AnnouncementMapper; +import com.mjsec.lms.announcement.repository.AnnouncementRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.user.domain.type.UserRole; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/mjsec/lms/controller/AssignmentController.java b/src/main/java/com/mjsec/lms/assignment/controller/AssignmentController.java similarity index 94% rename from src/main/java/com/mjsec/lms/controller/AssignmentController.java rename to src/main/java/com/mjsec/lms/assignment/controller/AssignmentController.java index d71a6b2..3fd6ef4 100644 --- a/src/main/java/com/mjsec/lms/controller/AssignmentController.java +++ b/src/main/java/com/mjsec/lms/assignment/controller/AssignmentController.java @@ -1,13 +1,22 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.*; -import com.mjsec.lms.service.AssignmentSubmissionService; -import com.mjsec.lms.service.PlanService; -import com.mjsec.lms.type.ResponseMessage; -import com.mjsec.lms.type.SubmissionStatus; -import com.mjsec.lms.util.IpUtils; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.assignment.controller; + +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.assignment.dto.PlanResponse; +import com.mjsec.lms.assignment.dto.DetailPlanResponse; +import com.mjsec.lms.assignment.dto.SubmissionResponse; +import com.mjsec.lms.assignment.dto.SubmissionDto; +import com.mjsec.lms.assignment.dto.DetailSubmissionResponse; +import com.mjsec.lms.assignment.dto.SubmissionFeedbackDto; +import com.mjsec.lms.assignment.dto.SubmissionStatisticsResponse; +import com.mjsec.lms.assignment.dto.PlanCommentResponse; +import com.mjsec.lms.assignment.dto.PlanCommentDto; +import com.mjsec.lms.assignment.service.AssignmentSubmissionService; +import com.mjsec.lms.assignment.service.PlanService; +import com.mjsec.lms.common.type.ResponseMessage; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; +import com.mjsec.lms.common.util.IpUtils; +import com.mjsec.lms.common.util.ValidationUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/mjsec/lms/domain/AssignmentNotSubmittedInfo.java b/src/main/java/com/mjsec/lms/assignment/domain/AssignmentNotSubmittedInfo.java similarity index 95% rename from src/main/java/com/mjsec/lms/domain/AssignmentNotSubmittedInfo.java rename to src/main/java/com/mjsec/lms/assignment/domain/AssignmentNotSubmittedInfo.java index 377d823..efdb0e0 100644 --- a/src/main/java/com/mjsec/lms/domain/AssignmentNotSubmittedInfo.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/AssignmentNotSubmittedInfo.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.assignment.domain; import lombok.*; diff --git a/src/main/java/com/mjsec/lms/domain/AssignmentSubmission.java b/src/main/java/com/mjsec/lms/assignment/domain/AssignmentSubmission.java similarity index 88% rename from src/main/java/com/mjsec/lms/domain/AssignmentSubmission.java rename to src/main/java/com/mjsec/lms/assignment/domain/AssignmentSubmission.java index 159e915..17977ab 100644 --- a/src/main/java/com/mjsec/lms/domain/AssignmentSubmission.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/AssignmentSubmission.java @@ -1,11 +1,13 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.assignment.domain; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLRestriction; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/domain/Plan.java b/src/main/java/com/mjsec/lms/assignment/domain/Plan.java similarity index 89% rename from src/main/java/com/mjsec/lms/domain/Plan.java rename to src/main/java/com/mjsec/lms/assignment/domain/Plan.java index 8df89a8..e0a9f22 100644 --- a/src/main/java/com/mjsec/lms/domain/Plan.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/Plan.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.assignment.domain; import jakarta.persistence.*; import lombok.*; @@ -9,6 +9,9 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/domain/PlanComment.java b/src/main/java/com/mjsec/lms/assignment/domain/PlanComment.java similarity index 90% rename from src/main/java/com/mjsec/lms/domain/PlanComment.java rename to src/main/java/com/mjsec/lms/assignment/domain/PlanComment.java index eb9deec..7e664cd 100644 --- a/src/main/java/com/mjsec/lms/domain/PlanComment.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/PlanComment.java @@ -1,10 +1,12 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.assignment.domain; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLRestriction; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/type/Category.java b/src/main/java/com/mjsec/lms/assignment/domain/type/Category.java similarity index 92% rename from src/main/java/com/mjsec/lms/type/Category.java rename to src/main/java/com/mjsec/lms/assignment/domain/type/Category.java index 89aade3..a63c260 100644 --- a/src/main/java/com/mjsec/lms/type/Category.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/type/Category.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.assignment.domain.type; public enum Category { WEB("웹 해킹"), diff --git a/src/main/java/com/mjsec/lms/type/SubmissionStatus.java b/src/main/java/com/mjsec/lms/assignment/domain/type/SubmissionStatus.java similarity index 65% rename from src/main/java/com/mjsec/lms/type/SubmissionStatus.java rename to src/main/java/com/mjsec/lms/assignment/domain/type/SubmissionStatus.java index 07c7489..e41f27e 100644 --- a/src/main/java/com/mjsec/lms/type/SubmissionStatus.java +++ b/src/main/java/com/mjsec/lms/assignment/domain/type/SubmissionStatus.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.assignment.domain.type; public enum SubmissionStatus { SUBMITTED, diff --git a/src/main/java/com/mjsec/lms/dto/DetailPlanResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/DetailPlanResponse.java similarity index 93% rename from src/main/java/com/mjsec/lms/dto/DetailPlanResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/DetailPlanResponse.java index 6a76ff1..674cf96 100644 --- a/src/main/java/com/mjsec/lms/dto/DetailPlanResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/DetailPlanResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/DetailSubmissionResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/DetailSubmissionResponse.java similarity index 80% rename from src/main/java/com/mjsec/lms/dto/DetailSubmissionResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/DetailSubmissionResponse.java index c50109b..76ff4b7 100644 --- a/src/main/java/com/mjsec/lms/dto/DetailSubmissionResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/DetailSubmissionResponse.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/PlanCommentDto.java b/src/main/java/com/mjsec/lms/assignment/dto/PlanCommentDto.java similarity index 89% rename from src/main/java/com/mjsec/lms/dto/PlanCommentDto.java rename to src/main/java/com/mjsec/lms/assignment/dto/PlanCommentDto.java index 1f20de0..ec0a7a4 100644 --- a/src/main/java/com/mjsec/lms/dto/PlanCommentDto.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/PlanCommentDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/mjsec/lms/dto/PlanCommentResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/PlanCommentResponse.java similarity index 88% rename from src/main/java/com/mjsec/lms/dto/PlanCommentResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/PlanCommentResponse.java index 006192d..c62e477 100644 --- a/src/main/java/com/mjsec/lms/dto/PlanCommentResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/PlanCommentResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/PlanDto.java b/src/main/java/com/mjsec/lms/assignment/dto/PlanDto.java similarity index 94% rename from src/main/java/com/mjsec/lms/dto/PlanDto.java rename to src/main/java/com/mjsec/lms/assignment/dto/PlanDto.java index 14a5269..f099e40 100644 --- a/src/main/java/com/mjsec/lms/dto/PlanDto.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/PlanDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/mjsec/lms/dto/PlanResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/PlanResponse.java similarity index 90% rename from src/main/java/com/mjsec/lms/dto/PlanResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/PlanResponse.java index 16bc420..56115c2 100644 --- a/src/main/java/com/mjsec/lms/dto/PlanResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/PlanResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/SubmissionDto.java b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionDto.java similarity index 88% rename from src/main/java/com/mjsec/lms/dto/SubmissionDto.java rename to src/main/java/com/mjsec/lms/assignment/dto/SubmissionDto.java index 53d500f..8ae082b 100644 --- a/src/main/java/com/mjsec/lms/dto/SubmissionDto.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import jakarta.validation.constraints.NotBlank; import lombok.Builder; diff --git a/src/main/java/com/mjsec/lms/dto/SubmissionFeedbackDto.java b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionFeedbackDto.java similarity index 79% rename from src/main/java/com/mjsec/lms/dto/SubmissionFeedbackDto.java rename to src/main/java/com/mjsec/lms/assignment/dto/SubmissionFeedbackDto.java index 4475fe6..9dfb357 100644 --- a/src/main/java/com/mjsec/lms/dto/SubmissionFeedbackDto.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionFeedbackDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/mjsec/lms/dto/SubmissionResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionResponse.java similarity index 76% rename from src/main/java/com/mjsec/lms/dto/SubmissionResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/SubmissionResponse.java index 5bdbcfb..71059e9 100644 --- a/src/main/java/com/mjsec/lms/dto/SubmissionResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionResponse.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/SubmissionStatisticsResponse.java b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionStatisticsResponse.java similarity index 91% rename from src/main/java/com/mjsec/lms/dto/SubmissionStatisticsResponse.java rename to src/main/java/com/mjsec/lms/assignment/dto/SubmissionStatisticsResponse.java index 194068a..cc3f38d 100644 --- a/src/main/java/com/mjsec/lms/dto/SubmissionStatisticsResponse.java +++ b/src/main/java/com/mjsec/lms/assignment/dto/SubmissionStatisticsResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.assignment.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/repository/PlanCommentRepository.java b/src/main/java/com/mjsec/lms/assignment/repository/PlanCommentRepository.java similarity index 90% rename from src/main/java/com/mjsec/lms/repository/PlanCommentRepository.java rename to src/main/java/com/mjsec/lms/assignment/repository/PlanCommentRepository.java index a065452..a2a05da 100644 --- a/src/main/java/com/mjsec/lms/repository/PlanCommentRepository.java +++ b/src/main/java/com/mjsec/lms/assignment/repository/PlanCommentRepository.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.assignment.repository; -import com.mjsec.lms.domain.PlanComment; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.assignment.domain.PlanComment; +import com.mjsec.lms.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/repository/PlanRepository.java b/src/main/java/com/mjsec/lms/assignment/repository/PlanRepository.java similarity index 93% rename from src/main/java/com/mjsec/lms/repository/PlanRepository.java rename to src/main/java/com/mjsec/lms/assignment/repository/PlanRepository.java index 6d06f83..816772e 100644 --- a/src/main/java/com/mjsec/lms/repository/PlanRepository.java +++ b/src/main/java/com/mjsec/lms/assignment/repository/PlanRepository.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.assignment.repository; -import com.mjsec.lms.domain.Plan; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/repository/SubmissionRepository.java b/src/main/java/com/mjsec/lms/assignment/repository/SubmissionRepository.java similarity index 91% rename from src/main/java/com/mjsec/lms/repository/SubmissionRepository.java rename to src/main/java/com/mjsec/lms/assignment/repository/SubmissionRepository.java index bfb9f74..6c65048 100644 --- a/src/main/java/com/mjsec/lms/repository/SubmissionRepository.java +++ b/src/main/java/com/mjsec/lms/assignment/repository/SubmissionRepository.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.assignment.repository; -import com.mjsec.lms.domain.AssignmentSubmission; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.assignment.domain.AssignmentSubmission; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/service/AssignmentSubmissionService.java b/src/main/java/com/mjsec/lms/assignment/service/AssignmentSubmissionService.java similarity index 93% rename from src/main/java/com/mjsec/lms/service/AssignmentSubmissionService.java rename to src/main/java/com/mjsec/lms/assignment/service/AssignmentSubmissionService.java index d6059f9..0c1ce81 100644 --- a/src/main/java/com/mjsec/lms/service/AssignmentSubmissionService.java +++ b/src/main/java/com/mjsec/lms/assignment/service/AssignmentSubmissionService.java @@ -1,16 +1,21 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.AssignmentSubmission; -import com.mjsec.lms.domain.Plan; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.*; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.GroupMemberRepository; -import com.mjsec.lms.repository.SubmissionRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.GroupMemberRole; -import com.mjsec.lms.type.SubmissionStatus; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.assignment.service; + +import com.mjsec.lms.assignment.domain.AssignmentSubmission; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.assignment.dto.SubmissionResponse; +import com.mjsec.lms.assignment.dto.SubmissionDto; +import com.mjsec.lms.assignment.dto.SubmissionFeedbackDto; +import com.mjsec.lms.assignment.dto.DetailSubmissionResponse; +import com.mjsec.lms.assignment.dto.SubmissionStatisticsResponse; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; +import com.mjsec.lms.user.domain.type.UserRole; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -105,7 +110,9 @@ public DetailSubmissionResponse getDetailedSubmission(Long groupId, Long planId, validationUtils.validateAssignmentSubmissionAllowed(planId); AssignmentSubmission assignmentSubmission = validationUtils.validateSubmissionAccess(planId, submitId); - GroupMemberRole role = validationUtils.validateUserRole(user.getUserId(), groupId); + GroupMemberRole role = (user.getRole() == UserRole.ROLE_ADMIN) + ? GroupMemberRole.MENTOR + : validationUtils.validateUserRole(user.getUserId(), groupId); validationUtils.validateSubmissionAccessByStatus(assignmentSubmission, user.getUserId(), role); diff --git a/src/main/java/com/mjsec/lms/service/PlanService.java b/src/main/java/com/mjsec/lms/assignment/service/PlanService.java similarity index 95% rename from src/main/java/com/mjsec/lms/service/PlanService.java rename to src/main/java/com/mjsec/lms/assignment/service/PlanService.java index d5ff9b6..e7a5146 100644 --- a/src/main/java/com/mjsec/lms/service/PlanService.java +++ b/src/main/java/com/mjsec/lms/assignment/service/PlanService.java @@ -1,9 +1,17 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.*; -import com.mjsec.lms.dto.*; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.assignment.service; + +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.assignment.domain.PlanComment; +import com.mjsec.lms.assignment.dto.PlanDto; +import com.mjsec.lms.assignment.dto.DetailPlanResponse; +import com.mjsec.lms.assignment.dto.PlanResponse; +import com.mjsec.lms.assignment.dto.PlanCommentDto; +import com.mjsec.lms.assignment.dto.PlanCommentResponse; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/mjsec/lms/controller/AttendanceController.java b/src/main/java/com/mjsec/lms/attendance/controller/AttendanceController.java similarity index 91% rename from src/main/java/com/mjsec/lms/controller/AttendanceController.java rename to src/main/java/com/mjsec/lms/attendance/controller/AttendanceController.java index 22c1c29..1ea7f72 100644 --- a/src/main/java/com/mjsec/lms/controller/AttendanceController.java +++ b/src/main/java/com/mjsec/lms/attendance/controller/AttendanceController.java @@ -1,11 +1,11 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.dto.AttendanceDto; -import com.mjsec.lms.dto.AttendanceResponse; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.dto.WeeklyAttendanceResponse; -import com.mjsec.lms.service.AttendanceService; -import com.mjsec.lms.type.ResponseMessage; +package com.mjsec.lms.attendance.controller; + +import com.mjsec.lms.attendance.dto.AttendanceDto; +import com.mjsec.lms.attendance.dto.AttendanceResponse; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.attendance.dto.WeeklyAttendanceResponse; +import com.mjsec.lms.attendance.service.AttendanceService; +import com.mjsec.lms.common.type.ResponseMessage; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/mjsec/lms/domain/Attendance.java b/src/main/java/com/mjsec/lms/attendance/domain/Attendance.java similarity index 81% rename from src/main/java/com/mjsec/lms/domain/Attendance.java rename to src/main/java/com/mjsec/lms/attendance/domain/Attendance.java index 13a4d98..44afb7b 100644 --- a/src/main/java/com/mjsec/lms/domain/Attendance.java +++ b/src/main/java/com/mjsec/lms/attendance/domain/Attendance.java @@ -1,7 +1,6 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.attendance.domain; -import com.mjsec.lms.type.AttendanceType; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; @@ -12,6 +11,10 @@ import org.hibernate.annotations.SQLRestriction; import java.time.LocalDate; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/type/AttendanceType.java b/src/main/java/com/mjsec/lms/attendance/domain/type/AttendanceType.java similarity index 67% rename from src/main/java/com/mjsec/lms/type/AttendanceType.java rename to src/main/java/com/mjsec/lms/attendance/domain/type/AttendanceType.java index d617365..2b38792 100644 --- a/src/main/java/com/mjsec/lms/type/AttendanceType.java +++ b/src/main/java/com/mjsec/lms/attendance/domain/type/AttendanceType.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.attendance.domain.type; public enum AttendanceType { ATTEND, //출석 diff --git a/src/main/java/com/mjsec/lms/dto/AttendanceDto.java b/src/main/java/com/mjsec/lms/attendance/dto/AttendanceDto.java similarity index 82% rename from src/main/java/com/mjsec/lms/dto/AttendanceDto.java rename to src/main/java/com/mjsec/lms/attendance/dto/AttendanceDto.java index d884166..649207d 100644 --- a/src/main/java/com/mjsec/lms/dto/AttendanceDto.java +++ b/src/main/java/com/mjsec/lms/attendance/dto/AttendanceDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.attendance.dto; -import com.mjsec.lms.type.AttendanceType; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/mjsec/lms/dto/AttendanceResponse.java b/src/main/java/com/mjsec/lms/attendance/dto/AttendanceResponse.java similarity index 76% rename from src/main/java/com/mjsec/lms/dto/AttendanceResponse.java rename to src/main/java/com/mjsec/lms/attendance/dto/AttendanceResponse.java index d09984d..0282463 100644 --- a/src/main/java/com/mjsec/lms/dto/AttendanceResponse.java +++ b/src/main/java/com/mjsec/lms/attendance/dto/AttendanceResponse.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.attendance.dto; -import com.mjsec.lms.type.AttendanceType; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyAttendanceDto.java b/src/main/java/com/mjsec/lms/attendance/dto/StudyAttendanceDto.java similarity index 68% rename from src/main/java/com/mjsec/lms/dto/StudyAttendanceDto.java rename to src/main/java/com/mjsec/lms/attendance/dto/StudyAttendanceDto.java index 2b00a36..8de8f4e 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyAttendanceDto.java +++ b/src/main/java/com/mjsec/lms/attendance/dto/StudyAttendanceDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.attendance.dto; -import com.mjsec.lms.type.AttendanceType; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/WeeklyAttendanceResponse.java b/src/main/java/com/mjsec/lms/attendance/dto/WeeklyAttendanceResponse.java similarity index 70% rename from src/main/java/com/mjsec/lms/dto/WeeklyAttendanceResponse.java rename to src/main/java/com/mjsec/lms/attendance/dto/WeeklyAttendanceResponse.java index b27a04e..13d1a74 100644 --- a/src/main/java/com/mjsec/lms/dto/WeeklyAttendanceResponse.java +++ b/src/main/java/com/mjsec/lms/attendance/dto/WeeklyAttendanceResponse.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.attendance.dto; -import com.mjsec.lms.type.AttendanceType; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/repository/AttendanceRepository.java b/src/main/java/com/mjsec/lms/attendance/repository/AttendanceRepository.java similarity index 91% rename from src/main/java/com/mjsec/lms/repository/AttendanceRepository.java rename to src/main/java/com/mjsec/lms/attendance/repository/AttendanceRepository.java index 82c2413..15eb02d 100644 --- a/src/main/java/com/mjsec/lms/repository/AttendanceRepository.java +++ b/src/main/java/com/mjsec/lms/attendance/repository/AttendanceRepository.java @@ -1,9 +1,9 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.attendance.repository; -import com.mjsec.lms.domain.Attendance; -import com.mjsec.lms.domain.StudyActivity; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/service/AttendanceAlertService.java b/src/main/java/com/mjsec/lms/attendance/service/AttendanceAlertService.java similarity index 93% rename from src/main/java/com/mjsec/lms/service/AttendanceAlertService.java rename to src/main/java/com/mjsec/lms/attendance/service/AttendanceAlertService.java index d6e4050..742b07a 100644 --- a/src/main/java/com/mjsec/lms/service/AttendanceAlertService.java +++ b/src/main/java/com/mjsec/lms/attendance/service/AttendanceAlertService.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.attendance.service; -import com.mjsec.lms.domain.Attendance; -import com.mjsec.lms.repository.AttendanceRepository; -import com.mjsec.lms.type.AttendanceType; +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.attendance.domain.type.AttendanceType; import lombok.Builder; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -10,10 +10,10 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.mjsec.lms.notification.external.EmailService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/service/AttendanceService.java b/src/main/java/com/mjsec/lms/attendance/service/AttendanceService.java similarity index 94% rename from src/main/java/com/mjsec/lms/service/AttendanceService.java rename to src/main/java/com/mjsec/lms/attendance/service/AttendanceService.java index d4d4977..41b6447 100644 --- a/src/main/java/com/mjsec/lms/service/AttendanceService.java +++ b/src/main/java/com/mjsec/lms/attendance/service/AttendanceService.java @@ -1,13 +1,13 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.Attendance; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.AttendanceDto; -import com.mjsec.lms.dto.AttendanceResponse; -import com.mjsec.lms.dto.WeeklyAttendanceResponse; -import com.mjsec.lms.repository.AttendanceRepository; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.attendance.service; + +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.attendance.dto.AttendanceDto; +import com.mjsec.lms.attendance.dto.AttendanceResponse; +import com.mjsec.lms.attendance.dto.WeeklyAttendanceResponse; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/mjsec/lms/controller/AuthController.java b/src/main/java/com/mjsec/lms/auth/controller/AuthController.java similarity index 91% rename from src/main/java/com/mjsec/lms/controller/AuthController.java rename to src/main/java/com/mjsec/lms/auth/controller/AuthController.java index bf4d34d..892533a 100644 --- a/src/main/java/com/mjsec/lms/controller/AuthController.java +++ b/src/main/java/com/mjsec/lms/auth/controller/AuthController.java @@ -1,9 +1,9 @@ -package com.mjsec.lms.controller; +package com.mjsec.lms.auth.controller; -import com.mjsec.lms.dto.AuthDto; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.service.AuthService; -import com.mjsec.lms.type.ResponseMessage; +import com.mjsec.lms.auth.dto.AuthDto; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.auth.service.AuthService; +import com.mjsec.lms.common.type.ResponseMessage; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/mjsec/lms/domain/PendingUser.java b/src/main/java/com/mjsec/lms/auth/domain/PendingUser.java similarity index 96% rename from src/main/java/com/mjsec/lms/domain/PendingUser.java rename to src/main/java/com/mjsec/lms/auth/domain/PendingUser.java index 9b6f645..c1640b8 100644 --- a/src/main/java/com/mjsec/lms/domain/PendingUser.java +++ b/src/main/java/com/mjsec/lms/auth/domain/PendingUser.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.auth.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/mjsec/lms/dto/AuthDto.java b/src/main/java/com/mjsec/lms/auth/dto/AuthDto.java similarity index 93% rename from src/main/java/com/mjsec/lms/dto/AuthDto.java rename to src/main/java/com/mjsec/lms/auth/dto/AuthDto.java index 7b844c3..fd1deff 100644 --- a/src/main/java/com/mjsec/lms/dto/AuthDto.java +++ b/src/main/java/com/mjsec/lms/auth/dto/AuthDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.auth.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.Max; @@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.Data; +import com.mjsec.lms.user.dto.UserDto; public class AuthDto { diff --git a/src/main/java/com/mjsec/lms/dto/PendingUserDto.java b/src/main/java/com/mjsec/lms/auth/dto/PendingUserDto.java similarity index 89% rename from src/main/java/com/mjsec/lms/dto/PendingUserDto.java rename to src/main/java/com/mjsec/lms/auth/dto/PendingUserDto.java index 5616524..94edbd6 100644 --- a/src/main/java/com/mjsec/lms/dto/PendingUserDto.java +++ b/src/main/java/com/mjsec/lms/auth/dto/PendingUserDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.auth.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/repository/PendingUserRepository.java b/src/main/java/com/mjsec/lms/auth/repository/PendingUserRepository.java similarity index 83% rename from src/main/java/com/mjsec/lms/repository/PendingUserRepository.java rename to src/main/java/com/mjsec/lms/auth/repository/PendingUserRepository.java index 7f4d902..eeb3bf4 100644 --- a/src/main/java/com/mjsec/lms/repository/PendingUserRepository.java +++ b/src/main/java/com/mjsec/lms/auth/repository/PendingUserRepository.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.auth.repository; -import com.mjsec.lms.domain.PendingUser; +import com.mjsec.lms.auth.domain.PendingUser; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/mjsec/lms/service/AuthCodeService.java b/src/main/java/com/mjsec/lms/auth/service/AuthCodeService.java similarity index 95% rename from src/main/java/com/mjsec/lms/service/AuthCodeService.java rename to src/main/java/com/mjsec/lms/auth/service/AuthCodeService.java index 1a913d6..490b02c 100644 --- a/src/main/java/com/mjsec/lms/service/AuthCodeService.java +++ b/src/main/java/com/mjsec/lms/auth/service/AuthCodeService.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.auth.service; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.type.ErrorCode; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.common.type.ErrorCode; import java.util.Optional; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/mjsec/lms/service/AuthService.java b/src/main/java/com/mjsec/lms/auth/service/AuthService.java similarity index 92% rename from src/main/java/com/mjsec/lms/service/AuthService.java rename to src/main/java/com/mjsec/lms/auth/service/AuthService.java index e685695..f844672 100644 --- a/src/main/java/com/mjsec/lms/service/AuthService.java +++ b/src/main/java/com/mjsec/lms/auth/service/AuthService.java @@ -1,16 +1,17 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.PendingUser; -import com.mjsec.lms.dto.AuthDto; -import com.mjsec.lms.dto.UserDto; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.PendingUserRepository; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; +package com.mjsec.lms.auth.service; + +import com.mjsec.lms.auth.domain.PendingUser; +import com.mjsec.lms.auth.dto.AuthDto; +import com.mjsec.lms.user.dto.UserDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.auth.repository.PendingUserRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; import java.time.LocalDateTime; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import com.mjsec.lms.user.domain.User; @Slf4j @Service diff --git a/src/main/java/com/mjsec/lms/service/JwtService.java b/src/main/java/com/mjsec/lms/auth/service/JwtService.java similarity index 98% rename from src/main/java/com/mjsec/lms/service/JwtService.java rename to src/main/java/com/mjsec/lms/auth/service/JwtService.java index 8ec1fac..ec79ac1 100644 --- a/src/main/java/com/mjsec/lms/service/JwtService.java +++ b/src/main/java/com/mjsec/lms/auth/service/JwtService.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.auth.service; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts.SIG; diff --git a/src/main/java/com/mjsec/lms/controller/TestController.java b/src/main/java/com/mjsec/lms/common/api/TestController.java similarity index 91% rename from src/main/java/com/mjsec/lms/controller/TestController.java rename to src/main/java/com/mjsec/lms/common/api/TestController.java index 9bdc8ce..c605fb9 100644 --- a/src/main/java/com/mjsec/lms/controller/TestController.java +++ b/src/main/java/com/mjsec/lms/common/api/TestController.java @@ -1,9 +1,9 @@ -package com.mjsec.lms.controller; +package com.mjsec.lms.common.api; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.service.WeeklyAlertService; -import com.mjsec.lms.type.ResponseMessage; -import com.mjsec.lms.util.ValidationUtils; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.notification.service.WeeklyAlertService; +import com.mjsec.lms.common.type.ResponseMessage; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/mjsec/lms/config/AdminUserInitializer.java b/src/main/java/com/mjsec/lms/common/config/AdminUserInitializer.java similarity index 88% rename from src/main/java/com/mjsec/lms/config/AdminUserInitializer.java rename to src/main/java/com/mjsec/lms/common/config/AdminUserInitializer.java index 420e43d..5cb1413 100644 --- a/src/main/java/com/mjsec/lms/config/AdminUserInitializer.java +++ b/src/main/java/com/mjsec/lms/common/config/AdminUserInitializer.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.user.domain.type.UserRole; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/mjsec/lms/config/PasswordEncoderConfig.java b/src/main/java/com/mjsec/lms/common/config/PasswordEncoderConfig.java similarity index 91% rename from src/main/java/com/mjsec/lms/config/PasswordEncoderConfig.java rename to src/main/java/com/mjsec/lms/common/config/PasswordEncoderConfig.java index 9a0879a..62638a9 100644 --- a/src/main/java/com/mjsec/lms/config/PasswordEncoderConfig.java +++ b/src/main/java/com/mjsec/lms/common/config/PasswordEncoderConfig.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/mjsec/lms/config/RedisConfig.java b/src/main/java/com/mjsec/lms/common/config/RedisConfig.java similarity index 97% rename from src/main/java/com/mjsec/lms/config/RedisConfig.java rename to src/main/java/com/mjsec/lms/common/config/RedisConfig.java index 08cfac9..8bb4206 100644 --- a/src/main/java/com/mjsec/lms/config/RedisConfig.java +++ b/src/main/java/com/mjsec/lms/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/mjsec/lms/config/SchedulingConfig.java b/src/main/java/com/mjsec/lms/common/config/SchedulingConfig.java similarity index 84% rename from src/main/java/com/mjsec/lms/config/SchedulingConfig.java rename to src/main/java/com/mjsec/lms/common/config/SchedulingConfig.java index a239aee..83bb21f 100644 --- a/src/main/java/com/mjsec/lms/config/SchedulingConfig.java +++ b/src/main/java/com/mjsec/lms/common/config/SchedulingConfig.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/java/com/mjsec/lms/config/SecurityConfig.java b/src/main/java/com/mjsec/lms/common/config/SecurityConfig.java similarity index 94% rename from src/main/java/com/mjsec/lms/config/SecurityConfig.java rename to src/main/java/com/mjsec/lms/common/config/SecurityConfig.java index 5f704ef..0f2b633 100644 --- a/src/main/java/com/mjsec/lms/config/SecurityConfig.java +++ b/src/main/java/com/mjsec/lms/common/config/SecurityConfig.java @@ -1,10 +1,10 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.security.CustomLoginFilter; -import com.mjsec.lms.security.CustomLogoutFilter; -import com.mjsec.lms.security.JwtFilter; -import com.mjsec.lms.service.JwtService; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.security.CustomLoginFilter; +import com.mjsec.lms.common.security.CustomLogoutFilter; +import com.mjsec.lms.common.security.JwtFilter; +import com.mjsec.lms.auth.service.JwtService; import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/mjsec/lms/config/WebConfig.java b/src/main/java/com/mjsec/lms/common/config/WebConfig.java similarity index 95% rename from src/main/java/com/mjsec/lms/config/WebConfig.java rename to src/main/java/com/mjsec/lms/common/config/WebConfig.java index 5fe68f3..039d3af 100644 --- a/src/main/java/com/mjsec/lms/config/WebConfig.java +++ b/src/main/java/com/mjsec/lms/common/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.config; +package com.mjsec.lms.common.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/mjsec/lms/domain/BaseEntity.java b/src/main/java/com/mjsec/lms/common/domain/BaseEntity.java similarity index 95% rename from src/main/java/com/mjsec/lms/domain/BaseEntity.java rename to src/main/java/com/mjsec/lms/common/domain/BaseEntity.java index 761c545..7bbbd2e 100644 --- a/src/main/java/com/mjsec/lms/domain/BaseEntity.java +++ b/src/main/java/com/mjsec/lms/common/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.common.domain; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/mjsec/lms/dto/ErrorResponse.java b/src/main/java/com/mjsec/lms/common/dto/ErrorResponse.java similarity index 95% rename from src/main/java/com/mjsec/lms/dto/ErrorResponse.java rename to src/main/java/com/mjsec/lms/common/dto/ErrorResponse.java index 66ae1b3..d3b0f8a 100644 --- a/src/main/java/com/mjsec/lms/dto/ErrorResponse.java +++ b/src/main/java/com/mjsec/lms/common/dto/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.common.dto; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; diff --git a/src/main/java/com/mjsec/lms/dto/SuccessResponse.java b/src/main/java/com/mjsec/lms/common/dto/SuccessResponse.java similarity index 92% rename from src/main/java/com/mjsec/lms/dto/SuccessResponse.java rename to src/main/java/com/mjsec/lms/common/dto/SuccessResponse.java index cd7b4df..41b64bc 100644 --- a/src/main/java/com/mjsec/lms/dto/SuccessResponse.java +++ b/src/main/java/com/mjsec/lms/common/dto/SuccessResponse.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.common.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.mjsec.lms.type.ResponseMessage; +import com.mjsec.lms.common.type.ResponseMessage; import lombok.Builder; @Builder diff --git a/src/main/java/com/mjsec/lms/exception/GlobalExceptionHandler.java b/src/main/java/com/mjsec/lms/common/exception/GlobalExceptionHandler.java similarity index 93% rename from src/main/java/com/mjsec/lms/exception/GlobalExceptionHandler.java rename to src/main/java/com/mjsec/lms/common/exception/GlobalExceptionHandler.java index c7ad24d..c8e6964 100644 --- a/src/main/java/com/mjsec/lms/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/mjsec/lms/common/exception/GlobalExceptionHandler.java @@ -1,11 +1,11 @@ -package com.mjsec.lms.exception; +package com.mjsec.lms.common.exception; -import static com.mjsec.lms.type.ErrorCode.BAD_REQUEST; -import static com.mjsec.lms.type.ErrorCode.INTERNAL_SERVER_ERROR; +import static com.mjsec.lms.common.type.ErrorCode.BAD_REQUEST; +import static com.mjsec.lms.common.type.ErrorCode.INTERNAL_SERVER_ERROR; -import com.mjsec.lms.dto.ErrorResponse; -import com.mjsec.lms.dto.ErrorResponse.ValidationError; -import com.mjsec.lms.type.ErrorCode; +import com.mjsec.lms.common.dto.ErrorResponse; +import com.mjsec.lms.common.dto.ErrorResponse.ValidationError; +import com.mjsec.lms.common.type.ErrorCode; import java.util.List; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mjsec/lms/exception/RestApiException.java b/src/main/java/com/mjsec/lms/common/exception/RestApiException.java similarity index 83% rename from src/main/java/com/mjsec/lms/exception/RestApiException.java rename to src/main/java/com/mjsec/lms/common/exception/RestApiException.java index 9e66d4a..8f7e243 100644 --- a/src/main/java/com/mjsec/lms/exception/RestApiException.java +++ b/src/main/java/com/mjsec/lms/common/exception/RestApiException.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.exception; +package com.mjsec.lms.common.exception; -import com.mjsec.lms.type.ErrorCode; +import com.mjsec.lms.common.type.ErrorCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/mjsec/lms/security/CustomLoginFilter.java b/src/main/java/com/mjsec/lms/common/security/CustomLoginFilter.java similarity index 93% rename from src/main/java/com/mjsec/lms/security/CustomLoginFilter.java rename to src/main/java/com/mjsec/lms/common/security/CustomLoginFilter.java index 1f10c86..6111024 100644 --- a/src/main/java/com/mjsec/lms/security/CustomLoginFilter.java +++ b/src/main/java/com/mjsec/lms/common/security/CustomLoginFilter.java @@ -1,12 +1,12 @@ -package com.mjsec.lms.security; +package com.mjsec.lms.common.security; import com.fasterxml.jackson.databind.ObjectMapper; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.AuthDto; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.service.JwtService; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.auth.dto.AuthDto; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.auth.service.JwtService; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.user.domain.type.UserRole; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; diff --git a/src/main/java/com/mjsec/lms/security/CustomLogoutFilter.java b/src/main/java/com/mjsec/lms/common/security/CustomLogoutFilter.java similarity index 98% rename from src/main/java/com/mjsec/lms/security/CustomLogoutFilter.java rename to src/main/java/com/mjsec/lms/common/security/CustomLogoutFilter.java index 1ed04db..c3b4691 100644 --- a/src/main/java/com/mjsec/lms/security/CustomLogoutFilter.java +++ b/src/main/java/com/mjsec/lms/common/security/CustomLogoutFilter.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.security; +package com.mjsec.lms.common.security; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; diff --git a/src/main/java/com/mjsec/lms/security/JwtFilter.java b/src/main/java/com/mjsec/lms/common/security/JwtFilter.java similarity index 97% rename from src/main/java/com/mjsec/lms/security/JwtFilter.java rename to src/main/java/com/mjsec/lms/common/security/JwtFilter.java index 23d3730..e7d49e5 100644 --- a/src/main/java/com/mjsec/lms/security/JwtFilter.java +++ b/src/main/java/com/mjsec/lms/common/security/JwtFilter.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.security; +package com.mjsec.lms.common.security; -import com.mjsec.lms.service.JwtService; +import com.mjsec.lms.auth.service.JwtService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/mjsec/lms/type/ErrorCode.java b/src/main/java/com/mjsec/lms/common/type/ErrorCode.java similarity index 99% rename from src/main/java/com/mjsec/lms/type/ErrorCode.java rename to src/main/java/com/mjsec/lms/common/type/ErrorCode.java index ba635d0..303d936 100644 --- a/src/main/java/com/mjsec/lms/type/ErrorCode.java +++ b/src/main/java/com/mjsec/lms/common/type/ErrorCode.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.common.type; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/mjsec/lms/type/ResponseMessage.java b/src/main/java/com/mjsec/lms/common/type/ResponseMessage.java similarity index 97% rename from src/main/java/com/mjsec/lms/type/ResponseMessage.java rename to src/main/java/com/mjsec/lms/common/type/ResponseMessage.java index 62b20f4..ff8f7c9 100644 --- a/src/main/java/com/mjsec/lms/type/ResponseMessage.java +++ b/src/main/java/com/mjsec/lms/common/type/ResponseMessage.java @@ -1,7 +1,9 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.common.type; import lombok.AllArgsConstructor; import lombok.Getter; +import com.mjsec.lms.announcement.domain.Announcement; +import com.mjsec.lms.user.domain.User; @Getter @AllArgsConstructor diff --git a/src/main/java/com/mjsec/lms/util/FileUtils.java b/src/main/java/com/mjsec/lms/common/util/FileUtils.java similarity index 98% rename from src/main/java/com/mjsec/lms/util/FileUtils.java rename to src/main/java/com/mjsec/lms/common/util/FileUtils.java index 5516309..eb1a3ae 100644 --- a/src/main/java/com/mjsec/lms/util/FileUtils.java +++ b/src/main/java/com/mjsec/lms/common/util/FileUtils.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.util; +package com.mjsec.lms.common.util; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.type.ErrorCode; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.common.type.ErrorCode; import lombok.extern.slf4j.Slf4j; import org.apache.tika.Tika; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/mjsec/lms/util/IpUtils.java b/src/main/java/com/mjsec/lms/common/util/IpUtils.java similarity index 98% rename from src/main/java/com/mjsec/lms/util/IpUtils.java rename to src/main/java/com/mjsec/lms/common/util/IpUtils.java index 3cda1f6..46df7d4 100644 --- a/src/main/java/com/mjsec/lms/util/IpUtils.java +++ b/src/main/java/com/mjsec/lms/common/util/IpUtils.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.util; +package com.mjsec.lms.common.util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/mjsec/lms/util/JsonArrayUtils.java b/src/main/java/com/mjsec/lms/common/util/JsonArrayUtils.java similarity index 99% rename from src/main/java/com/mjsec/lms/util/JsonArrayUtils.java rename to src/main/java/com/mjsec/lms/common/util/JsonArrayUtils.java index 5b9320c..153603d 100644 --- a/src/main/java/com/mjsec/lms/util/JsonArrayUtils.java +++ b/src/main/java/com/mjsec/lms/common/util/JsonArrayUtils.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.util; +package com.mjsec.lms.common.util; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/mjsec/lms/util/ValidationUtils.java b/src/main/java/com/mjsec/lms/common/util/ValidationUtils.java similarity index 96% rename from src/main/java/com/mjsec/lms/util/ValidationUtils.java rename to src/main/java/com/mjsec/lms/common/util/ValidationUtils.java index 0bf3493..79400e8 100644 --- a/src/main/java/com/mjsec/lms/util/ValidationUtils.java +++ b/src/main/java/com/mjsec/lms/common/util/ValidationUtils.java @@ -1,12 +1,24 @@ -package com.mjsec.lms.util; - -import com.mjsec.lms.domain.*; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.GroupMemberRole; -import com.mjsec.lms.type.SubmissionStatus; -import com.mjsec.lms.type.UserRole; +package com.mjsec.lms.common.util; + +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.assignment.domain.PlanComment; +import com.mjsec.lms.assignment.domain.AssignmentSubmission; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; +import com.mjsec.lms.user.domain.type.UserRole; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/mjsec/lms/controller/ImageController.java b/src/main/java/com/mjsec/lms/media/controller/ImageController.java similarity index 93% rename from src/main/java/com/mjsec/lms/controller/ImageController.java rename to src/main/java/com/mjsec/lms/media/controller/ImageController.java index e0f034b..0e4d6cb 100644 --- a/src/main/java/com/mjsec/lms/controller/ImageController.java +++ b/src/main/java/com/mjsec/lms/media/controller/ImageController.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.controller; +package com.mjsec.lms.media.controller; -import com.mjsec.lms.dto.ImageResponse; -import com.mjsec.lms.service.ImageService; +import com.mjsec.lms.media.dto.ImageResponse; +import com.mjsec.lms.media.service.ImageService; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/mjsec/lms/dto/ImageResponse.java b/src/main/java/com/mjsec/lms/media/dto/ImageResponse.java similarity index 90% rename from src/main/java/com/mjsec/lms/dto/ImageResponse.java rename to src/main/java/com/mjsec/lms/media/dto/ImageResponse.java index 537e2dd..6b4c60e 100644 --- a/src/main/java/com/mjsec/lms/dto/ImageResponse.java +++ b/src/main/java/com/mjsec/lms/media/dto/ImageResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.media.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/mjsec/lms/service/FileService.java b/src/main/java/com/mjsec/lms/media/service/FileService.java similarity index 98% rename from src/main/java/com/mjsec/lms/service/FileService.java rename to src/main/java/com/mjsec/lms/media/service/FileService.java index 189c4bb..cf1383b 100644 --- a/src/main/java/com/mjsec/lms/service/FileService.java +++ b/src/main/java/com/mjsec/lms/media/service/FileService.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.media.service; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.util.FileUtils; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.common.util.FileUtils; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/mjsec/lms/service/ImageService.java b/src/main/java/com/mjsec/lms/media/service/ImageService.java similarity index 87% rename from src/main/java/com/mjsec/lms/service/ImageService.java rename to src/main/java/com/mjsec/lms/media/service/ImageService.java index 668a118..4d36128 100644 --- a/src/main/java/com/mjsec/lms/service/ImageService.java +++ b/src/main/java/com/mjsec/lms/media/service/ImageService.java @@ -1,16 +1,16 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyActivity; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.ImageResponse; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.GroupMemberRepository; -import com.mjsec.lms.repository.StudyActivityRepository; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.media.service; + +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.media.dto.ImageResponse; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.FileSystemResource; diff --git a/src/main/java/com/mjsec/lms/service/EmailService.java b/src/main/java/com/mjsec/lms/notification/external/EmailService.java similarity index 98% rename from src/main/java/com/mjsec/lms/service/EmailService.java rename to src/main/java/com/mjsec/lms/notification/external/EmailService.java index 34c4565..dd3bf5e 100644 --- a/src/main/java/com/mjsec/lms/service/EmailService.java +++ b/src/main/java/com/mjsec/lms/notification/external/EmailService.java @@ -1,10 +1,10 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.notification.external; -import com.mjsec.lms.domain.AssignmentNotSubmittedInfo; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.assignment.domain.AssignmentNotSubmittedInfo; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.user.domain.type.UserRole; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.beans.factory.annotation.Value; @@ -19,6 +19,7 @@ import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; +import com.mjsec.lms.attendance.service.AttendanceAlertService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/service/WikiService.java b/src/main/java/com/mjsec/lms/notification/external/WikiService.java similarity index 99% rename from src/main/java/com/mjsec/lms/service/WikiService.java rename to src/main/java/com/mjsec/lms/notification/external/WikiService.java index 987a21c..af3b22b 100644 --- a/src/main/java/com/mjsec/lms/service/WikiService.java +++ b/src/main/java/com/mjsec/lms/notification/external/WikiService.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.notification.external; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/mjsec/lms/service/ScheduledTaskService.java b/src/main/java/com/mjsec/lms/notification/service/ScheduledTaskService.java similarity index 95% rename from src/main/java/com/mjsec/lms/service/ScheduledTaskService.java rename to src/main/java/com/mjsec/lms/notification/service/ScheduledTaskService.java index dc92e6d..9691787 100644 --- a/src/main/java/com/mjsec/lms/service/ScheduledTaskService.java +++ b/src/main/java/com/mjsec/lms/notification/service/ScheduledTaskService.java @@ -1,8 +1,9 @@ -package com.mjsec.lms.service; +package com.mjsec.lms.notification.service; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import com.mjsec.lms.attendance.service.AttendanceAlertService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/service/WeeklyAlertService.java b/src/main/java/com/mjsec/lms/notification/service/WeeklyAlertService.java similarity index 90% rename from src/main/java/com/mjsec/lms/service/WeeklyAlertService.java rename to src/main/java/com/mjsec/lms/notification/service/WeeklyAlertService.java index 471a8df..01d070e 100644 --- a/src/main/java/com/mjsec/lms/service/WeeklyAlertService.java +++ b/src/main/java/com/mjsec/lms/notification/service/WeeklyAlertService.java @@ -1,8 +1,13 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.*; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.GroupMemberRole; +package com.mjsec.lms.notification.service; + +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.assignment.domain.AssignmentNotSubmittedInfo; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -10,6 +15,7 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import com.mjsec.lms.notification.external.EmailService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/controller/MentorController.java b/src/main/java/com/mjsec/lms/studygroup/controller/MentorController.java similarity index 90% rename from src/main/java/com/mjsec/lms/controller/MentorController.java rename to src/main/java/com/mjsec/lms/studygroup/controller/MentorController.java index 81de786..005f714 100644 --- a/src/main/java/com/mjsec/lms/controller/MentorController.java +++ b/src/main/java/com/mjsec/lms/studygroup/controller/MentorController.java @@ -1,15 +1,18 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.domain.Plan; -import com.mjsec.lms.dto.*; -import com.mjsec.lms.service.MentorService; -import com.mjsec.lms.service.PlanService; -import com.mjsec.lms.service.StudyGroupService; -import com.mjsec.lms.type.ResponseMessage; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.studygroup.controller; + +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.studygroup.dto.StudyGroupPutResponse; +import com.mjsec.lms.studygroup.dto.StudyGroupPutDto; +import com.mjsec.lms.assignment.dto.DetailPlanResponse; +import com.mjsec.lms.assignment.dto.PlanDto; +import com.mjsec.lms.studygroup.service.MentorService; +import com.mjsec.lms.assignment.service.PlanService; +import com.mjsec.lms.studygroup.service.StudyGroupService; +import com.mjsec.lms.common.type.ResponseMessage; +import com.mjsec.lms.common.util.ValidationUtils; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.apache.coyote.Response; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/mjsec/lms/controller/StudyGroupController.java b/src/main/java/com/mjsec/lms/studygroup/controller/StudyGroupController.java similarity index 93% rename from src/main/java/com/mjsec/lms/controller/StudyGroupController.java rename to src/main/java/com/mjsec/lms/studygroup/controller/StudyGroupController.java index e8f3bb5..dd42369 100644 --- a/src/main/java/com/mjsec/lms/controller/StudyGroupController.java +++ b/src/main/java/com/mjsec/lms/studygroup/controller/StudyGroupController.java @@ -1,9 +1,16 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.dto.*; -import com.mjsec.lms.service.StudyGroupService; -import com.mjsec.lms.type.ResponseMessage; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.studygroup.controller; + +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.studygroup.dto.StudyMemberResponse; +import com.mjsec.lms.studygroup.dto.StudyMemberWarnResponse; +import com.mjsec.lms.studygroup.dto.StudyActivityDto; +import com.mjsec.lms.studygroup.dto.StudyActivityResponse; +import com.mjsec.lms.studygroup.dto.SimpleStudyActivityResponse; +import com.mjsec.lms.admin.dto.AllStudyGroupDto; +import com.mjsec.lms.studygroup.dto.StudyGroupDetailDto; +import com.mjsec.lms.studygroup.service.StudyGroupService; +import com.mjsec.lms.common.type.ResponseMessage; +import com.mjsec.lms.common.util.ValidationUtils; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/mjsec/lms/domain/GroupMember.java b/src/main/java/com/mjsec/lms/studygroup/domain/GroupMember.java similarity index 84% rename from src/main/java/com/mjsec/lms/domain/GroupMember.java rename to src/main/java/com/mjsec/lms/studygroup/domain/GroupMember.java index b9e3974..187ae03 100644 --- a/src/main/java/com/mjsec/lms/domain/GroupMember.java +++ b/src/main/java/com/mjsec/lms/studygroup/domain/GroupMember.java @@ -1,11 +1,13 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.studygroup.domain; -import com.mjsec.lms.type.GroupMemberRole; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLRestriction; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/domain/StudyActivity.java b/src/main/java/com/mjsec/lms/studygroup/domain/StudyActivity.java similarity index 89% rename from src/main/java/com/mjsec/lms/domain/StudyActivity.java rename to src/main/java/com/mjsec/lms/studygroup/domain/StudyActivity.java index 36b0afd..be11a73 100644 --- a/src/main/java/com/mjsec/lms/domain/StudyActivity.java +++ b/src/main/java/com/mjsec/lms/studygroup/domain/StudyActivity.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.studygroup.domain; import jakarta.persistence.*; import lombok.*; @@ -8,6 +8,9 @@ import java.util.ArrayList; import java.util.List; +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/domain/StudyGroup.java b/src/main/java/com/mjsec/lms/studygroup/domain/StudyGroup.java similarity index 86% rename from src/main/java/com/mjsec/lms/domain/StudyGroup.java rename to src/main/java/com/mjsec/lms/studygroup/domain/StudyGroup.java index cff1ea3..0305d72 100644 --- a/src/main/java/com/mjsec/lms/domain/StudyGroup.java +++ b/src/main/java/com/mjsec/lms/studygroup/domain/StudyGroup.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.studygroup.domain; -import com.mjsec.lms.type.StudyStatus; +import com.mjsec.lms.studygroup.domain.type.StudyStatus; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; @@ -9,6 +9,9 @@ import java.util.ArrayList; import java.util.List; +import com.mjsec.lms.assignment.domain.Plan; +import com.mjsec.lms.common.domain.BaseEntity; +import com.mjsec.lms.user.domain.User; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/type/GroupMemberRole.java b/src/main/java/com/mjsec/lms/studygroup/domain/type/GroupMemberRole.java similarity index 54% rename from src/main/java/com/mjsec/lms/type/GroupMemberRole.java rename to src/main/java/com/mjsec/lms/studygroup/domain/type/GroupMemberRole.java index 343fe64..8d6dd6a 100644 --- a/src/main/java/com/mjsec/lms/type/GroupMemberRole.java +++ b/src/main/java/com/mjsec/lms/studygroup/domain/type/GroupMemberRole.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.studygroup.domain.type; public enum GroupMemberRole { MENTOR, diff --git a/src/main/java/com/mjsec/lms/type/StudyStatus.java b/src/main/java/com/mjsec/lms/studygroup/domain/type/StudyStatus.java similarity index 54% rename from src/main/java/com/mjsec/lms/type/StudyStatus.java rename to src/main/java/com/mjsec/lms/studygroup/domain/type/StudyStatus.java index 730e58c..bc7356c 100644 --- a/src/main/java/com/mjsec/lms/type/StudyStatus.java +++ b/src/main/java/com/mjsec/lms/studygroup/domain/type/StudyStatus.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.studygroup.domain.type; public enum StudyStatus { INACTIVE, diff --git a/src/main/java/com/mjsec/lms/dto/SimpleStudyActivityResponse.java b/src/main/java/com/mjsec/lms/studygroup/dto/SimpleStudyActivityResponse.java similarity index 89% rename from src/main/java/com/mjsec/lms/dto/SimpleStudyActivityResponse.java rename to src/main/java/com/mjsec/lms/studygroup/dto/SimpleStudyActivityResponse.java index 00890bb..0a9690e 100644 --- a/src/main/java/com/mjsec/lms/dto/SimpleStudyActivityResponse.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/SimpleStudyActivityResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyActivityDto.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityDto.java similarity index 85% rename from src/main/java/com/mjsec/lms/dto/StudyActivityDto.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityDto.java index 4ed6c48..0165b0d 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyActivityDto.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -6,6 +6,7 @@ import lombok.Data; import java.util.List; +import com.mjsec.lms.attendance.dto.StudyAttendanceDto; @Data @Builder diff --git a/src/main/java/com/mjsec/lms/dto/StudyActivityResponse.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityResponse.java similarity index 83% rename from src/main/java/com/mjsec/lms/dto/StudyActivityResponse.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityResponse.java index 691b47b..8d5e158 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyActivityResponse.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyActivityResponse.java @@ -1,10 +1,11 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; import lombok.Builder; import lombok.Data; import java.time.LocalDateTime; import java.util.List; +import com.mjsec.lms.attendance.dto.StudyAttendanceDto; //스터디 활동 글 @Data diff --git a/src/main/java/com/mjsec/lms/dto/StudyGroupDetailDto.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDetailDto.java similarity index 89% rename from src/main/java/com/mjsec/lms/dto/StudyGroupDetailDto.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDetailDto.java index d15bc6b..620eb82 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyGroupDetailDto.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDetailDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; -import com.mjsec.lms.type.StudyStatus; +import com.mjsec.lms.studygroup.domain.type.StudyStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyGroupDto.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDto.java similarity index 96% rename from src/main/java/com/mjsec/lms/dto/StudyGroupDto.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDto.java index 51fa5e8..09b73b6 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyGroupDto.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; -import com.mjsec.lms.type.Category; +import com.mjsec.lms.assignment.domain.type.Category; import jakarta.validation.constraints.*; import lombok.Data; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/mjsec/lms/dto/StudyGroupPutDto.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutDto.java similarity index 73% rename from src/main/java/com/mjsec/lms/dto/StudyGroupPutDto.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutDto.java index d01991d..40fe264 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyGroupPutDto.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutDto.java @@ -1,6 +1,5 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; -import com.mjsec.lms.type.StudyStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyGroupPutResponse.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutResponse.java similarity index 78% rename from src/main/java/com/mjsec/lms/dto/StudyGroupPutResponse.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutResponse.java index 0d3f3d6..51fcb0a 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyGroupPutResponse.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupPutResponse.java @@ -1,6 +1,5 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; -import com.mjsec.lms.type.StudyStatus; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyGroupSummaryDto.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupSummaryDto.java similarity index 86% rename from src/main/java/com/mjsec/lms/dto/StudyGroupSummaryDto.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupSummaryDto.java index 2aa92b5..7c89d3c 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyGroupSummaryDto.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyGroupSummaryDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyMemberResponse.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberResponse.java similarity index 73% rename from src/main/java/com/mjsec/lms/dto/StudyMemberResponse.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberResponse.java index d24b001..7edb085 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyMemberResponse.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberResponse.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; -import com.mjsec.lms.type.GroupMemberRole; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/dto/StudyMemberWarnResponse.java b/src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberWarnResponse.java similarity index 87% rename from src/main/java/com/mjsec/lms/dto/StudyMemberWarnResponse.java rename to src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberWarnResponse.java index 36d93b3..4995b06 100644 --- a/src/main/java/com/mjsec/lms/dto/StudyMemberWarnResponse.java +++ b/src/main/java/com/mjsec/lms/studygroup/dto/StudyMemberWarnResponse.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.studygroup.dto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/mjsec/lms/repository/GroupMemberRepository.java b/src/main/java/com/mjsec/lms/studygroup/repository/GroupMemberRepository.java similarity index 87% rename from src/main/java/com/mjsec/lms/repository/GroupMemberRepository.java rename to src/main/java/com/mjsec/lms/studygroup/repository/GroupMemberRepository.java index 3a83620..0ffa6a9 100644 --- a/src/main/java/com/mjsec/lms/repository/GroupMemberRepository.java +++ b/src/main/java/com/mjsec/lms/studygroup/repository/GroupMemberRepository.java @@ -1,9 +1,9 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.studygroup.repository; -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.type.GroupMemberRole; +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/repository/StudyActivityRepository.java b/src/main/java/com/mjsec/lms/studygroup/repository/StudyActivityRepository.java similarity index 89% rename from src/main/java/com/mjsec/lms/repository/StudyActivityRepository.java rename to src/main/java/com/mjsec/lms/studygroup/repository/StudyActivityRepository.java index fa9d234..2f7e521 100644 --- a/src/main/java/com/mjsec/lms/repository/StudyActivityRepository.java +++ b/src/main/java/com/mjsec/lms/studygroup/repository/StudyActivityRepository.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.studygroup.repository; -import com.mjsec.lms.domain.StudyActivity; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/mjsec/lms/repository/StudyGroupRepository.java b/src/main/java/com/mjsec/lms/studygroup/repository/StudyGroupRepository.java similarity index 86% rename from src/main/java/com/mjsec/lms/repository/StudyGroupRepository.java rename to src/main/java/com/mjsec/lms/studygroup/repository/StudyGroupRepository.java index 6a8473b..c0202ce 100644 --- a/src/main/java/com/mjsec/lms/repository/StudyGroupRepository.java +++ b/src/main/java/com/mjsec/lms/studygroup/repository/StudyGroupRepository.java @@ -1,7 +1,7 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.studygroup.repository; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/mjsec/lms/service/MentorService.java b/src/main/java/com/mjsec/lms/studygroup/service/MentorService.java similarity index 89% rename from src/main/java/com/mjsec/lms/service/MentorService.java rename to src/main/java/com/mjsec/lms/studygroup/service/MentorService.java index a247e85..c934fb4 100644 --- a/src/main/java/com/mjsec/lms/service/MentorService.java +++ b/src/main/java/com/mjsec/lms/studygroup/service/MentorService.java @@ -1,27 +1,28 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.StudyGroupPutDto; -import com.mjsec.lms.dto.StudyGroupPutResponse; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.AttendanceRepository; -import com.mjsec.lms.repository.GroupMemberRepository; -import com.mjsec.lms.repository.PlanCommentRepository; -import com.mjsec.lms.repository.StudyActivityRepository; -import com.mjsec.lms.repository.StudyGroupRepository; -import com.mjsec.lms.repository.SubmissionRepository; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.UserRole; +package com.mjsec.lms.studygroup.service; + +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.dto.StudyGroupPutDto; +import com.mjsec.lms.studygroup.dto.StudyGroupPutResponse; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.user.domain.type.UserRole; import java.util.List; import java.util.Objects; -import com.mjsec.lms.util.ValidationUtils; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import com.mjsec.lms.media.service.FileService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/service/StudyGroupService.java b/src/main/java/com/mjsec/lms/studygroup/service/StudyGroupService.java similarity index 94% rename from src/main/java/com/mjsec/lms/service/StudyGroupService.java rename to src/main/java/com/mjsec/lms/studygroup/service/StudyGroupService.java index 4dcce94..06d7279 100644 --- a/src/main/java/com/mjsec/lms/service/StudyGroupService.java +++ b/src/main/java/com/mjsec/lms/studygroup/service/StudyGroupService.java @@ -1,13 +1,28 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.*; -import com.mjsec.lms.dto.*; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.GroupMemberRole; -import com.mjsec.lms.util.JsonArrayUtils; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.studygroup.service; + +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.attendance.domain.Attendance; +import com.mjsec.lms.studygroup.dto.StudyMemberResponse; +import com.mjsec.lms.studygroup.dto.StudyMemberWarnResponse; +import com.mjsec.lms.studygroup.dto.StudyActivityDto; +import com.mjsec.lms.studygroup.dto.StudyActivityResponse; +import com.mjsec.lms.studygroup.dto.SimpleStudyActivityResponse; +import com.mjsec.lms.studygroup.dto.StudyGroupDetailDto; +import com.mjsec.lms.attendance.dto.StudyAttendanceDto; +import com.mjsec.lms.admin.dto.AllStudyGroupDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; +import com.mjsec.lms.common.util.JsonArrayUtils; +import com.mjsec.lms.common.util.ValidationUtils; import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -17,6 +32,7 @@ import java.time.LocalDate; import java.util.List; import java.util.stream.Collectors; +import com.mjsec.lms.media.service.FileService; @Service @Slf4j diff --git a/src/main/java/com/mjsec/lms/controller/UserController.java b/src/main/java/com/mjsec/lms/user/controller/UserController.java similarity index 88% rename from src/main/java/com/mjsec/lms/controller/UserController.java rename to src/main/java/com/mjsec/lms/user/controller/UserController.java index 9ebe5fa..11479b1 100644 --- a/src/main/java/com/mjsec/lms/controller/UserController.java +++ b/src/main/java/com/mjsec/lms/user/controller/UserController.java @@ -1,15 +1,15 @@ -package com.mjsec.lms.controller; - -import com.mjsec.lms.dto.PasswordUpdateDto; -import com.mjsec.lms.dto.SuccessResponse; -import com.mjsec.lms.dto.UserResponse; -import com.mjsec.lms.dto.UserUpdateDto; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.service.AuthCodeService; -import com.mjsec.lms.service.EmailService; -import com.mjsec.lms.service.UserService; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.ResponseMessage; +package com.mjsec.lms.user.controller; + +import com.mjsec.lms.user.dto.PasswordUpdateDto; +import com.mjsec.lms.common.dto.SuccessResponse; +import com.mjsec.lms.user.dto.UserResponse; +import com.mjsec.lms.user.dto.UserUpdateDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.auth.service.AuthCodeService; +import com.mjsec.lms.notification.external.EmailService; +import com.mjsec.lms.user.service.UserService; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.common.type.ResponseMessage; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/mjsec/lms/domain/User.java b/src/main/java/com/mjsec/lms/user/domain/User.java similarity index 91% rename from src/main/java/com/mjsec/lms/domain/User.java rename to src/main/java/com/mjsec/lms/user/domain/User.java index 718ea99..3796972 100644 --- a/src/main/java/com/mjsec/lms/domain/User.java +++ b/src/main/java/com/mjsec/lms/user/domain/User.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.domain; +package com.mjsec.lms.user.domain; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.user.domain.type.UserRole; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -17,6 +17,7 @@ import lombok.experimental.SuperBuilder; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLRestriction; +import com.mjsec.lms.common.domain.BaseEntity; @Entity @Getter diff --git a/src/main/java/com/mjsec/lms/type/UserRole.java b/src/main/java/com/mjsec/lms/user/domain/type/UserRole.java similarity index 58% rename from src/main/java/com/mjsec/lms/type/UserRole.java rename to src/main/java/com/mjsec/lms/user/domain/type/UserRole.java index 1a0b35d..11b94e6 100644 --- a/src/main/java/com/mjsec/lms/type/UserRole.java +++ b/src/main/java/com/mjsec/lms/user/domain/type/UserRole.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.type; +package com.mjsec.lms.user.domain.type; public enum UserRole { ROLE_USER, diff --git a/src/main/java/com/mjsec/lms/dto/PasswordUpdateDto.java b/src/main/java/com/mjsec/lms/user/dto/PasswordUpdateDto.java similarity index 95% rename from src/main/java/com/mjsec/lms/dto/PasswordUpdateDto.java rename to src/main/java/com/mjsec/lms/user/dto/PasswordUpdateDto.java index 8515ee3..2f5c80b 100644 --- a/src/main/java/com/mjsec/lms/dto/PasswordUpdateDto.java +++ b/src/main/java/com/mjsec/lms/user/dto/PasswordUpdateDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.user.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/mjsec/lms/dto/UserDto.java b/src/main/java/com/mjsec/lms/user/dto/UserDto.java similarity index 95% rename from src/main/java/com/mjsec/lms/dto/UserDto.java rename to src/main/java/com/mjsec/lms/user/dto/UserDto.java index 51ee43b..e82b878 100644 --- a/src/main/java/com/mjsec/lms/dto/UserDto.java +++ b/src/main/java/com/mjsec/lms/user/dto/UserDto.java @@ -1,6 +1,6 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.user.dto; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.user.domain.User; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/src/main/java/com/mjsec/lms/dto/UserResponse.java b/src/main/java/com/mjsec/lms/user/dto/UserResponse.java similarity index 82% rename from src/main/java/com/mjsec/lms/dto/UserResponse.java rename to src/main/java/com/mjsec/lms/user/dto/UserResponse.java index d0f9bfa..c868263 100644 --- a/src/main/java/com/mjsec/lms/dto/UserResponse.java +++ b/src/main/java/com/mjsec/lms/user/dto/UserResponse.java @@ -1,10 +1,11 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.user.dto; import lombok.Builder; import lombok.Data; import java.time.LocalDateTime; import java.util.List; +import com.mjsec.lms.studygroup.dto.StudyGroupSummaryDto; @Data @Builder diff --git a/src/main/java/com/mjsec/lms/dto/UserUpdateDto.java b/src/main/java/com/mjsec/lms/user/dto/UserUpdateDto.java similarity index 94% rename from src/main/java/com/mjsec/lms/dto/UserUpdateDto.java rename to src/main/java/com/mjsec/lms/user/dto/UserUpdateDto.java index f75f1ee..023051c 100644 --- a/src/main/java/com/mjsec/lms/dto/UserUpdateDto.java +++ b/src/main/java/com/mjsec/lms/user/dto/UserUpdateDto.java @@ -1,4 +1,4 @@ -package com.mjsec.lms.dto; +package com.mjsec.lms.user.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/com/mjsec/lms/repository/UserRepository.java b/src/main/java/com/mjsec/lms/user/repository/UserRepository.java similarity index 87% rename from src/main/java/com/mjsec/lms/repository/UserRepository.java rename to src/main/java/com/mjsec/lms/user/repository/UserRepository.java index 0acdd7b..301fb61 100644 --- a/src/main/java/com/mjsec/lms/repository/UserRepository.java +++ b/src/main/java/com/mjsec/lms/user/repository/UserRepository.java @@ -1,11 +1,11 @@ -package com.mjsec.lms.repository; +package com.mjsec.lms.user.repository; -import com.mjsec.lms.domain.User; +import com.mjsec.lms.user.domain.User; import java.util.List; import java.util.Optional; -import com.mjsec.lms.type.UserRole; +import com.mjsec.lms.user.domain.type.UserRole; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/mjsec/lms/service/UserService.java b/src/main/java/com/mjsec/lms/user/service/UserService.java similarity index 89% rename from src/main/java/com/mjsec/lms/service/UserService.java rename to src/main/java/com/mjsec/lms/user/service/UserService.java index 0159df6..6dfb816 100644 --- a/src/main/java/com/mjsec/lms/service/UserService.java +++ b/src/main/java/com/mjsec/lms/user/service/UserService.java @@ -1,17 +1,17 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyActivity; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.dto.StudyActivityDto; -import com.mjsec.lms.dto.StudyGroupSummaryDto; -import com.mjsec.lms.dto.UserResponse; -import com.mjsec.lms.dto.UserUpdateDto; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.GroupMemberRepository; -import com.mjsec.lms.repository.UserRepository; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.user.service; + +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyActivity; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.studygroup.dto.StudyActivityDto; +import com.mjsec.lms.studygroup.dto.StudyGroupSummaryDto; +import com.mjsec.lms.user.dto.UserResponse; +import com.mjsec.lms.user.dto.UserUpdateDto; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.common.util.ValidationUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -20,6 +20,7 @@ import java.util.Objects; import java.util.stream.Collectors; import org.springframework.web.multipart.MultipartFile; +import com.mjsec.lms.media.service.FileService; @Service @Slf4j diff --git a/src/test/java/com/mjsec/lms/util/ValidationUtilsAdminBypassTest.java b/src/test/java/com/mjsec/lms/common/util/ValidationUtilsAdminBypassTest.java similarity index 94% rename from src/test/java/com/mjsec/lms/util/ValidationUtilsAdminBypassTest.java rename to src/test/java/com/mjsec/lms/common/util/ValidationUtilsAdminBypassTest.java index 5b87b81..c3e1238 100644 --- a/src/test/java/com/mjsec/lms/util/ValidationUtilsAdminBypassTest.java +++ b/src/test/java/com/mjsec/lms/common/util/ValidationUtilsAdminBypassTest.java @@ -1,13 +1,20 @@ -package com.mjsec.lms.util; - -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.GroupMemberRole; -import com.mjsec.lms.type.UserRole; +package com.mjsec.lms.common.util; + +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.studygroup.domain.type.GroupMemberRole; +import com.mjsec.lms.user.domain.type.UserRole; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/mjsec/lms/util/ValidationUtilsStatusTransitionTest.java b/src/test/java/com/mjsec/lms/common/util/ValidationUtilsStatusTransitionTest.java similarity index 93% rename from src/test/java/com/mjsec/lms/util/ValidationUtilsStatusTransitionTest.java rename to src/test/java/com/mjsec/lms/common/util/ValidationUtilsStatusTransitionTest.java index cca8ba6..815e135 100644 --- a/src/test/java/com/mjsec/lms/util/ValidationUtilsStatusTransitionTest.java +++ b/src/test/java/com/mjsec/lms/common/util/ValidationUtilsStatusTransitionTest.java @@ -1,8 +1,8 @@ -package com.mjsec.lms.util; +package com.mjsec.lms.common.util; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.SubmissionStatus; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.assignment.domain.type.SubmissionStatus; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -11,7 +11,14 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import com.mjsec.lms.repository.*; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/com/mjsec/lms/service/MentorServiceAdminBypassTest.java b/src/test/java/com/mjsec/lms/studygroup/service/MentorServiceAdminBypassTest.java similarity index 93% rename from src/test/java/com/mjsec/lms/service/MentorServiceAdminBypassTest.java rename to src/test/java/com/mjsec/lms/studygroup/service/MentorServiceAdminBypassTest.java index 771f865..7fc39cb 100644 --- a/src/test/java/com/mjsec/lms/service/MentorServiceAdminBypassTest.java +++ b/src/test/java/com/mjsec/lms/studygroup/service/MentorServiceAdminBypassTest.java @@ -1,13 +1,20 @@ -package com.mjsec.lms.service; - -import com.mjsec.lms.domain.GroupMember; -import com.mjsec.lms.domain.StudyGroup; -import com.mjsec.lms.domain.User; -import com.mjsec.lms.exception.RestApiException; -import com.mjsec.lms.repository.*; -import com.mjsec.lms.type.ErrorCode; -import com.mjsec.lms.type.UserRole; -import com.mjsec.lms.util.ValidationUtils; +package com.mjsec.lms.studygroup.service; + +import com.mjsec.lms.studygroup.domain.GroupMember; +import com.mjsec.lms.studygroup.domain.StudyGroup; +import com.mjsec.lms.user.domain.User; +import com.mjsec.lms.common.exception.RestApiException; +import com.mjsec.lms.user.repository.UserRepository; +import com.mjsec.lms.studygroup.repository.StudyGroupRepository; +import com.mjsec.lms.studygroup.repository.GroupMemberRepository; +import com.mjsec.lms.assignment.repository.SubmissionRepository; +import com.mjsec.lms.assignment.repository.PlanCommentRepository; +import com.mjsec.lms.attendance.repository.AttendanceRepository; +import com.mjsec.lms.studygroup.repository.StudyActivityRepository; +import com.mjsec.lms.assignment.repository.PlanRepository; +import com.mjsec.lms.common.type.ErrorCode; +import com.mjsec.lms.user.domain.type.UserRole; +import com.mjsec.lms.common.util.ValidationUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -21,6 +28,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; +import com.mjsec.lms.media.service.FileService; @ExtendWith(MockitoExtension.class) @DisplayName("MentorService - 어드민 bypass 테스트")