🚀 [Deploy] - ResponseDTO 반영

src/main/java/ice/spot/controller/AuthController.java

@@ -1,11 +1,20 @@
 package ice.spot.controller;
 
 import ice.spot.annotation.UserId;
+import ice.spot.constant.Constants;
 import ice.spot.dto.global.ResponseDto;
 import ice.spot.dto.request.OauthSignUpDto;
+import ice.spot.dto.response.JwtTokenDto;
+import ice.spot.exception.CommonException;
+import ice.spot.exception.ErrorCode;
 import ice.spot.service.AuthService;
+import ice.spot.util.CookieUtil;
+import ice.spot.util.HeaderUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,11 +26,31 @@
 @RequiredArgsConstructor
 public class AuthController {
 
+    @Value("${server.domain}")
+    private String domain;
+
     private final AuthService authService;
 
     @PostMapping("/oauth2/sign-up")
     public ResponseDto<?> signUp(@UserId Long userId, @RequestBody OauthSignUpDto oauthSignUpDto) {
         authService.signUp(userId, oauthSignUpDto);
         return ResponseDto.ok(null);
     }
+
+    @PostMapping("/auth/reissue")
+    public ResponseDto<?> reissue(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            @UserId Long userId){
+        log.info("controller 진입 성공");
+        String refreshToken = HeaderUtil.refineHeader(request, Constants.PREFIX_AUTH, Constants.PREFIX_BEARER)
+                .orElseThrow(() -> new CommonException(ErrorCode.INVALID_HEADER_VALUE));
+        log.info("헤더값 조회 성공");
+        JwtTokenDto jwtTokenDto = authService.reGenerateTokens(userId, refreshToken);
+
+        CookieUtil.addCookie(response, domain, Constants.ACCESS_COOKIE_NAME, jwtTokenDto.accessToken());
+        CookieUtil.addSecureCookie(response, domain, Constants.REFRESH_COOKIE_NAME, jwtTokenDto.refreshToken(), 60 * 60 * 24 * 14);
+
+        return ResponseDto.ok(jwtTokenDto);
+    }
 }

src/main/java/ice/spot/dto/boardingrecord/response/BoardingRecordListResponse.java

@@ -1,14 +1,17 @@
 package ice.spot.dto.boardingrecord.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import ice.spot.dto.user.response.PersonResponse;
 import lombok.Builder;
 
 import java.util.List;
 
 @Builder
 public record BoardingRecordListResponse(
+        @JsonProperty("person")
         PersonResponse personResponse,
 
+        @JsonProperty("records")
         List<BoardingRecordResponse> boardingRecordResponseList
 ) {
 }

src/main/java/ice/spot/dto/parkingLot/response/ParkingLotResponseList.java

@@ -0,0 +1,18 @@
+package ice.spot.dto.parkingLot.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record ParkingLotResponseList(
+        @JsonProperty("parkingLotList")
+        List<ParkingLotResponse> parkingLotResponseList
+) {
+    public static ParkingLotResponseList of(final List<ParkingLotResponse> parkingLotResponse) {
+        return ParkingLotResponseList.builder()
+                .parkingLotResponseList(parkingLotResponse)
+                .build();
+    }
+}

src/main/java/ice/spot/service/AuthService.java

@@ -2,9 +2,11 @@
 
 import ice.spot.domain.User;
 import ice.spot.dto.request.OauthSignUpDto;
+import ice.spot.dto.response.JwtTokenDto;
 import ice.spot.exception.CommonException;
 import ice.spot.exception.ErrorCode;
 import ice.spot.repository.UserRepository;
+import ice.spot.util.JwtUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -16,6 +18,7 @@
 public class AuthService {
 
     private final UserRepository userRepository;
+    private final JwtUtil jwtUtil;
 
     @Transactional
     public void signUp(Long userId, OauthSignUpDto oauthSignUpDto){
@@ -25,4 +28,15 @@ public void signUp(Long userId, OauthSignUpDto oauthSignUpDto){
         oauthUser.register(oauthSignUpDto.nickname());
     }
 
+    @Transactional
+    public JwtTokenDto reGenerateTokens(Long userId, String refreshToken){
+        log.info("re generate tokens 진입성공");
+        User loginUser = userRepository.findByIdAndRefreshToken(userId, refreshToken)
+                .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_USER));
+        log.info("유저 조회 성공");
+        JwtTokenDto jwtTokenDto = jwtUtil.generateTokens(loginUser.getId(), loginUser.getRole());
+
+        loginUser.updateRefreshToken(jwtTokenDto.refreshToken());
+        return jwtTokenDto;
+    }
 }

src/main/java/ice/spot/service/ParkingLotService.java

@@ -1,6 +1,7 @@
 package ice.spot.service;
 
 import ice.spot.dto.parkingLot.response.ParkingLotResponse;
+import ice.spot.dto.parkingLot.response.ParkingLotResponseList;
 import ice.spot.repository.ParkingLotRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +20,7 @@ public class ParkingLotService {
     private final ParkingLotRepository parkingLotRepository;
 
     @Transactional(readOnly = true)
-    public List<ParkingLotResponse> parkingLotList(Double lat, Double lon) {
+    public ParkingLotResponseList parkingLotList(Double lat, Double lon) {
 
         List<ParkingLotResponse> parkingLotResponseList = new ArrayList<>(parkingLotRepository.findAll().stream()
                 .map(parkingLot -> ParkingLotResponse.builder()
@@ -41,6 +42,6 @@ public int compare(ParkingLotResponse o1, ParkingLotResponse o2) {
             }
         });
 
-        return parkingLotResponseList.subList(0, 5);
+        return ParkingLotResponseList.of(parkingLotResponseList.subList(0, 5));
     }
 }