diff --git a/src/main/java/org/sopt/makers/operation/security/config/SecurityConfig.java b/src/main/java/org/sopt/makers/operation/config/SecurityConfig.java similarity index 98% rename from src/main/java/org/sopt/makers/operation/security/config/SecurityConfig.java rename to src/main/java/org/sopt/makers/operation/config/SecurityConfig.java index e9209e47..68be6136 100644 --- a/src/main/java/org/sopt/makers/operation/security/config/SecurityConfig.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/admin/LoginResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/admin/LoginResponseDTO.java index 64fb28c3..fdabcf8c 100644 --- a/src/main/java/org/sopt/makers/operation/dto/admin/LoginResponseDTO.java +++ b/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) { diff --git a/src/main/java/org/sopt/makers/operation/dto/admin/SignUpRequestDTO.java b/src/main/java/org/sopt/makers/operation/dto/admin/SignUpRequestDTO.java index 9ef629b9..2dda7189 100644 --- a/src/main/java/org/sopt/makers/operation/dto/admin/SignUpRequestDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/admin/SignUpResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/admin/SignUpResponseDTO.java index a2dd5574..15616af4 100644 --- a/src/main/java/org/sopt/makers/operation/dto/admin/SignUpResponseDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java index ed0909b9..59705d21 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalResponseDTO.java index 13cecdd6..42f509c5 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalResponseDTO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalVO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalVO.java index 0d576ca2..b18df121 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalVO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendancesResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/AttendancesResponseDTO.java index 10852bf6..5a204213 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/AttendancesResponseDTO.java +++ b/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 attendances, diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java index 39e24970..60568a90 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java index ba430b0d..3f7634da 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java index 482b529a..8661181a 100644 --- a/src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/AttendanceResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/lecture/AttendanceResponseDTO.java index 8e61faf9..10690fda 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/AttendanceResponseDTO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/AttendancesStatusVO.java b/src/main/java/org/sopt/makers/operation/dto/lecture/AttendancesStatusVO.java index b2a33c87..663d4b58 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/AttendancesStatusVO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureCurrentRoundResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/lecture/LectureCurrentRoundResponseDTO.java index d07f21c2..ecc2af8c 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureCurrentRoundResponseDTO.java +++ b/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, diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/lecture/LectureResponseDTO.java index 81a07c6b..edf4c2c6 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureResponseDTO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureSearchCondition.java b/src/main/java/org/sopt/makers/operation/dto/lecture/LectureSearchCondition.java index 3ac25110..49672978 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/LectureSearchCondition.java +++ b/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) { diff --git a/src/main/java/org/sopt/makers/operation/dto/lecture/TodayLectureResponseDTO.java b/src/main/java/org/sopt/makers/operation/dto/lecture/TodayLectureResponseDTO.java index 40685563..01127353 100644 --- a/src/main/java/org/sopt/makers/operation/dto/lecture/TodayLectureResponseDTO.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/dto/member/MemberListGetResponse.java b/src/main/java/org/sopt/makers/operation/dto/member/MemberListGetResponse.java index db40b34e..d30f24bd 100644 --- a/src/main/java/org/sopt/makers/operation/dto/member/MemberListGetResponse.java +++ b/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( diff --git a/src/main/java/org/sopt/makers/operation/dto/member/MemberRequestDTO.java b/src/main/java/org/sopt/makers/operation/dto/member/MemberRequestDTO.java index 423bb1f1..136bb649 100644 --- a/src/main/java/org/sopt/makers/operation/dto/member/MemberRequestDTO.java +++ b/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( diff --git a/src/main/java/org/sopt/makers/operation/entity/ObYb.java b/src/main/java/org/sopt/makers/operation/entity/ObYb.java deleted file mode 100644 index 2103662d..00000000 --- a/src/main/java/org/sopt/makers/operation/entity/ObYb.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.sopt.makers.operation.entity; - -public enum ObYb { - OB, YB -} diff --git a/src/main/java/org/sopt/makers/operation/entity/Admin.java b/src/main/java/org/sopt/makers/operation/entity/admin/Admin.java similarity index 95% rename from src/main/java/org/sopt/makers/operation/entity/Admin.java rename to src/main/java/org/sopt/makers/operation/entity/admin/Admin.java index f6fd1bef..e7b3692d 100644 --- a/src/main/java/org/sopt/makers/operation/entity/Admin.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/AdminStatus.java b/src/main/java/org/sopt/makers/operation/entity/admin/AdminStatus.java similarity index 60% rename from src/main/java/org/sopt/makers/operation/entity/AdminStatus.java rename to src/main/java/org/sopt/makers/operation/entity/admin/AdminStatus.java index 980530d3..ae7410b3 100644 --- a/src/main/java/org/sopt/makers/operation/entity/AdminStatus.java +++ b/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 diff --git a/src/main/java/org/sopt/makers/operation/entity/Role.java b/src/main/java/org/sopt/makers/operation/entity/admin/Role.java similarity index 74% rename from src/main/java/org/sopt/makers/operation/entity/Role.java rename to src/main/java/org/sopt/makers/operation/entity/admin/Role.java index a9709150..f4429ea5 100644 --- a/src/main/java/org/sopt/makers/operation/entity/Role.java +++ b/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 diff --git a/src/main/java/org/sopt/makers/operation/entity/Attendance.java b/src/main/java/org/sopt/makers/operation/entity/attendance/Attendance.java similarity index 94% rename from src/main/java/org/sopt/makers/operation/entity/Attendance.java rename to src/main/java/org/sopt/makers/operation/entity/attendance/Attendance.java index 7539f0f4..e11fa9db 100644 --- a/src/main/java/org/sopt/makers/operation/entity/Attendance.java +++ b/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.*; diff --git a/src/main/java/org/sopt/makers/operation/entity/AttendanceStatus.java b/src/main/java/org/sopt/makers/operation/entity/attendance/AttendanceStatus.java similarity index 83% rename from src/main/java/org/sopt/makers/operation/entity/AttendanceStatus.java rename to src/main/java/org/sopt/makers/operation/entity/attendance/AttendanceStatus.java index acd573cb..6a6e0666 100644 --- a/src/main/java/org/sopt/makers/operation/entity/AttendanceStatus.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/SubAttendance.java b/src/main/java/org/sopt/makers/operation/entity/attendance/SubAttendance.java similarity index 90% rename from src/main/java/org/sopt/makers/operation/entity/SubAttendance.java rename to src/main/java/org/sopt/makers/operation/entity/attendance/SubAttendance.java index 0099b00d..81ca1d23 100644 --- a/src/main/java/org/sopt/makers/operation/entity/SubAttendance.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java b/src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java index 8fd2b9af..55bf09ba 100644 --- a/src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/SubLecture.java b/src/main/java/org/sopt/makers/operation/entity/lecture/SubLecture.java similarity index 93% rename from src/main/java/org/sopt/makers/operation/entity/SubLecture.java rename to src/main/java/org/sopt/makers/operation/entity/lecture/SubLecture.java index b38dfca7..77eeb510 100644 --- a/src/main/java/org/sopt/makers/operation/entity/SubLecture.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/Member.java b/src/main/java/org/sopt/makers/operation/entity/member/Member.java similarity index 91% rename from src/main/java/org/sopt/makers/operation/entity/Member.java rename to src/main/java/org/sopt/makers/operation/entity/member/Member.java index 6cf13b7e..acd5675a 100644 --- a/src/main/java/org/sopt/makers/operation/entity/Member.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/entity/member/ObYb.java b/src/main/java/org/sopt/makers/operation/entity/member/ObYb.java new file mode 100644 index 00000000..0041bffb --- /dev/null +++ b/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 +} diff --git a/src/main/java/org/sopt/makers/operation/external/api/AlarmSender.java b/src/main/java/org/sopt/makers/operation/external/alarm/AlarmSender.java similarity index 73% rename from src/main/java/org/sopt/makers/operation/external/api/AlarmSender.java rename to src/main/java/org/sopt/makers/operation/external/alarm/AlarmSender.java index e45a2fe5..e9437619 100644 --- a/src/main/java/org/sopt/makers/operation/external/api/AlarmSender.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/external/api/AlarmSenderImpl.java b/src/main/java/org/sopt/makers/operation/external/alarm/AlarmSenderImpl.java similarity index 98% rename from src/main/java/org/sopt/makers/operation/external/api/AlarmSenderImpl.java rename to src/main/java/org/sopt/makers/operation/external/alarm/AlarmSenderImpl.java index d6bf50ff..5a3f636d 100644 --- a/src/main/java/org/sopt/makers/operation/external/api/AlarmSenderImpl.java +++ b/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.*; diff --git a/src/main/java/org/sopt/makers/operation/external/api/PlayGroundServer.java b/src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServer.java similarity index 81% rename from src/main/java/org/sopt/makers/operation/external/api/PlayGroundServer.java rename to src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServer.java index 0c11ef79..5e886335 100644 --- a/src/main/java/org/sopt/makers/operation/external/api/PlayGroundServer.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/external/api/PlayGroundServerImpl.java b/src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServerImpl.java similarity index 97% rename from src/main/java/org/sopt/makers/operation/external/api/PlayGroundServerImpl.java rename to src/main/java/org/sopt/makers/operation/external/playground/PlayGroundServerImpl.java index 3710228f..6e54253c 100644 --- a/src/main/java/org/sopt/makers/operation/external/api/PlayGroundServerImpl.java +++ b/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.*; diff --git a/src/main/java/org/sopt/makers/operation/controller/ExceptionController.java b/src/main/java/org/sopt/makers/operation/handler/ErrorHandler.java similarity index 96% rename from src/main/java/org/sopt/makers/operation/controller/ExceptionController.java rename to src/main/java/org/sopt/makers/operation/handler/ErrorHandler.java index 6e9e4f83..b5426500 100644 --- a/src/main/java/org/sopt/makers/operation/controller/ExceptionController.java +++ b/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 authFailureException (AdminFailureException ex) { log.error(ex.getMessage()); diff --git a/src/main/java/org/sopt/makers/operation/repository/AdminRepository.java b/src/main/java/org/sopt/makers/operation/repository/AdminRepository.java index 7bb0beac..4a0894f8 100644 --- a/src/main/java/org/sopt/makers/operation/repository/AdminRepository.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java b/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java index 40e8f7cf..40c43981 100644 --- a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java +++ b/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 { diff --git a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepository.java b/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepository.java index 3e5cc2f6..6edcebfe 100644 --- a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepository.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java b/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java index 708592c1..8362a3f4 100644 --- a/src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java +++ b/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; diff --git a/src/main/java/org/sopt/makers/operation/repository/SubAttendanceRepository.java b/src/main/java/org/sopt/makers/operation/repository/attendance/SubAttendanceRepository.java similarity index 72% rename from src/main/java/org/sopt/makers/operation/repository/SubAttendanceRepository.java rename to src/main/java/org/sopt/makers/operation/repository/attendance/SubAttendanceRepository.java index 8362cbfe..5d8caaa6 100644 --- a/src/main/java/org/sopt/makers/operation/repository/SubAttendanceRepository.java +++ b/src/main/java/org/sopt/makers/operation/repository/attendance/SubAttendanceRepository.java @@ -1,9 +1,9 @@ -package org.sopt.makers.operation.repository; +package org.sopt.makers.operation.repository.attendance; import java.util.List; -import org.sopt.makers.operation.entity.SubAttendance; -import org.sopt.makers.operation.entity.SubLecture; +import org.sopt.makers.operation.entity.attendance.SubAttendance; +import org.sopt.makers.operation.entity.lecture.SubLecture; 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/org/sopt/makers/operation/repository/lecture/LectureRepositoryImpl.java b/src/main/java/org/sopt/makers/operation/repository/lecture/LectureRepositoryImpl.java index 51960170..f5e550f3 100644 --- a/src/main/java/org/sopt/makers/operation/repository/lecture/LectureRepositoryImpl.java +++ b/src/main/java/org/sopt/makers/operation/repository/lecture/LectureRepositoryImpl.java @@ -12,10 +12,10 @@ import java.util.Optional; 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.attendance.QAttendance.*; import static org.sopt.makers.operation.entity.lecture.LectureStatus.*; import static org.sopt.makers.operation.entity.lecture.QLecture.*; +import static org.sopt.makers.operation.entity.member.QMember.*; @Repository @RequiredArgsConstructor diff --git a/src/main/java/org/sopt/makers/operation/repository/lecture/SubLectureRepository.java b/src/main/java/org/sopt/makers/operation/repository/lecture/SubLectureRepository.java index 4eeb7d85..1e33f3b7 100644 --- a/src/main/java/org/sopt/makers/operation/repository/lecture/SubLectureRepository.java +++ b/src/main/java/org/sopt/makers/operation/repository/lecture/SubLectureRepository.java @@ -1,6 +1,6 @@ package org.sopt.makers.operation.repository.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 org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/org/sopt/makers/operation/repository/member/MemberCustomRepository.java b/src/main/java/org/sopt/makers/operation/repository/member/MemberCustomRepository.java index e54fd4b3..03aa323a 100644 --- a/src/main/java/org/sopt/makers/operation/repository/member/MemberCustomRepository.java +++ b/src/main/java/org/sopt/makers/operation/repository/member/MemberCustomRepository.java @@ -4,7 +4,7 @@ import java.util.Optional; import org.sopt.makers.operation.dto.member.MemberSearchCondition; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.member.Member; import org.sopt.makers.operation.entity.Part; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/org/sopt/makers/operation/repository/member/MemberRepository.java b/src/main/java/org/sopt/makers/operation/repository/member/MemberRepository.java index ec0c0cbe..04a0b400 100644 --- a/src/main/java/org/sopt/makers/operation/repository/member/MemberRepository.java +++ b/src/main/java/org/sopt/makers/operation/repository/member/MemberRepository.java @@ -1,6 +1,6 @@ package org.sopt.makers.operation.repository.member; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.member.Member; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/org/sopt/makers/operation/repository/member/MemberRepositoryImpl.java b/src/main/java/org/sopt/makers/operation/repository/member/MemberRepositoryImpl.java index 4bfc6858..cb0eb443 100644 --- a/src/main/java/org/sopt/makers/operation/repository/member/MemberRepositoryImpl.java +++ b/src/main/java/org/sopt/makers/operation/repository/member/MemberRepositoryImpl.java @@ -2,9 +2,9 @@ import static java.util.Objects.*; import static org.sopt.makers.operation.entity.Part.*; -import static org.sopt.makers.operation.entity.QAttendance.*; -import static org.sopt.makers.operation.entity.QMember.*; +import static org.sopt.makers.operation.entity.attendance.QAttendance.*; import static org.sopt.makers.operation.entity.lecture.QLecture.*; +import static org.sopt.makers.operation.entity.member.QMember.*; import java.util.List; import java.util.Optional; @@ -12,7 +12,7 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.StringExpression; import org.sopt.makers.operation.dto.member.MemberSearchCondition; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.member.Member; import org.sopt.makers.operation.entity.Part; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/sopt/makers/operation/repository/schedule/ScheduleRepository.java b/src/main/java/org/sopt/makers/operation/repository/schedule/ScheduleRepository.java index c651e850..0cf9858a 100644 --- a/src/main/java/org/sopt/makers/operation/repository/schedule/ScheduleRepository.java +++ b/src/main/java/org/sopt/makers/operation/repository/schedule/ScheduleRepository.java @@ -1,6 +1,6 @@ package org.sopt.makers.operation.repository.schedule; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.member.Member; import org.springframework.data.jpa.repository.JpaRepository; public interface ScheduleRepository extends JpaRepository, ScheduleCustomRepository { diff --git a/src/main/java/org/sopt/makers/operation/controller/ScheduleController.java b/src/main/java/org/sopt/makers/operation/scheduler/LectureScheduler.java similarity index 72% rename from src/main/java/org/sopt/makers/operation/controller/ScheduleController.java rename to src/main/java/org/sopt/makers/operation/scheduler/LectureScheduler.java index 5b7a673e..2340f063 100644 --- a/src/main/java/org/sopt/makers/operation/controller/ScheduleController.java +++ b/src/main/java/org/sopt/makers/operation/scheduler/LectureScheduler.java @@ -1,16 +1,16 @@ -package org.sopt.makers.operation.controller; +package org.sopt.makers.operation.scheduler; import org.sopt.makers.operation.service.LectureService; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.stereotype.Component; import lombok.RequiredArgsConstructor; -@RestController +@Component @EnableScheduling @RequiredArgsConstructor -public class ScheduleController { +public class LectureScheduler { private final LectureService lectureService; diff --git a/src/main/java/org/sopt/makers/operation/security/jwt/AdminAuthentication.java b/src/main/java/org/sopt/makers/operation/security/AdminAuthentication.java similarity index 90% rename from src/main/java/org/sopt/makers/operation/security/jwt/AdminAuthentication.java rename to src/main/java/org/sopt/makers/operation/security/AdminAuthentication.java index f80aa5d7..2385c90e 100644 --- a/src/main/java/org/sopt/makers/operation/security/jwt/AdminAuthentication.java +++ b/src/main/java/org/sopt/makers/operation/security/AdminAuthentication.java @@ -1,4 +1,4 @@ -package org.sopt.makers.operation.security.jwt; +package org.sopt.makers.operation.security; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/org/sopt/makers/operation/security/jwt/JwtTokenProvider.java b/src/main/java/org/sopt/makers/operation/security/jwt/JwtTokenProvider.java index ae7d974a..e43cf11e 100644 --- a/src/main/java/org/sopt/makers/operation/security/jwt/JwtTokenProvider.java +++ b/src/main/java/org/sopt/makers/operation/security/jwt/JwtTokenProvider.java @@ -9,6 +9,7 @@ import lombok.val; import org.sopt.makers.operation.common.ExceptionMessage; import org.sopt.makers.operation.exception.TokenException; +import org.sopt.makers.operation.security.AdminAuthentication; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sopt/makers/operation/service/AdminServiceImpl.java b/src/main/java/org/sopt/makers/operation/service/AdminServiceImpl.java index e9f4da54..d57bdd68 100644 --- a/src/main/java/org/sopt/makers/operation/service/AdminServiceImpl.java +++ b/src/main/java/org/sopt/makers/operation/service/AdminServiceImpl.java @@ -6,11 +6,11 @@ import lombok.val; import org.sopt.makers.operation.dto.admin.*; -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; import org.sopt.makers.operation.exception.AdminFailureException; import org.sopt.makers.operation.repository.AdminRepository; -import org.sopt.makers.operation.security.jwt.AdminAuthentication; +import org.sopt.makers.operation.security.AdminAuthentication; import org.sopt.makers.operation.security.jwt.JwtTokenProvider; import org.sopt.makers.operation.security.jwt.JwtTokenType; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/org/sopt/makers/operation/service/AlarmServiceImpl.java b/src/main/java/org/sopt/makers/operation/service/AlarmServiceImpl.java index a08a42dc..561146f2 100644 --- a/src/main/java/org/sopt/makers/operation/service/AlarmServiceImpl.java +++ b/src/main/java/org/sopt/makers/operation/service/AlarmServiceImpl.java @@ -12,8 +12,8 @@ import org.sopt.makers.operation.entity.Part; import org.sopt.makers.operation.entity.alarm.Status; import org.sopt.makers.operation.exception.AlarmException; -import org.sopt.makers.operation.external.api.AlarmSender; -import org.sopt.makers.operation.external.api.PlayGroundServer; +import org.sopt.makers.operation.external.alarm.AlarmSender; +import org.sopt.makers.operation.external.playground.PlayGroundServer; import org.sopt.makers.operation.repository.alarm.AlarmRepository; import org.sopt.makers.operation.repository.member.MemberRepository; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/sopt/makers/operation/service/AttendanceServiceImpl.java b/src/main/java/org/sopt/makers/operation/service/AttendanceServiceImpl.java index 7ac524b1..839fdd53 100644 --- a/src/main/java/org/sopt/makers/operation/service/AttendanceServiceImpl.java +++ b/src/main/java/org/sopt/makers/operation/service/AttendanceServiceImpl.java @@ -9,13 +9,13 @@ import org.sopt.makers.operation.dto.attendance.SubAttendanceUpdateResponseDTO; import lombok.val; import org.sopt.makers.operation.dto.attendance.*; -import org.sopt.makers.operation.entity.AttendanceStatus; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.attendance.AttendanceStatus; +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.attendance.SubAttendance; import org.sopt.makers.operation.exception.LectureException; import org.sopt.makers.operation.exception.MemberException; -import org.sopt.makers.operation.repository.SubAttendanceRepository; +import org.sopt.makers.operation.repository.attendance.SubAttendanceRepository; import org.sopt.makers.operation.repository.attendance.AttendanceRepository; import org.sopt.makers.operation.exception.SubLectureException; import org.sopt.makers.operation.repository.lecture.SubLectureRepository; diff --git a/src/main/java/org/sopt/makers/operation/service/LectureServiceImpl.java b/src/main/java/org/sopt/makers/operation/service/LectureServiceImpl.java index dc4c6fcd..24755f09 100644 --- a/src/main/java/org/sopt/makers/operation/service/LectureServiceImpl.java +++ b/src/main/java/org/sopt/makers/operation/service/LectureServiceImpl.java @@ -3,7 +3,7 @@ import static org.sopt.makers.operation.common.ExceptionMessage.*; import static org.sopt.makers.operation.common.ExceptionMessage.NO_SESSION; import static org.sopt.makers.operation.dto.lecture.LectureResponseType.*; -import static org.sopt.makers.operation.entity.AttendanceStatus.*; +import static org.sopt.makers.operation.entity.attendance.AttendanceStatus.*; import static org.sopt.makers.operation.entity.alarm.Attribute.*; import static org.sopt.makers.operation.entity.lecture.LectureStatus.*; @@ -25,13 +25,17 @@ import org.sopt.makers.operation.dto.lecture.LectureResponseDTO; import org.sopt.makers.operation.dto.lecture.LecturesResponseDTO; import org.sopt.makers.operation.entity.*; +import org.sopt.makers.operation.entity.attendance.Attendance; +import org.sopt.makers.operation.entity.attendance.SubAttendance; import org.sopt.makers.operation.entity.lecture.Attribute; import org.sopt.makers.operation.entity.lecture.Lecture; +import org.sopt.makers.operation.entity.lecture.SubLecture; +import org.sopt.makers.operation.entity.member.Member; import org.sopt.makers.operation.exception.LectureException; import org.sopt.makers.operation.exception.SubLectureException; -import org.sopt.makers.operation.external.api.AlarmSender; +import org.sopt.makers.operation.external.alarm.AlarmSender; import org.sopt.makers.operation.repository.attendance.AttendanceRepository; -import org.sopt.makers.operation.repository.SubAttendanceRepository; +import org.sopt.makers.operation.repository.attendance.SubAttendanceRepository; import org.sopt.makers.operation.repository.lecture.LectureRepository; import org.sopt.makers.operation.repository.lecture.SubLectureRepository; import org.sopt.makers.operation.repository.member.MemberRepository; diff --git a/src/main/java/org/sopt/makers/operation/service/MemberServiceImpl.java b/src/main/java/org/sopt/makers/operation/service/MemberServiceImpl.java index e1f57251..f12fd21a 100644 --- a/src/main/java/org/sopt/makers/operation/service/MemberServiceImpl.java +++ b/src/main/java/org/sopt/makers/operation/service/MemberServiceImpl.java @@ -14,8 +14,8 @@ import org.sopt.makers.operation.dto.member.MemberScoreGetResponse; import org.sopt.makers.operation.dto.member.MemberSearchCondition; import org.sopt.makers.operation.dto.member.MembersResponseDTO; -import org.sopt.makers.operation.entity.AttendanceStatus; -import org.sopt.makers.operation.entity.Member; +import org.sopt.makers.operation.entity.attendance.AttendanceStatus; +import org.sopt.makers.operation.entity.member.Member; import org.sopt.makers.operation.entity.Part; import org.sopt.makers.operation.entity.lecture.Attribute; import org.sopt.makers.operation.exception.MemberException; diff --git a/src/test/java/org/sopt/makers/operation/fixture/LectureFixture.java b/src/test/java/org/sopt/makers/operation/fixture/LectureFixture.java index cad87a67..00fee1f5 100644 --- a/src/test/java/org/sopt/makers/operation/fixture/LectureFixture.java +++ b/src/test/java/org/sopt/makers/operation/fixture/LectureFixture.java @@ -14,7 +14,7 @@ import org.sopt.makers.operation.dto.lecture.LecturesResponseDTO; import org.sopt.makers.operation.dto.lecture.LecturesResponseDTO.LectureVO; 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; diff --git a/src/test/java/org/sopt/makers/operation/service/LectureServiceImplTest.java b/src/test/java/org/sopt/makers/operation/service/LectureServiceImplTest.java index e37a615f..ea75742e 100644 --- a/src/test/java/org/sopt/makers/operation/service/LectureServiceImplTest.java +++ b/src/test/java/org/sopt/makers/operation/service/LectureServiceImplTest.java @@ -15,7 +15,7 @@ import org.sopt.makers.operation.dto.lecture.LectureResponseDTO; import org.sopt.makers.operation.dto.lecture.LecturesResponseDTO; import org.sopt.makers.operation.entity.lecture.Lecture; -import org.sopt.makers.operation.external.api.AlarmSender; +import org.sopt.makers.operation.external.alarm.AlarmSender; import org.sopt.makers.operation.repository.lecture.LectureRepository; import org.sopt.makers.operation.repository.member.MemberRepository;