update: DTO가 일관성 있는 패키지 구조가 되도록 수정

src/main/java/com/waruru/areyouhere/attendance/controller/AttendanceController.java

@@ -1,10 +1,10 @@
 package com.waruru.areyouhere.attendance.controller;
 
-import com.waruru.areyouhere.attendance.dto.AttendRequestDto;
-import com.waruru.areyouhere.attendance.dto.AttendResponseDto;
-import com.waruru.areyouhere.attendance.dto.CurrentAttendanceCount;
+import com.waruru.areyouhere.attendance.dto.request.AttendRequestDto;
+import com.waruru.areyouhere.attendance.dto.response.AttendResponseDto;
+import com.waruru.areyouhere.attendance.dto.response.CurrentAttendanceCountResponseDto;
 import com.waruru.areyouhere.attendance.dto.UpdateAttendance;
-import com.waruru.areyouhere.attendance.dto.UpdateAttendanceRequestDto;
+import com.waruru.areyouhere.attendance.dto.request.UpdateAttendanceRequestDto;
 import com.waruru.areyouhere.attendance.exception.DuplicateAuthCodeAttendException;
 import com.waruru.areyouhere.attendance.service.AttendanceService;
 import com.waruru.areyouhere.attendance.service.dto.CurrentSessionAttendeeAttendance;
@@ -97,10 +97,10 @@ ResponseEntity<HttpStatus> updateAttendances(@RequestBody UpdateAttendanceReques
 
     @LoginRequired
     @GetMapping
-    ResponseEntity<CurrentAttendanceCount> getCurrentAttendances(@RequestParam("courseId") Long courseId, @RequestParam("sessionId") Long sessionId){
+    ResponseEntity<CurrentAttendanceCountResponseDto> getCurrentAttendances(@RequestParam("courseId") Long courseId, @RequestParam("sessionId") Long sessionId){
         int currentAttendance = attendanceService.currentAttendance(sessionId);
         int total = attendeeService.getAttendeeByCourseId(courseId);
-        return ResponseEntity.ok(new CurrentAttendanceCount(currentAttendance, total));
+        return ResponseEntity.ok(new CurrentAttendanceCountResponseDto(currentAttendance, total));
     }
 
     @LoginRequired

src/main/java/com/waruru/areyouhere/attendance/controller/AuthCodeController.java

@@ -5,8 +5,8 @@
 import com.waruru.areyouhere.course.domain.entity.Course;
 import com.waruru.areyouhere.course.service.CourseService;
 import com.waruru.areyouhere.session.domain.entity.Session;
-import com.waruru.areyouhere.attendance.dto.AuthCodeDeactivationRequestDto;
-import com.waruru.areyouhere.attendance.dto.AuthCodeRequestDto;
+import com.waruru.areyouhere.attendance.dto.request.AuthCodeDeactivationRequestDto;
+import com.waruru.areyouhere.attendance.dto.request.AuthCodeRequestDto;
 import com.waruru.areyouhere.attendance.service.AuthCodeService;
 import com.waruru.areyouhere.session.service.SessionService;
 import java.time.LocalDateTime;

src/main/java/com/waruru/areyouhere/attendance/dto/AttendRequestDto.java → src/main/java/com/waruru/areyouhere/attendance/dto/request/AttendRequestDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.request;
 
 import lombok.Data;
 

src/main/java/com/waruru/areyouhere/attendance/dto/AuthCodeDeactivationRequestDto.java → src/main/java/com/waruru/areyouhere/attendance/dto/request/AuthCodeDeactivationRequestDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.request;
 
 
 import lombok.AccessLevel;

src/main/java/com/waruru/areyouhere/attendance/dto/AuthCodeRequestDto.java → src/main/java/com/waruru/areyouhere/attendance/dto/request/AuthCodeRequestDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.request;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

src/main/java/com/waruru/areyouhere/attendance/dto/UpdateAttendanceRequestDto.java → src/main/java/com/waruru/areyouhere/attendance/dto/request/UpdateAttendanceRequestDto.java

@@ -1,5 +1,6 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.request;
 
+import com.waruru.areyouhere.attendance.dto.UpdateAttendance;
 import java.util.List;
 import lombok.Data;
 

src/main/java/com/waruru/areyouhere/attendance/dto/AttendResponseDto.java → src/main/java/com/waruru/areyouhere/attendance/dto/response/AttendResponseDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.response;
 
 import com.waruru.areyouhere.attendee.service.dto.AttendeeInfo;
 import java.time.LocalDateTime;

src/main/java/com/waruru/areyouhere/attendance/dto/CurrentAttendanceCount.java → src/main/java/com/waruru/areyouhere/attendance/dto/response/CurrentAttendanceCountResponseDto.java

@@ -1,11 +1,11 @@
-package com.waruru.areyouhere.attendance.dto;
+package com.waruru.areyouhere.attendance.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
-public class CurrentAttendanceCount {
+public class CurrentAttendanceCountResponseDto {
     private int attendances;
     private int total;
 }

src/main/java/com/waruru/areyouhere/attendee/controller/AttendeeController.java

@@ -1,12 +1,11 @@
 package com.waruru.areyouhere.attendee.controller;
 
-import com.waruru.areyouhere.attendee.dto.AttendeeDetailDto;
-import com.waruru.areyouhere.attendee.dto.ClassAttendeesDto;
-import com.waruru.areyouhere.attendee.dto.DeleteAttendeesDto;
-import com.waruru.areyouhere.attendee.dto.DuplicateCheckAttendeesDto;
-import com.waruru.areyouhere.attendee.dto.NewAttendeesDto;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeDetailDto;
+import com.waruru.areyouhere.attendee.dto.response.ClassAttendeesResponseDto;
+import com.waruru.areyouhere.attendee.dto.request.DeleteAttendeesRequestDto;
+import com.waruru.areyouhere.attendee.dto.request.DuplicateCheckAttendeesRequestDto;
+import com.waruru.areyouhere.attendee.dto.request.NewAttendeesRequestDto;
 import com.waruru.areyouhere.attendee.service.AttendeeService;
-import com.waruru.areyouhere.attendee.service.dto.AttendeeAttendanceInfo;
 import com.waruru.areyouhere.attendee.service.dto.ClassAttendees;
 import com.waruru.areyouhere.attendee.service.dto.DuplicateAttendees;
 import com.waruru.areyouhere.common.annotation.LoginRequired;
@@ -33,32 +32,32 @@ public class AttendeeController {
 
     @LoginRequired
     @GetMapping
-    public ResponseEntity<ClassAttendeesDto> getClassAttendees(@RequestParam("courseId") Long courseId){
+    public ResponseEntity<ClassAttendeesResponseDto> getClassAttendees(@RequestParam("courseId") Long courseId){
         List<ClassAttendees> classAttendees = attendeeService.getClassAttendeesIfExistsOrEmpty(courseId);
 
-        return ResponseEntity.ok(ClassAttendeesDto.builder()
+        return ResponseEntity.ok(ClassAttendeesResponseDto.builder()
                 .classAttendees(classAttendees)
                 .build());
     }
 
     @LoginRequired
     @PostMapping
-    public ResponseEntity<HttpStatus> create(@RequestBody NewAttendeesDto newAttendeesDto){
-        attendeeService.createAttendees(newAttendeesDto.getCourseId(), newAttendeesDto.getNewAttendees());
+    public ResponseEntity<HttpStatus> create(@RequestBody NewAttendeesRequestDto newAttendeesRequestDto){
+        attendeeService.createAttendees(newAttendeesRequestDto.getCourseId(), newAttendeesRequestDto.getNewAttendees());
         return ResponseEntity.ok().build();
     }
 
     @LoginRequired
     @PostMapping("/delete")
-    public ResponseEntity<HttpStatus> delete(@RequestBody DeleteAttendeesDto deleteAttendeesDto){
-        attendeeService.deleteAttendees(deleteAttendeesDto.getAttendeeIds());
+    public ResponseEntity<HttpStatus> delete(@RequestBody DeleteAttendeesRequestDto deleteAttendeesRequestDto){
+        attendeeService.deleteAttendees(deleteAttendeesRequestDto.getAttendeeIds());
         return ResponseEntity.ok().build();
     }
 
     @LoginRequired
     @PostMapping("/duplicate")
-    public ResponseEntity<DuplicateAttendees> checkDuplicate(@RequestBody DuplicateCheckAttendeesDto duplicateCheckAttendeesDto){
-        return ResponseEntity.ok(attendeeService.getDuplicateAttendees(duplicateCheckAttendeesDto.getCourseId(), duplicateCheckAttendeesDto.getNewAttendees()));
+    public ResponseEntity<DuplicateAttendees> checkDuplicate(@RequestBody DuplicateCheckAttendeesRequestDto duplicateCheckAttendeesRequestDto){
+        return ResponseEntity.ok(attendeeService.getDuplicateAttendees(duplicateCheckAttendeesRequestDto.getCourseId(), duplicateCheckAttendeesRequestDto.getNewAttendees()));
     }
 
     @LoginRequired

src/main/java/com/waruru/areyouhere/attendee/dto/request/DeleteAttendeesRequestDto.java

@@ -0,0 +1,9 @@
+package com.waruru.areyouhere.attendee.dto.request;
+
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class DeleteAttendeesRequestDto {
+    List<Long> attendeeIds;
+}

src/main/java/com/waruru/areyouhere/attendee/dto/DuplicateCheckAttendeesDto.java → src/main/java/com/waruru/areyouhere/attendee/dto/request/DuplicateCheckAttendeesRequestDto.java

@@ -1,11 +1,11 @@
-package com.waruru.areyouhere.attendee.dto;
+package com.waruru.areyouhere.attendee.dto.request;
 
 import java.util.List;
 import lombok.Getter;
 
 
 @Getter
-public class DuplicateCheckAttendeesDto {
+public class DuplicateCheckAttendeesRequestDto {
     private Long courseId;
     private List<String> newAttendees;
 }

src/main/java/com/waruru/areyouhere/attendee/dto/request/NewAttendeesRequestDto.java

@@ -0,0 +1,14 @@
+package com.waruru.areyouhere.attendee.dto.request;
+
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
+import java.util.List;
+import lombok.Data;
+
+
+@Data
+public class NewAttendeesRequestDto {
+    private Long courseId;
+
+    List<AttendeeData> newAttendees;
+}
+

src/main/java/com/waruru/areyouhere/attendee/dto/ClassAttendeesDto.java → src/main/java/com/waruru/areyouhere/attendee/dto/response/ClassAttendeesResponseDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendee.dto;
+package com.waruru.areyouhere.attendee.dto.response;
 
 import com.waruru.areyouhere.attendee.service.dto.ClassAttendees;
 import java.util.List;
@@ -10,12 +10,12 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class ClassAttendeesDto {
+public class ClassAttendeesResponseDto {
 
     private List<ClassAttendees> classAttendees;
 
     @Builder
-    public ClassAttendeesDto(List<ClassAttendees> classAttendees) {
+    public ClassAttendeesResponseDto(List<ClassAttendees> classAttendees) {
         this.classAttendees = classAttendees;
     }
 }

src/main/java/com/waruru/areyouhere/attendee/service/AttendeeService.java

@@ -1,8 +1,7 @@
 package com.waruru.areyouhere.attendee.service;
 
-import com.waruru.areyouhere.attendee.dto.AttendeeData;
-import com.waruru.areyouhere.attendee.dto.AttendeeDetailDto;
-import com.waruru.areyouhere.attendee.service.dto.AttendeeAttendanceInfo;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeDetailDto;
 import com.waruru.areyouhere.attendee.service.dto.ClassAttendees;
 import com.waruru.areyouhere.attendee.service.dto.DuplicateAttendees;
 import com.waruru.areyouhere.attendee.service.dto.SessionAttendees;

src/main/java/com/waruru/areyouhere/attendee/service/AttendeeServiceImpl.java

@@ -7,8 +7,8 @@
 import com.waruru.areyouhere.attendee.domain.repository.dto.AttendeeAttendDetailInfo;
 import com.waruru.areyouhere.attendee.domain.repository.dto.ClassAttendeeInfo;
 import com.waruru.areyouhere.attendee.domain.repository.dto.SessionAttendeeInfo;
-import com.waruru.areyouhere.attendee.dto.AttendeeData;
-import com.waruru.areyouhere.attendee.dto.AttendeeDetailDto;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeDetailDto;
 import com.waruru.areyouhere.attendee.exception.ClassAttendeesEmptyException;
 import com.waruru.areyouhere.attendee.exception.SessionAttendeesEmptyException;
 import com.waruru.areyouhere.attendee.service.dto.AttendeeAttendanceInfo;

src/main/java/com/waruru/areyouhere/attendee/dto/AttendeeData.java → src/main/java/com/waruru/areyouhere/attendee/service/dto/AttendeeData.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.attendee.dto;
+package com.waruru.areyouhere.attendee.service.dto;
 
 
 import lombok.Data;

src/main/java/com/waruru/areyouhere/attendee/dto/AttendeeDetailDto.java → src/main/java/com/waruru/areyouhere/attendee/service/dto/AttendeeDetailDto.java

@@ -1,8 +1,7 @@
-package com.waruru.areyouhere.attendee.dto;
+package com.waruru.areyouhere.attendee.service.dto;
 
 
 import com.waruru.areyouhere.attendee.domain.repository.dto.AttendeeAttendDetailInfo;
-import com.waruru.areyouhere.attendee.service.dto.AttendeeAttendanceInfo;
 import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;

src/main/java/com/waruru/areyouhere/course/dto/request/CourseCreationRequest.java

@@ -1,6 +1,6 @@
 package com.waruru.areyouhere.course.dto.request;
 
-import com.waruru.areyouhere.attendee.dto.AttendeeData;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
 

src/main/java/com/waruru/areyouhere/course/service/CourseService.java

@@ -1,6 +1,6 @@
 package com.waruru.areyouhere.course.service;
 
-import com.waruru.areyouhere.attendee.dto.AttendeeData;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
 import com.waruru.areyouhere.course.domain.entity.Course;
 import com.waruru.areyouhere.course.dto.CourseData;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/waruru/areyouhere/course/service/CourseServiceImpl.java

@@ -5,9 +5,7 @@
 import com.waruru.areyouhere.attendee.domain.repository.AttendeeBatchRepository;
 import com.waruru.areyouhere.attendee.domain.repository.AttendeeRepository;
 import com.waruru.areyouhere.attendee.domain.repository.dto.EachClassAttendeeCountInfo;
-import com.waruru.areyouhere.attendee.dto.AttendeeData;
-import com.waruru.areyouhere.auth.session.SessionManager;
-import com.waruru.areyouhere.common.utils.RandomIdentifierGenerator;
+import com.waruru.areyouhere.attendee.service.dto.AttendeeData;
 import com.waruru.areyouhere.course.domain.entity.Course;
 import com.waruru.areyouhere.course.domain.repository.CourseRepository;
 import com.waruru.areyouhere.attendee.exception.AttendeesNotUniqueException;
@@ -20,8 +18,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.SetOperations;
 import org.springframework.transaction.annotation.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -36,7 +32,6 @@
 public class CourseServiceImpl implements CourseService {
     private final CourseRepository courseRepository;
     private final ManagerRepository managerRepository;
-    private final SessionManager sessionManager;
     private final AttendeeBatchRepository attendeeBatchRepository;
     private final AttendeeRepository attendeeRepository;
     private final AttendanceRepository attendanceRepository;

src/main/java/com/waruru/areyouhere/manager/service/SessionManagerService.java

@@ -84,4 +84,8 @@ public void update(Long userId, String name, String password){
         Manager manager = managerRepository.findById(userId).orElseThrow(UnAuthenticatedException::new);
         managerRepository.save(manager.update(name, passwordEncoder.encode(password)));
     }
+
+    public void delete(Long userId){
+        managerRepository.deleteById(userId);
+    }
 }

src/main/java/com/waruru/areyouhere/session/controller/DashBoardController.java

@@ -2,15 +2,14 @@
 
 
 import com.waruru.areyouhere.common.annotation.LoginRequired;
-import com.waruru.areyouhere.session.dto.CurrentSessionResponseDto;
-import com.waruru.areyouhere.session.dto.PreviousFiveSessionResponseDto;
+import com.waruru.areyouhere.session.dto.response.CurrentSessionResponseDto;
+import com.waruru.areyouhere.session.dto.response.PreviousFiveSessionResponseDto;
 import com.waruru.areyouhere.session.exception.CurrentSessionNotFoundException;
 import com.waruru.areyouhere.session.service.SessionService;
 import com.waruru.areyouhere.session.service.dto.CurrentSessionDto;
 import com.waruru.areyouhere.session.service.dto.SessionAttendanceInfo;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/waruru/areyouhere/session/controller/SessionController.java

@@ -3,9 +3,8 @@
 
 import com.waruru.areyouhere.attendee.service.AttendeeService;
 import com.waruru.areyouhere.attendee.service.dto.SessionAttendees;
-import com.waruru.areyouhere.session.dto.CreateSessionRequestDto;
-import com.waruru.areyouhere.session.dto.DeleteSessionRequestDto;
-import com.waruru.areyouhere.session.dto.SessionAttendeesDto;
+import com.waruru.areyouhere.session.dto.request.CreateSessionRequestDto;
+import com.waruru.areyouhere.session.dto.response.SessionAttendeesResponseDto;
 import com.waruru.areyouhere.session.service.SessionService;
 import com.waruru.areyouhere.session.service.dto.AllSessionAttendanceInfo;
 import com.waruru.areyouhere.session.service.dto.SessionAttendanceInfo;
@@ -64,21 +63,21 @@ public ResponseEntity<SessionAttendanceInfo> getSessionBasicInfo(@PathVariable("
     }
 
     @GetMapping("/{sessionId}/attendee")
-    public ResponseEntity<SessionAttendeesDto> getSessionAllAttendees(@PathVariable("sessionId") Long sessionId){
+    public ResponseEntity<SessionAttendeesResponseDto> getSessionAllAttendees(@PathVariable("sessionId") Long sessionId){
         List<SessionAttendees> sessionAttendees = attendeeService.getSessionAttendeesIfExistsOrEmpty(
                 sessionId);
 
-        return ResponseEntity.ok(SessionAttendeesDto.builder()
+        return ResponseEntity.ok(SessionAttendeesResponseDto.builder()
                 .sessionAttendees(sessionAttendees)
                 .build());
     }
 
     @GetMapping("/{sessionId}/absentee")
-    public ResponseEntity<SessionAttendeesDto> getSessionAbsenteeOnly(@PathVariable("sessionId") Long sessionId){
+    public ResponseEntity<SessionAttendeesResponseDto> getSessionAbsenteeOnly(@PathVariable("sessionId") Long sessionId){
         List<SessionAttendees> sessionAttendees = attendeeService.getSessionAbsenteesIfExistsOrEmpty(
                 sessionId);
 
-        return ResponseEntity.ok(SessionAttendeesDto.builder()
+        return ResponseEntity.ok(SessionAttendeesResponseDto.builder()
                 .sessionAttendees(sessionAttendees)
                 .build());
     }

src/main/java/com/waruru/areyouhere/session/dto/CreateSessionRequestDto.java → src/main/java/com/waruru/areyouhere/session/dto/request/CreateSessionRequestDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.session.dto;
+package com.waruru.areyouhere.session.dto.request;
 
 import lombok.Data;
 

src/main/java/com/waruru/areyouhere/session/dto/DeleteSessionRequestDto.java → src/main/java/com/waruru/areyouhere/session/dto/request/DeleteSessionRequestDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.session.dto;
+package com.waruru.areyouhere.session.dto.request;
 
 import lombok.Data;
 

src/main/java/com/waruru/areyouhere/session/dto/CurrentSessionResponseDto.java → src/main/java/com/waruru/areyouhere/session/dto/response/CurrentSessionResponseDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.session.dto;
+package com.waruru.areyouhere.session.dto.response;
 
 
 import java.time.LocalDateTime;

src/main/java/com/waruru/areyouhere/session/dto/PreviousFiveSessionResponseDto.java → src/main/java/com/waruru/areyouhere/session/dto/response/PreviousFiveSessionResponseDto.java

@@ -1,4 +1,4 @@
-package com.waruru.areyouhere.session.dto;
+package com.waruru.areyouhere.session.dto.response;
 
 import com.waruru.areyouhere.session.service.dto.SessionAttendanceInfo;
 import java.util.List;