Merge pull request #58 from CSID-DGU/backend/feature/BE_AI

BE: [fix] 학생 세션 입장 토큰 응답 구조 수정 #6
CSID-DGU · Nov 25, 2024 · 2bd0834 · 2bd0834
2 parents 3bc4fce + c54c946
commit 2bd0834
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/backend/Eyesee/src/main/java/com/fortune/eyesee/controller/SessionController.java b/src/backend/Eyesee/src/main/java/com/fortune/eyesee/controller/SessionController.java
@@ -33,9 +33,10 @@ public ResponseEntity<BaseResponse<ExamInfoResponseDTO>> joinExam(@RequestBody E
 
     // 학생 정보 입력
     @PostMapping("/student")
-    public ResponseEntity<BaseResponse<TokenResponseDTO>> addUserInfo(@RequestBody UserInfoRequestDTO userInfoRequestDTO) {
-        TokenResponseDTO tokenResponseDTO = sessionService.addUserInfo(userInfoRequestDTO);
-        return ResponseEntity.ok(new BaseResponse<>(tokenResponseDTO, "사용자 정보 입력 성공"));
+    public ResponseEntity<BaseResponse<TokenWithUserIdResponseDTO>> addUserInfo(@RequestBody UserInfoRequestDTO userInfoRequestDTO) {
+        // 학생 정보 입력, 토큰 및 userId 반환
+        TokenWithUserIdResponseDTO tokenWithUserIdResponseDTO = sessionService.addUserInfo(userInfoRequestDTO);
+        return ResponseEntity.ok(new BaseResponse<>(tokenWithUserIdResponseDTO, "사용자 정보 입력 성공"));
 
     }
 }
diff --git a/src/backend/Eyesee/src/main/java/com/fortune/eyesee/dto/TokenWithUserIdResponseDTO.java b/src/backend/Eyesee/src/main/java/com/fortune/eyesee/dto/TokenWithUserIdResponseDTO.java
@@ -0,0 +1,14 @@
+package com.fortune.eyesee.dto;
+
+public class TokenWithUserIdResponseDTO extends TokenResponseDTO {
+    private Integer userId;
+
+    public TokenWithUserIdResponseDTO(String accessToken, String refreshToken, Integer userId) {
+        super(accessToken, refreshToken);
+        this.userId = userId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+}
diff --git a/src/backend/Eyesee/src/main/java/com/fortune/eyesee/service/SessionService.java b/src/backend/Eyesee/src/main/java/com/fortune/eyesee/service/SessionService.java
@@ -2,6 +2,7 @@
 
 import com.fortune.eyesee.common.exception.BaseException;
 import com.fortune.eyesee.common.response.BaseResponseCode;
+import com.fortune.eyesee.dto.TokenWithUserIdResponseDTO;
 import com.fortune.eyesee.dto.UserInfoRequestDTO;
 import com.fortune.eyesee.dto.TokenResponseDTO;
 import com.fortune.eyesee.entity.Session;
@@ -28,7 +29,7 @@ public class SessionService {
 
     // 세션에 학생을 등록하고 토큰을 발급
     @Transactional
-    public TokenResponseDTO addUserInfo(UserInfoRequestDTO requestDTO) {
+    public TokenWithUserIdResponseDTO addUserInfo(UserInfoRequestDTO requestDTO) {
         // 시험 세션 찾기
         Session session = sessionRepository.findByExamExamRandomCode(requestDTO.getExamCode())
                 .orElseThrow(() -> new BaseException(BaseResponseCode.NOT_FOUND_SESSION));
@@ -47,7 +48,7 @@ public TokenResponseDTO addUserInfo(UserInfoRequestDTO requestDTO) {
 
         // 세션 토큰 생성 및 반환
         String accessToken = jwtUtil.generateSessionToken(session.getSessionId(), user.getUserNum());
-        return new TokenResponseDTO(accessToken, null);  // Refresh Token은 필요 없으므로 null 설정
+        return new TokenWithUserIdResponseDTO(accessToken, null, user.getUserId());  // Refresh Token은 필요 없으므로 null 설정
     }
 
 }