[REFACT] README upload - @AuthenticationPrincipal로 UserId를 받아 사용하도록 수정

2024-2-3M1S · Dec 2, 2024 · 71f8534 · 71f8534
1 parent 458b98d
commit 71f8534
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/main/java/org/autorepo/server/domain/readme/controller/ReadmeController.java b/src/main/java/org/autorepo/server/domain/readme/controller/ReadmeController.java
@@ -1,28 +1,19 @@
 package org.autorepo.server.domain.readme.controller;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.sun.net.httpserver.Authenticator;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.autorepo.server.domain.readme.dto.request.ReadmeRequest;
 import org.autorepo.server.domain.readme.dto.request.UploadReadmeRequest;
 import org.autorepo.server.domain.readme.dto.response.ReadmeResponse;
-import org.autorepo.server.domain.readme.entity.Readme;
 import org.autorepo.server.domain.readme.service.CreateReadmeService;
 import org.autorepo.server.domain.readme.service.UploadReadmeService;
-import org.autorepo.server.domain.template.dto.request.ShareTemplateRequestDto;
-import org.autorepo.server.domain.user.repository.UserRepository;
 import org.autorepo.server.global.common.SuccessResponse;
 import org.autorepo.server.global.error.ErrorCode;
 import org.autorepo.server.global.error.exception.EntityNotFoundException;
-import org.autorepo.server.global.utils.GitHubService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import static org.autorepo.server.global.error.ErrorCode.USER_NOT_FOUND;
-
 @Slf4j
 @RequiredArgsConstructor
 @RequestMapping("/api/readme")
@@ -46,10 +37,11 @@ public ResponseEntity<ReadmeResponse> generateAndSaveReadme(@RequestBody ReadmeR
     }
 
     @PutMapping("/upload")
-    public ResponseEntity<SuccessResponse<?>> uploadReadme(
-            @RequestBody UploadReadmeRequest uploadReadmeRequest,
-            @AuthenticationPrincipal String userGithubId) {
-        uploadReadmeService.uploadReadme(uploadReadmeRequest, userGithubId);
+    public ResponseEntity<SuccessResponse<?>> uploadReadme(@RequestBody UploadReadmeRequest uploadReadmeRequest, @AuthenticationPrincipal Long userId) {
+        if (userId == null) {
+            throw new EntityNotFoundException(ErrorCode.USER_ID_MISSING);
+        }
+        uploadReadmeService.uploadReadme(uploadReadmeRequest, userId);
         return SuccessResponse.created(null);
     }
 }
diff --git a/src/main/java/org/autorepo/server/domain/readme/service/UploadReadmeService.java b/src/main/java/org/autorepo/server/domain/readme/service/UploadReadmeService.java
@@ -5,6 +5,7 @@
 import org.autorepo.server.domain.readme.dto.request.UploadReadmeRequest;
 import org.autorepo.server.domain.user.entity.User;
 import org.autorepo.server.domain.user.repository.UserRepository;
+import org.autorepo.server.global.error.ErrorCode;
 import org.autorepo.server.global.error.exception.EntityNotFoundException;
 import org.autorepo.server.global.error.exception.InternalServerException;
 import org.autorepo.server.global.utils.GitHubService;
@@ -30,11 +31,16 @@ public class UploadReadmeService {
 
     private static final String GITHUB_README_API = "https://api.github.com/repos/%s/%s/contents/README.md";
 
-    public void uploadReadme(UploadReadmeRequest uploadReadmeRequest, String githubLogin) {
-        // GitHub 'login'으로 사용자 조회
-        User user = userRepository.findByGithubId(githubLogin)
+    public void uploadReadme(UploadReadmeRequest uploadReadmeRequest, Long userId) {
+        // User ID로 사용자 조회
+        User user = userRepository.findById(userId)
                 .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
 
+        String githubToken = user.getGithubToken();
+        if (githubToken == null || githubToken.isEmpty()) {
+            throw new EntityNotFoundException(ErrorCode.GITHUB_TOKEN_NOT_FOUND);
+        }
+
         String repoUrl = uploadReadmeRequest.repoUrl();
         String[] repoInfo = repoUrl.replace("https://github.com/", "").split("/");
         if (repoInfo.length < 2) {
@@ -44,10 +50,9 @@ public void uploadReadme(UploadReadmeRequest uploadReadmeRequest, String githubL
         String repo = repoInfo[1];
 
         String content = uploadReadmeRequest.content();
-        String path = "README.md";
 
         HttpHeaders headers = new HttpHeaders();
-        headers.setBearerAuth(user.getGithubToken());
+        headers.setBearerAuth(githubToken);  // GitHub Token 설정
         headers.setContentType(MediaType.APPLICATION_JSON);
 
         String url = String.format(GITHUB_README_API, owner, repo);

diff --git a/src/main/java/org/autorepo/server/global/error/ErrorCode.java b/src/main/java/org/autorepo/server/global/error/ErrorCode.java
@@ -34,6 +34,7 @@ public enum ErrorCode {
     REFRESH_TOKEN_NOT_FOUND(HttpStatus.NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
     TEMPLATE_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 템플릿을 찾을 수 없습니다."),
     README_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 README를 찾을 수 없습니다."),
+    GITHUB_TOKEN_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 Gihub Token을 찾을 수 없습니다."),
 
     /**
      * 405 Method Not Allowed