Merge pull request #166 from pknu-wap/feature/또또추가사항

깃허브 수정
pknu-wap · Nov 29, 2023 · 0f98081 · 0f98081
2 parents 86187b5 + 014982b
commit 0f98081
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -67,7 +67,7 @@ public ResponseEntity<PrUnPostResponse> 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<PrInfo> 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
@@ -14,8 +14,8 @@ public interface GithubRepoRepository extends JpaRepository<GithubRepository, Lo
     @Query("SELECT gr FROM GithubRepository gr WHERE gr.user.id = :userId AND gr.repoName= :reponame AND gr.isCategoryRegi=false")
     Optional <GithubRepository> 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 <GithubRepository> 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 <GithubRepository> 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<String> findRepoNameByUserId(@Param("userId") Long userid);