Skip to content
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

[CHORE] 패키지 리팩토링 #222

Merged
merged 3 commits into from
Jan 24, 2024
Merged

[CHORE] 패키지 리팩토링 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6484f3f
[CHORE] 패키지 리팩토링
thguss Jan 23, 2024
4136728
[CHORE] 패키지 이동 반영
thguss Jan 23, 2024
b2982fe
[CHORE] 리뷰 반영
thguss Jan 24, 2024
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
2 changes: 1 addition & 1 deletion ...ation/security/config/SecurityConfig.java → ...kers/operation/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.makers.operation.security.config;
package org.sopt.makers.operation.config;

import lombok.RequiredArgsConstructor;
import lombok.val;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sopt/makers/operation/dto/admin/LoginResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/admin/SignUpRequestDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/admin/SignUpResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceTotalVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/attendance/AttendancesResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/lecture/AttendanceResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sopt/makers/operation/dto/lecture/AttendancesStatusVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/lecture/LectureCurrentRoundResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/lecture/LectureResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/lecture/LectureSearchCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sopt/makers/operation/dto/lecture/TodayLectureResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/member/MemberListGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/dto/member/MemberRequestDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/org/sopt/makers/operation/entity/ObYb.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...g/sopt/makers/operation/entity/Admin.java → .../makers/operation/entity/admin/Admin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.makers.operation.entity;
package org.sopt.makers.operation.entity.admin;

import lombok.Builder;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion .../makers/operation/entity/AdminStatus.java → ...s/operation/entity/admin/AdminStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...rg/sopt/makers/operation/entity/Role.java → ...t/makers/operation/entity/admin/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions ...t/makers/operation/entity/Attendance.java → ...eration/entity/attendance/Attendance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion ...rs/operation/entity/AttendanceStatus.java → ...n/entity/attendance/AttendanceStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.makers.operation.entity;
package org.sopt.makers.operation.entity.attendance;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
5 changes: 4 additions & 1 deletion ...akers/operation/entity/SubAttendance.java → ...tion/entity/attendance/SubAttendance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.sopt.makers.operation.entity;
package org.sopt.makers.operation.entity.attendance;

import static javax.persistence.GenerationType.*;

Expand All @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion ...t/makers/operation/entity/SubLecture.java → .../operation/entity/lecture/SubLecture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion .../sopt/makers/operation/entity/Member.java → ...akers/operation/entity/member/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;

Expand All @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/sopt/makers/operation/entity/member/ObYb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.sopt.makers.operation.entity.member;

public enum ObYb {
OB, YB
}
2 changes: 1 addition & 1 deletion ...s/operation/external/api/AlarmSender.java → ...operation/external/alarm/AlarmSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...eration/external/api/AlarmSenderImpl.java → ...ation/external/alarm/AlarmSenderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion ...ration/external/api/PlayGroundServer.java → ...external/playground/PlayGroundServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...on/external/api/PlayGroundServerImpl.java → ...rnal/playground/PlayGroundServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand Down
4 changes: 2 additions & 2 deletions ...ation/controller/ExceptionController.java → ...akers/operation/handler/ErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.*;
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/repository/AdminRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 2 additions & 4 deletions ...main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading