Merge pull request #222 from sopt-makers/sohyeon_#221

[CHORE] 패키지 리팩토링

src/main/java/org/sopt/makers/operation/security/config/SecurityConfig.java → src/main/java/org/sopt/makers/operation/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.security.config;
+package org.sopt.makers.operation.config;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;

src/main/java/org/sopt/makers/operation/dto/admin/LoginResponseDTO.java

@@ -1,8 +1,8 @@
 package org.sopt.makers.operation.dto.admin;
 
 import lombok.Builder;
-import org.sopt.makers.operation.entity.Admin;
-import org.sopt.makers.operation.entity.AdminStatus;
+import org.sopt.makers.operation.entity.admin.Admin;
+import org.sopt.makers.operation.entity.admin.AdminStatus;
 
 @Builder
 public record LoginResponseDTO(LoginResponseVO loginResponseVO, String refreshToken) {

src/main/java/org/sopt/makers/operation/dto/admin/SignUpRequestDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.admin;
 
-import org.sopt.makers.operation.entity.Role;
+import org.sopt.makers.operation.entity.admin.Role;
 
 public record SignUpRequestDTO(
         String email,

src/main/java/org/sopt/makers/operation/dto/admin/SignUpResponseDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.admin;
 
-import org.sopt.makers.operation.entity.Role;
+import org.sopt.makers.operation.entity.admin.Role;
 
 public record SignUpResponseDTO(
         Long id,

src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java

@@ -2,9 +2,9 @@
 
 import java.util.List;
 
-import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.Member;
-import org.sopt.makers.operation.entity.SubAttendance;
+import org.sopt.makers.operation.entity.attendance.Attendance;
+import org.sopt.makers.operation.entity.member.Member;
+import org.sopt.makers.operation.entity.attendance.SubAttendance;
 
 public record AttendanceMemberResponseDTO(
 	String name,

src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalResponseDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import org.sopt.makers.operation.entity.Member;
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.Part;
 
 import java.util.List;

src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalVO.java

@@ -1,7 +1,7 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.AttendanceStatus;
+import org.sopt.makers.operation.entity.attendance.Attendance;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
 import org.sopt.makers.operation.entity.lecture.Attribute;
 
 import java.time.format.DateTimeFormatter;

src/main/java/org/sopt/makers/operation/dto/attendance/AttendancesResponseDTO.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.sopt.makers.operation.entity.Attendance;
+import org.sopt.makers.operation.entity.attendance.Attendance;
 
 public record AttendancesResponseDTO(
 	List<MemberResponseDTO> attendances,

src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java

@@ -2,10 +2,10 @@
 
 import java.util.List;
 
-import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.AttendanceStatus;
-import org.sopt.makers.operation.entity.Member;
-import org.sopt.makers.operation.entity.SubAttendance;
+import org.sopt.makers.operation.entity.attendance.Attendance;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
+import org.sopt.makers.operation.entity.member.Member;
+import org.sopt.makers.operation.entity.attendance.SubAttendance;
 
 public record MemberResponseDTO (
 	Long attendanceId,

src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import org.sopt.makers.operation.entity.AttendanceStatus;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
 
 public record SubAttendanceUpdateRequestDTO(
 	Long subAttendanceId,

src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java

@@ -1,7 +1,7 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import org.sopt.makers.operation.entity.AttendanceStatus;
-import org.sopt.makers.operation.entity.SubAttendance;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
+import org.sopt.makers.operation.entity.attendance.SubAttendance;
 
 public record SubAttendanceUpdateResponseDTO(
 	Long subAttendanceId,

src/main/java/org/sopt/makers/operation/dto/lecture/AttendanceResponseDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.lecture;
 
-import org.sopt.makers.operation.entity.SubLecture;
+import org.sopt.makers.operation.entity.lecture.SubLecture;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
 import lombok.Builder;

src/main/java/org/sopt/makers/operation/dto/lecture/AttendancesStatusVO.java

@@ -1,10 +1,10 @@
 package org.sopt.makers.operation.dto.lecture;
 
-import static org.sopt.makers.operation.entity.AttendanceStatus.*;
+import static org.sopt.makers.operation.entity.attendance.AttendanceStatus.*;
 
 import java.time.LocalDateTime;
 
-import org.sopt.makers.operation.entity.AttendanceStatus;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
 import lombok.Builder;

src/main/java/org/sopt/makers/operation/dto/lecture/LectureCurrentRoundResponseDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.lecture;
 
-import org.sopt.makers.operation.entity.SubLecture;
+import org.sopt.makers.operation.entity.lecture.SubLecture;
 
 public record LectureCurrentRoundResponseDTO(
         Long id,

src/main/java/org/sopt/makers/operation/dto/lecture/LectureResponseDTO.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 import org.sopt.makers.operation.entity.Part;
-import org.sopt.makers.operation.entity.SubLecture;
+import org.sopt.makers.operation.entity.lecture.SubLecture;
 import org.sopt.makers.operation.entity.lecture.Attribute;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.sopt.makers.operation.entity.lecture.LectureStatus;

src/main/java/org/sopt/makers/operation/dto/lecture/LectureSearchCondition.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.lecture;
 
-import org.sopt.makers.operation.entity.Member;
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.Part;
 
 public record LectureSearchCondition(Part part, int generation, Long memberId) {

src/main/java/org/sopt/makers/operation/dto/lecture/TodayLectureResponseDTO.java

@@ -1,8 +1,8 @@
 package org.sopt.makers.operation.dto.lecture;
 
 import lombok.Builder;
-import org.sopt.makers.operation.entity.AttendanceStatus;
-import org.sopt.makers.operation.entity.SubAttendance;
+import org.sopt.makers.operation.entity.attendance.AttendanceStatus;
+import org.sopt.makers.operation.entity.attendance.SubAttendance;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
 import java.time.LocalDateTime;

src/main/java/org/sopt/makers/operation/dto/member/MemberListGetResponse.java

@@ -1,7 +1,7 @@
 package org.sopt.makers.operation.dto.member;
 
 import org.sopt.makers.operation.dto.attendance.AttendanceTotalCountVO;
-import org.sopt.makers.operation.entity.Member;
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.Part;
 
 public record MemberListGetResponse(

src/main/java/org/sopt/makers/operation/dto/member/MemberRequestDTO.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.dto.member;
 
-import org.sopt.makers.operation.entity.ObYb;
+import org.sopt.makers.operation.entity.member.ObYb;
 import org.sopt.makers.operation.entity.Part;
 
 public record MemberRequestDTO(

src/main/java/org/sopt/makers/operation/entity/Admin.java → src/main/java/org/sopt/makers/operation/entity/admin/Admin.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.admin;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/org/sopt/makers/operation/entity/AdminStatus.java → src/main/java/org/sopt/makers/operation/entity/admin/AdminStatus.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.admin;
 
 public enum AdminStatus {
     DEVELOPER, SOPT, MAKERS, NOT_CERTIFIED

src/main/java/org/sopt/makers/operation/entity/Role.java → src/main/java/org/sopt/makers/operation/entity/admin/Role.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.admin;
 
 public enum Role {
     OPERATION_TEAM, PRESIDENT, VICE_PRESIDENT, AFFAIRS, MANAGE, MEDIA, PLAN, DESIGN, WEB, ANDROID, IOS, SERVER, MAKERS

src/main/java/org/sopt/makers/operation/entity/Attendance.java → src/main/java/org/sopt/makers/operation/entity/attendance/Attendance.java

@@ -1,8 +1,8 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.attendance;
 
 import static javax.persistence.GenerationType.*;
 import static org.sopt.makers.operation.common.ExceptionMessage.*;
-import static org.sopt.makers.operation.entity.AttendanceStatus.*;
+import static org.sopt.makers.operation.entity.attendance.AttendanceStatus.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +20,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
 import lombok.*;

src/main/java/org/sopt/makers/operation/entity/AttendanceStatus.java → src/main/java/org/sopt/makers/operation/entity/attendance/AttendanceStatus.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.attendance;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/org/sopt/makers/operation/entity/SubAttendance.java → src/main/java/org/sopt/makers/operation/entity/attendance/SubAttendance.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.attendance;
 
 import static javax.persistence.GenerationType.*;
 
@@ -14,6 +14,9 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 
+import org.sopt.makers.operation.entity.BaseEntity;
+import org.sopt.makers.operation.entity.lecture.SubLecture;
+
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java

@@ -15,10 +15,9 @@
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 
-import org.sopt.makers.operation.entity.Attendance;
+import org.sopt.makers.operation.entity.attendance.Attendance;
 import org.sopt.makers.operation.entity.BaseEntity;
 import org.sopt.makers.operation.entity.Part;
-import org.sopt.makers.operation.entity.SubLecture;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/org/sopt/makers/operation/entity/SubLecture.java → src/main/java/org/sopt/makers/operation/entity/lecture/SubLecture.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.lecture;
 
 import static javax.persistence.GenerationType.*;
 import static org.sopt.makers.operation.entity.lecture.LectureStatus.*;
@@ -17,6 +17,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
+import org.sopt.makers.operation.entity.attendance.SubAttendance;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.sopt.makers.operation.entity.lecture.LectureStatus;
 

src/main/java/org/sopt/makers/operation/entity/Member.java → src/main/java/org/sopt/makers/operation/entity/member/Member.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.entity;
+package org.sopt.makers.operation.entity.member;
 
 import static org.sopt.makers.operation.entity.lecture.LectureStatus.*;
 
@@ -15,6 +15,8 @@
 import javax.persistence.OneToMany;
 
 import org.sopt.makers.operation.dto.member.MemberRequestDTO;
+import org.sopt.makers.operation.entity.Part;
+import org.sopt.makers.operation.entity.attendance.Attendance;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/org/sopt/makers/operation/entity/member/ObYb.java

@@ -0,0 +1,5 @@
+package org.sopt.makers.operation.entity.member;
+
+public enum ObYb {
+	OB, YB
+}

src/main/java/org/sopt/makers/operation/external/api/AlarmSender.java → src/main/java/org/sopt/makers/operation/external/alarm/AlarmSender.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.external.api;
+package org.sopt.makers.operation.external.alarm;
 
 import org.sopt.makers.operation.dto.alarm.AlarmSenderDTO;
 

src/main/java/org/sopt/makers/operation/external/api/AlarmSenderImpl.java → src/main/java/org/sopt/makers/operation/external/alarm/AlarmSenderImpl.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.external.api;
+package org.sopt.makers.operation.external.alarm;
 
 import static java.util.Objects.*;
 import static java.util.UUID.*;

src/main/java/org/sopt/makers/operation/external/api/PlayGroundServer.java → src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServer.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.external.api;
+package org.sopt.makers.operation.external.playground;
 
 import org.sopt.makers.operation.dto.alarm.AlarmInactiveListResponseDTO;
 import org.sopt.makers.operation.entity.Part;

src/main/java/org/sopt/makers/operation/external/api/PlayGroundServerImpl.java → src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServerImpl.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.external.api;
+package org.sopt.makers.operation.external.playground;
 
 import static org.sopt.makers.operation.common.ExceptionMessage.*;
 import static org.sopt.makers.operation.entity.Part.*;

src/main/java/org/sopt/makers/operation/controller/ExceptionController.java → src/main/java/org/sopt/makers/operation/handler/ErrorHandler.java

@@ -1,4 +1,4 @@
-package org.sopt.makers.operation.controller;
+package org.sopt.makers.operation.handler;
 
 import static org.sopt.makers.operation.common.ApiResponse.*;
 import static org.sopt.makers.operation.common.ExceptionMessage.*;
@@ -15,7 +15,7 @@
 
 @Slf4j
 @RestControllerAdvice
-public class ExceptionController {
+public class ErrorHandler {
     @ExceptionHandler(AdminFailureException.class)
     public ResponseEntity<ApiResponse> authFailureException (AdminFailureException ex) {
         log.error(ex.getMessage());

src/main/java/org/sopt/makers/operation/repository/AdminRepository.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.repository;
 
-import org.sopt.makers.operation.entity.Admin;
+import org.sopt.makers.operation.entity.admin.Admin;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java

@@ -2,11 +2,9 @@
 
 import java.util.List;
 
-import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.Member;
+import org.sopt.makers.operation.entity.attendance.Attendance;
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.Part;
-import org.sopt.makers.operation.entity.SubAttendance;
-import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.springframework.data.domain.Pageable;
 
 public interface AttendanceCustomRepository {

src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepository.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.operation.repository.attendance;
 
-import org.sopt.makers.operation.entity.Attendance;
+import org.sopt.makers.operation.entity.attendance.Attendance;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java

@@ -2,11 +2,11 @@
 
 import static com.querydsl.core.types.dsl.Expressions.*;
 import static java.util.Objects.*;
-import static org.sopt.makers.operation.entity.QAttendance.*;
-import static org.sopt.makers.operation.entity.QMember.*;
-import static org.sopt.makers.operation.entity.QSubAttendance.*;
-import static org.sopt.makers.operation.entity.QSubLecture.*;
+import static org.sopt.makers.operation.entity.attendance.QAttendance.*;
+import static org.sopt.makers.operation.entity.attendance.QSubAttendance.*;
 import static org.sopt.makers.operation.entity.lecture.QLecture.*;
+import static org.sopt.makers.operation.entity.lecture.QSubLecture.*;
+import static org.sopt.makers.operation.entity.member.QMember.*;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -16,8 +16,8 @@
 import lombok.val;
 
 import org.sopt.makers.operation.config.ValueConfig;
-import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.Member;
+import org.sopt.makers.operation.entity.attendance.Attendance;
+import org.sopt.makers.operation.entity.member.Member;
 import org.sopt.makers.operation.entity.Part;
 import org.sopt.makers.operation.entity.lecture.LectureStatus;
 import org.springframework.data.domain.Pageable;