Skip to content

Fix: 파일 구조 변경 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minsoo0506 merged 2 commits into from
Mar 10, 2026
Merged

Fix: 파일 구조 변경 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6674d2
Fix: 파일 구조 변경
tember8003 Mar 3, 2026
62b785e
Fix: 어드민도 과제 제출 상세 확인 가능
tember8003 Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions ...mjsec/lms/controller/AdminController.java → ...lms/admin/controller/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...a/com/mjsec/lms/dto/AllStudyGroupDto.java → ...mjsec/lms/admin/dto/AllStudyGroupDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...m/mjsec/lms/dto/UserAdminResponseDto.java → ...c/lms/admin/dto/UserAdminResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.admin.dto;

import lombok.Builder;
import lombok.Data;
Expand Down
65 changes: 33 additions & 32 deletions ...a/com/mjsec/lms/service/AdminService.java → ...mjsec/lms/admin/service/AdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions ...ms/controller/AnnouncementController.java → ...nt/controller/AnnouncementController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
9 changes: 4 additions & 5 deletions ...va/com/mjsec/lms/domain/Announcement.java → ...lms/announcement/domain/Announcement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../com/mjsec/lms/type/AnnouncementRole.java → ...ncement/domain/type/AnnouncementRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.type;
package com.mjsec.lms.announcement.domain.type;

public enum AnnouncementRole {
NOTICE,
Expand Down
8 changes: 3 additions & 5 deletions .../mjsec/lms/mapper/AnnouncementMapper.java → .../announcement/dto/AnnouncementMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
5 changes: 2 additions & 3 deletions ...mjsec/lms/dto/AnnouncementRequestDto.java → ...ouncement/dto/AnnouncementRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...jsec/lms/dto/AnnouncementResponseDto.java → ...uncement/dto/AnnouncementResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...ms/repository/AnnouncementRepository.java → ...nt/repository/AnnouncementRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
24 changes: 12 additions & 12 deletions ...jsec/lms/service/AnnouncementService.java → ...uncement/service/AnnouncementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
29 changes: 19 additions & 10 deletions .../lms/controller/AssignmentController.java → ...ment/controller/AssignmentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ms/domain/AssignmentNotSubmittedInfo.java → ...nt/domain/AssignmentNotSubmittedInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.domain;
package com.mjsec.lms.assignment.domain;

import lombok.*;

Expand Down
6 changes: 4 additions & 2 deletions ...jsec/lms/domain/AssignmentSubmission.java → ...signment/domain/AssignmentSubmission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/mjsec/lms/domain/Plan.java → ...com/mjsec/lms/assignment/domain/Plan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.domain;
package com.mjsec.lms.assignment.domain;

import jakarta.persistence.*;
import lombok.*;
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ...ava/com/mjsec/lms/domain/PlanComment.java → ...ec/lms/assignment/domain/PlanComment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/mjsec/lms/type/Category.java → .../lms/assignment/domain/type/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.type;
package com.mjsec.lms.assignment.domain.type;

public enum Category {
WEB("웹 해킹"),
Expand Down
2 changes: 1 addition & 1 deletion .../com/mjsec/lms/type/SubmissionStatus.java → ...ignment/domain/type/SubmissionStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.type;
package com.mjsec.lms.assignment.domain.type;

public enum SubmissionStatus {
SUBMITTED,
Expand Down
2 changes: 1 addition & 1 deletion ...com/mjsec/lms/dto/DetailPlanResponse.java → ...ms/assignment/dto/DetailPlanResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.assignment.dto;

import lombok.Builder;
import lombok.Data;
Expand Down
4 changes: 2 additions & 2 deletions ...sec/lms/dto/DetailSubmissionResponse.java → ...ignment/dto/DetailSubmissionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/mjsec/lms/dto/PlanCommentDto.java → ...ec/lms/assignment/dto/PlanCommentDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.assignment.dto;

import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...om/mjsec/lms/dto/PlanCommentResponse.java → ...s/assignment/dto/PlanCommentResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.assignment.dto;

import lombok.Builder;
import lombok.Data;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mjsec/lms/dto/PlanDto.java → ...com/mjsec/lms/assignment/dto/PlanDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/mjsec/lms/dto/PlanResponse.java → ...jsec/lms/assignment/dto/PlanResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.assignment.dto;

import lombok.Builder;
import lombok.Data;
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/mjsec/lms/dto/SubmissionDto.java → ...sec/lms/assignment/dto/SubmissionDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mjsec.lms.dto;
package com.mjsec.lms.assignment.dto;

import jakarta.validation.constraints.NotBlank;
import lombok.Builder;
Expand Down
4 changes: 2 additions & 2 deletions .../mjsec/lms/dto/SubmissionFeedbackDto.java → ...assignment/dto/SubmissionFeedbackDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading