Merge pull request #120 from DevKor-github/refact

[Refact] 대거 리팩토링

Author: jjjh02

ontime-back/src/main/java/devkor/ontime_back/LoggingAspect.java

@@ -90,8 +90,15 @@ public Object logRequest(ProceedingJoinPoint joinPoint) throws Throwable {
 
             // 정상 요청 로그 저장
             long timeTaken = System.currentTimeMillis() - beforeRequest;
-            ApiLog apiLog = new ApiLog(requestUrl, requestMethod, userId, clientIp,
-                    responseStatus, timeTaken);
+            ApiLog apiLog = ApiLog.builder().
+                    requestUrl(requestUrl).
+                    requestMethod(requestMethod).
+                    userId(userId).
+                    clientIp(clientIp).
+                    responseStatus(responseStatus).
+                    takenTime(timeTaken).
+                    build();
+
             apiLogRepository.save(apiLog);
 
             log.info("[Request Log] requestUrl: {}, requestMethod: {}, userId: {}, clientIp: {}, pathVariable: {}, requestBody: {}, responseStatus: {}, timeTaken: {}",
@@ -134,8 +141,15 @@ public void logException(JoinPoint joinPoint, Exception ex) {
                 requestUrl, requestMethod, userId, clientIp, exceptionName, exceptionMessage, responseStatus);
 
         // DB에 에러 로그 저장
-        ApiLog errorLog = new ApiLog(requestUrl, requestMethod, userId, clientIp,
-                responseStatus, 0); // 상태 코드와 시간은 예제로 설정
+        ApiLog errorLog = ApiLog.builder().
+                requestUrl(requestUrl).
+                requestMethod(requestMethod).
+                userId(userId).
+                clientIp(clientIp).
+                responseStatus(responseStatus).
+                takenTime(0).
+                build();
+         // 상태 코드와 시간은 예제로 설정
         apiLogRepository.save(errorLog);
     }
 

ontime-back/src/main/java/devkor/ontime_back/controller/FirebaseTokenController.java

@@ -1,9 +1,6 @@
 package devkor.ontime_back.controller;
 
 import devkor.ontime_back.dto.FirebaseTokenAddDto;
-import devkor.ontime_back.dto.PunctualityScoreResponse;
-import devkor.ontime_back.entity.User;
-import devkor.ontime_back.repository.UserRepository;
 import devkor.ontime_back.response.ApiResponseForm;
 import devkor.ontime_back.service.FirebaseTokenService;
 import devkor.ontime_back.service.UserAuthService;
@@ -14,18 +11,17 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Optional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/firebase-token")
 @RequiredArgsConstructor
 public class FirebaseTokenController {
     private final UserAuthService userAuthService;
-    private final UserRepository userRepository;
     private final FirebaseTokenService firebaseTokenService;
 
     @Operation(

ontime-back/src/main/java/devkor/ontime_back/controller/FriendShipController.java

@@ -1,11 +1,7 @@
 package devkor.ontime_back.controller;
 
-import devkor.ontime_back.dto.CreateFriendshipLinkResponse;
-import devkor.ontime_back.dto.FriendDto;
-import devkor.ontime_back.dto.GetFriendshipRequesterResponse;
-import devkor.ontime_back.dto.UpdateAcceptStatusDto;
+import devkor.ontime_back.dto.*;
 import devkor.ontime_back.entity.User;
-import devkor.ontime_back.entity.GetFriendListResponse;
 import devkor.ontime_back.response.ApiResponseForm;
 import devkor.ontime_back.service.FriendshipService;
 import devkor.ontime_back.service.UserAuthService;
@@ -29,7 +25,6 @@
 public class FriendShipController {
 
     private final UserAuthService userAuthService;
-    private final UserService userService;
     private final FriendshipService friendShipService;
 
 

ontime-back/src/main/java/devkor/ontime_back/controller/PreparationScheduleController.java

@@ -3,6 +3,7 @@
 import devkor.ontime_back.dto.PreparationDto;
 import devkor.ontime_back.response.ApiResponseForm;
 import devkor.ontime_back.service.PreparationScheduleService;
+import devkor.ontime_back.service.UserAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -24,6 +25,7 @@
 public class PreparationScheduleController {
 
     private final PreparationScheduleService preparationScheduleService;
+    private final UserAuthService userAuthService;
 
     @Operation(
             summary = "스케줄별 준비과정 생성",
@@ -44,7 +46,7 @@ public class PreparationScheduleController {
     })
     @PostMapping("/create/{scheduleId}")
     public ResponseEntity<ApiResponseForm<Void>> createPreparationSchedule(HttpServletRequest request, @Parameter(description = "스케줄 ID (UUID 형식)", required = true, example = "3fa85f64-5717-4562-b3fc-2c963f66afe5") @PathVariable UUID scheduleId, @RequestBody List<PreparationDto> preparationDtoList) {
-        Long userId = preparationScheduleService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
 
         preparationScheduleService.makePreparationSchedules(userId, scheduleId, preparationDtoList);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
@@ -69,7 +71,7 @@ public ResponseEntity<ApiResponseForm<Void>> createPreparationSchedule(HttpServl
     })
     @PostMapping("/modify/{scheduleId}")
     public ResponseEntity<ApiResponseForm<Void>> modifyPreparationUser(HttpServletRequest request, @Parameter(description = "스케줄 ID (UUID 형식)", required = true, example = "3fa85f64-5717-4562-b3fc-2c963f66afe5") @PathVariable UUID scheduleId, @RequestBody List<PreparationDto> preparationDtoList) {
-        Long userId = preparationScheduleService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
 
         preparationScheduleService.updatePreparationSchedules(userId, scheduleId, preparationDtoList);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));

ontime-back/src/main/java/devkor/ontime_back/controller/PreparationUserController.java

@@ -3,8 +3,8 @@
 import devkor.ontime_back.dto.PreparationDto;
 import devkor.ontime_back.response.ApiResponseForm;
 import devkor.ontime_back.service.PreparationUserService;
+import devkor.ontime_back.service.UserAuthService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -24,6 +24,7 @@ public class PreparationUserController {
 
 
     private final PreparationUserService preparationUserService;
+    private final UserAuthService userAuthService;
 
     @Operation(
             summary = "사용자 준비과정 수정",
@@ -44,7 +45,7 @@ public class PreparationUserController {
     })
     @PostMapping("/modify")
     public ResponseEntity<ApiResponseForm<Void>> modifyPreparationUser(HttpServletRequest request, @RequestBody List<PreparationDto> preparationDtoList) {
-        Long userId = preparationUserService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
 
         preparationUserService.updatePreparationUsers(userId, preparationDtoList);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
@@ -66,7 +67,7 @@ public ResponseEntity<ApiResponseForm<Void>> modifyPreparationUser(HttpServletRe
     })
     @GetMapping("/show/all")
     public ResponseEntity<ApiResponseForm<List<PreparationDto>>> getAllPreparationUser(HttpServletRequest request) {
-        Long userId = preparationUserService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
 
         List<PreparationDto> preparationUserList = preparationUserService.showAllPreparationUsers(userId);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(preparationUserList));

ontime-back/src/main/java/devkor/ontime_back/controller/ScheduleController.java

@@ -1,7 +1,6 @@
 package devkor.ontime_back.controller;
 
 import devkor.ontime_back.dto.*;
-import devkor.ontime_back.global.jwt.JwtTokenProvider;
 import devkor.ontime_back.response.ApiResponseForm;
 import devkor.ontime_back.service.ScheduleService;
 import devkor.ontime_back.service.UserAuthService;
@@ -61,8 +60,7 @@ public ResponseEntity<ApiResponseForm<List<ScheduleDto>>> getPeriodSchedule(Http
                                                                                         required = false,
                                                                                         example = "2024-11-18T20:00:00")
                                                                                 @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endDate) {
-        Long userId = scheduleService.getUserIdFromToken(request);
-
+        Long userId = userAuthService.getUserIdFromToken(request);
         List<ScheduleDto> schedules = scheduleService.showSchedulesByPeriod(userId, startDate, endDate);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(schedules));
     }
@@ -96,9 +94,8 @@ public ResponseEntity<ApiResponseForm<ScheduleDto>> getScheduleById(
                     example = "3fa85f64-5717-4562-b3fc-2c963f66afe5")
             @RequestParam UUID scheduleId) {
 
-        Long userId = scheduleService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
         ScheduleDto schedule = scheduleService.showScheduleByScheduleId(userId, scheduleId);
-
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(schedule));
     }
 
@@ -119,8 +116,7 @@ public ResponseEntity<ApiResponseForm<ScheduleDto>> getScheduleById(
     })
     @DeleteMapping("/delete/{scheduleId}")
     public ResponseEntity<ApiResponseForm<Void>> deleteSchedule(HttpServletRequest request, @PathVariable UUID scheduleId) {
-        Long userId = scheduleService.getUserIdFromToken(request);
-
+        Long userId = userAuthService.getUserIdFromToken(request);
         scheduleService.deleteSchedule(scheduleId, userId);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
     }
@@ -145,8 +141,7 @@ public ResponseEntity<ApiResponseForm<Void>> deleteSchedule(HttpServletRequest r
     })
     @PutMapping("/modify")
     public ResponseEntity<ApiResponseForm<Void>> modifySchedule(HttpServletRequest request, @RequestBody ScheduleModDto scheduleModDto) {
-        Long userId = scheduleService.getUserIdFromToken(request);
-
+        Long userId = userAuthService.getUserIdFromToken(request);
         scheduleService.modifySchedule(userId, scheduleModDto);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
     }
@@ -171,8 +166,7 @@ public ResponseEntity<ApiResponseForm<Void>> modifySchedule(HttpServletRequest r
     })
     @PostMapping("/add")
     public ResponseEntity<ApiResponseForm<Void>> addSchedule(HttpServletRequest request, @RequestBody ScheduleAddDto scheduleAddDto) {
-        Long userId = scheduleService.getUserIdFromToken(request);
-
+        Long userId = userAuthService.getUserIdFromToken(request);
         scheduleService.addSchedule(scheduleAddDto, userId);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
     }
@@ -194,8 +188,7 @@ public ResponseEntity<ApiResponseForm<Void>> addSchedule(HttpServletRequest requ
     })
     @PatchMapping("/start/{scheduleId}")
     public ResponseEntity<ApiResponseForm<Void>> isStartedSchedule(HttpServletRequest request, @PathVariable UUID scheduleId) {
-        Long userId = scheduleService.getUserIdFromToken(request);
-
+        Long userId = userAuthService.getUserIdFromToken(request);
         scheduleService.checkIsStarted(scheduleId, userId);
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(null));
 
@@ -226,7 +219,6 @@ public ResponseEntity<ApiResponseForm<Void>> isStartedSchedule(HttpServletReques
     public ResponseEntity<ApiResponseForm<List<LatenessHistoryResponse>>> getLatenessHistory(HttpServletRequest request) {
         Long userId = userAuthService.getUserIdFromToken(request);
         List<LatenessHistoryResponse> latenessHistory = scheduleService.getLatenessHistory(userId);
-
         String message = "지각 히스토리 조회 성공!";
         return ResponseEntity.ok(ApiResponseForm.success(latenessHistory, message));
     }
@@ -252,9 +244,8 @@ public ResponseEntity<ApiResponseForm<List<LatenessHistoryResponse>>> getLatenes
     })
     @GetMapping("/get/preparation/{scheduleId}")
     public ResponseEntity<ApiResponseForm<List<PreparationDto>>> getPreparation(HttpServletRequest request, @PathVariable UUID scheduleId) {
-        Long userId = scheduleService.getUserIdFromToken(request);
+        Long userId = userAuthService.getUserIdFromToken(request);
         List<PreparationDto> preparationDtoList = scheduleService.getPreparations(userId, scheduleId);
-
         return ResponseEntity.status(HttpStatus.OK).body(ApiResponseForm.success(preparationDtoList));
     }
 
@@ -289,9 +280,7 @@ public ResponseEntity<ApiResponseForm<?>> finishSchedule(
             @RequestBody FinishPreparationDto finishPreparationDto) {
 
         Long userId = userAuthService.getUserIdFromToken(request);
-
         scheduleService.finishSchedule(userId, finishPreparationDto);
-
         String message = "지각시간과 성실도점수가 성공적으로 업데이트 되었습니다!";
         return ResponseEntity.ok(ApiResponseForm.success(null, message));
     }

ontime-back/src/main/java/devkor/ontime_back/controller/SocialAuthController.java

@@ -15,7 +15,10 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController

ontime-back/src/main/java/devkor/ontime_back/controller/UserAuthController.java

@@ -1,6 +1,8 @@
 package devkor.ontime_back.controller;
 
-import devkor.ontime_back.dto.*;
+import devkor.ontime_back.dto.ChangePasswordDto;
+import devkor.ontime_back.dto.UserInfoResponse;
+import devkor.ontime_back.dto.UserSignUpDto;
 import devkor.ontime_back.entity.User;
 import devkor.ontime_back.repository.UserRepository;
 import devkor.ontime_back.response.ApiResponseForm;
@@ -16,8 +18,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.security.Principal;
-import java.util.HashMap;
 import java.util.Map;
 
 
@@ -26,7 +26,6 @@
 public class UserAuthController {
 
     private final UserAuthService userAuthService;
-    private final UserRepository userRepository;
 
     @Operation(
             summary = "일반 회원가입 (회원가입 시 자동으로 로그인도 되어 헤더에 JWT토큰을 반환함)",
@@ -50,7 +49,6 @@ public class UserAuthController {
     @PostMapping("/sign-up")
     public ResponseEntity<ApiResponseForm<UserInfoResponse>> signUp(HttpServletRequest request, HttpServletResponse response, @RequestBody UserSignUpDto userSignUpDto) throws Exception {
         User user = userAuthService.signUp(request, response, userSignUpDto);
-
         String message = "회원가입이 성공적으로 완료되었습니다. 온보딩을 진행해주세요( /user/onboarding )";
         UserInfoResponse userSignUpResponse = UserInfoResponse.builder()
                 .userId(user.getId())
@@ -61,7 +59,6 @@ public ResponseEntity<ApiResponseForm<UserInfoResponse>> signUp(HttpServletReque
                 .note(user.getNote())
                 .punctualityScore(user.getPunctualityScore())
                 .build();
-
         return ResponseEntity.ok(ApiResponseForm.success(userSignUpResponse, message));
     }
 
@@ -110,9 +107,7 @@ public String login(
     @PutMapping("/change-password")
     public ResponseEntity<ApiResponseForm<String>> changePassword(HttpServletRequest request, @RequestBody ChangePasswordDto changePasswordDto) {
         Long userId = userAuthService.getUserIdFromToken(request);
-
         userAuthService.changePassword(userId, changePasswordDto);
-
         String message = "비밀번호가 성공적으로 변경되었습니다!";
         return ResponseEntity.ok(ApiResponseForm.success(null, message));
     }
@@ -143,7 +138,6 @@ public ResponseEntity<ApiResponseForm<String>> changePassword(HttpServletRequest
     public ResponseEntity<ApiResponseForm<?>> deleteUser(HttpServletRequest request) {
         Long userId = userAuthService.getUserIdFromToken(request);
         userAuthService.deleteUser(userId);
-
         String message = "계정이 성공적으로 삭제되었습니다!";
         return ResponseEntity.ok(ApiResponseForm.success(null, message));
     }