From 014982bc828d3fbb39f0a3aa2fe867503dc4136c Mon Sep 17 00:00:00 2001 From: JongKyeong Kim Date: Thu, 30 Nov 2023 03:51:27 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B9=83=ED=97=88=EB=B8=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/project/Glog/controller/GitHubController.java | 2 +- .../com/project/Glog/repository/GithubRepoRepository.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/project/Glog/controller/GitHubController.java b/server/src/main/java/com/project/Glog/controller/GitHubController.java index 1dec4a8..c616b79 100644 --- a/server/src/main/java/com/project/Glog/controller/GitHubController.java +++ b/server/src/main/java/com/project/Glog/controller/GitHubController.java @@ -67,7 +67,7 @@ public ResponseEntity getPullrequest(@CurrentUser UserPrincipa User user = userRepository.findById(userPrincipal.getId()).get(); String repo = gitHubService.getRepoName(categoryId); - GithubRepository githubRepository = githubRepoRepository.findRepoByUserId(user.getId(), repo).get(); + GithubRepository githubRepository = githubRepoRepository.findRepoByUserId(user.getId(), repo, categoryId).get(); List prInfos = gitHubService.getPr(user,githubRepository.getOwnerName(),repo); return new ResponseEntity<>(gitHubService.saveAndGetPr(prInfos, githubRepository, categoryId, user),HttpStatus.OK); diff --git a/server/src/main/java/com/project/Glog/repository/GithubRepoRepository.java b/server/src/main/java/com/project/Glog/repository/GithubRepoRepository.java index c802760..3130f4d 100644 --- a/server/src/main/java/com/project/Glog/repository/GithubRepoRepository.java +++ b/server/src/main/java/com/project/Glog/repository/GithubRepoRepository.java @@ -14,8 +14,8 @@ public interface GithubRepoRepository extends JpaRepository findByRepoName(@Param("userId") Long userid , @Param("reponame") String reponame); - @Query("SELECT gr FROM GithubRepository gr WHERE gr.user.id = :userId AND gr.repoName=:repo") - Optional findRepoByUserId(@Param("userId") Long userid, @Param("repo") String repo); + @Query("SELECT gr FROM GithubRepository gr WHERE gr.user.id = :userId AND gr.repoName=:repo AND gr.category.id=:categoryId") + Optional findRepoByUserId(@Param("userId") Long userid, @Param("repo") String repo,@Param("categoryId") Long categoryId); @Query("SELECT gr.repoName FROM GithubRepository gr WHERE gr.user.id = :userId AND gr.isCategoryRegi=false") List findRepoNameByUserId(@Param("userId") Long userid);