admin Delete 문제 해결

TG-WinG · Nov 6, 2024 · ea52a02 · ea52a02
1 parent a6ceda4
commit ea52a02
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/kr/tgwing/tech/admin/controller/AdminController.java b/src/main/java/kr/tgwing/tech/admin/controller/AdminController.java
@@ -30,7 +30,7 @@ public ResponseEntity<ApiResponse<Page<AdminCheckUserDto>>> checkAllAssignments(
             @PageableDefault Pageable pageable,
             @ModelAttribute StudentQuery studentQuery
     ) {
-        Page<AdminCheckUserDto> allAssignments = adminService.checkAssingments(studentQuery, pageable);
+        Page<AdminCheckUserDto> allAssignments = adminService.checkAssignments(studentQuery, pageable);
         return ResponseEntity.ok(ApiResponse.ok(allAssignments));
     }
 
@@ -59,7 +59,6 @@ public ResponseEntity<ApiResponse<Long>> refuseAssignment(@PathVariable("id") Lo
     }
 
 
-
     @Operation(summary = "동아리원 강제 삭제")
     @DeleteMapping("/stdent/{id}")
     public ResponseEntity<ApiResponse<?>> deleteStudent(@PathVariable Long id) {

diff --git a/src/main/java/kr/tgwing/tech/admin/dto/AdminCheckUserDto.java b/src/main/java/kr/tgwing/tech/admin/dto/AdminCheckUserDto.java
@@ -6,6 +6,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
+
 @Getter
 @Builder
 @NoArgsConstructor
@@ -15,6 +17,7 @@ public class AdminCheckUserDto {
     private String studentNumber;
     private String email;
     private String name;
+    private LocalDate birth;
     private String phoneNumber;
 
     public static AdminCheckUserDto of(TempUser tempUser) {
@@ -23,6 +26,7 @@ public static AdminCheckUserDto of(TempUser tempUser) {
                 .studentNumber(tempUser.getStudentNumber())
                 .email(tempUser.getEmail())
                 .name(tempUser.getName())
+                .birth(tempUser.getBirth())
                 .phoneNumber(tempUser.getPhoneNumber())
                 .build();
     }

diff --git a/src/main/java/kr/tgwing/tech/admin/service/AdminService.java b/src/main/java/kr/tgwing/tech/admin/service/AdminService.java
@@ -31,7 +31,7 @@ public class AdminService {
     private final TempUserRepository tempUserRepository;
     private final PostRepository postRepository;
 
-    public Page<AdminCheckUserDto> checkAssingments(StudentQuery studentQuery, Pageable pageable) {
+    public Page<AdminCheckUserDto> checkAssignments(StudentQuery studentQuery, Pageable pageable) {
         Specification<TempUser> spec = UserSpecification.hasKeywordInTempUser(studentQuery.getKeyword());
         Page<TempUser> allAssignments = tempUserRepository.findAll(spec, pageable);
         if(allAssignments.isEmpty()) return null; // 여기 값은 예외로 보내야하느건지, 어떻게 보내야하는거지?
@@ -67,7 +67,7 @@ public Long registerUsers(Long studentId) {
 
     public Long refuseUsers(Long studentId) {
         TempUser user = tempUserRepository.findById(studentId).orElseThrow(UserNotFoundException::new);
-        userRepository.deleteById(studentId);
+        tempUserRepository.deleteById(studentId);
         return user.getStudentId();
     }