[REFACTOR] 복수의 사용자가 같은 레포를 트래킹할 때의 시나리오 고려

gss-api-app/src/main/java/com/devoops/controller/docs/RepositoryControllerSwagger.java

@@ -1,11 +1,7 @@
 package com.devoops.controller.docs;
 
-import com.devoops.controller.auth.AuthUser;
-import com.devoops.domain.entity.github.GithubRepository;
-import com.devoops.domain.entity.github.PullRequests;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.RepositorySaveRequest;
-import com.devoops.dto.response.AnswerUpdateResponse;
 import com.devoops.dto.response.MyRepositoriesResponse;
 import com.devoops.dto.response.RepositoryPullRequestResponses;
 import com.devoops.dto.response.RepositorySaveResponse;
@@ -17,10 +13,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Tag(name = "Repository API")
 @SecurityRequirement(name = "Authorization")

gss-api-app/src/main/java/com/devoops/controller/pullrequests/PullRequestController.java

@@ -2,7 +2,7 @@
 
 import com.devoops.controller.auth.AuthUser;
 import com.devoops.controller.docs.PullRequestControllerSwagger;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.response.PullRequestDetailReadResponse;
 import com.devoops.dto.response.PullRequestRankingResponses;

gss-api-app/src/main/java/com/devoops/controller/question/QuestionController.java

@@ -2,8 +2,8 @@
 
 import com.devoops.controller.auth.AuthUser;
 import com.devoops.controller.docs.QuestionControllerSwagger;
-import com.devoops.domain.entity.github.Answer;
-import com.devoops.domain.entity.github.Answers;
+import com.devoops.domain.entity.github.answer.Answer;
+import com.devoops.domain.entity.github.answer.Answers;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.AnswerPutRequests;
 import com.devoops.dto.request.AnswerUpdateRequest;

gss-api-app/src/main/java/com/devoops/controller/repository/RepositoryController.java

@@ -2,8 +2,8 @@
 
 import com.devoops.controller.auth.AuthUser;
 import com.devoops.controller.docs.RepositoryControllerSwagger;
-import com.devoops.domain.entity.github.GithubRepository;
-import com.devoops.domain.entity.github.PullRequests;
+import com.devoops.domain.entity.github.repo.GithubRepository;
+import com.devoops.domain.entity.github.pr.PullRequests;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.RepositorySaveRequest;
 import com.devoops.dto.response.MyRepositoriesResponse;

gss-api-app/src/main/java/com/devoops/dto/response/AnswerPutResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.Answer;
+import com.devoops.domain.entity.github.answer.Answer;
 
 public record AnswerPutResponse(
         long answerId,

gss-api-app/src/main/java/com/devoops/dto/response/AnswerPutResponses.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.Answers;
+import com.devoops.domain.entity.github.answer.Answers;
 import java.util.List;
 import java.util.stream.Collectors;
 

gss-api-app/src/main/java/com/devoops/dto/response/AnswerSaveResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.Answer;
+import com.devoops.domain.entity.github.answer.Answer;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public record AnswerSaveResponse(

gss-api-app/src/main/java/com/devoops/dto/response/AnswerUpdateResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.Answer;
+import com.devoops.domain.entity.github.answer.Answer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 

gss-api-app/src/main/java/com/devoops/dto/response/MyRepositoriesResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.GithubRepository;
+import com.devoops.domain.entity.github.repo.GithubRepository;
 
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;

gss-api-app/src/main/java/com/devoops/dto/response/PullRequestDetailReadResponse.java

@@ -1,8 +1,8 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.PullRequest;
+import com.devoops.domain.entity.github.pr.PullRequest;
 import com.devoops.domain.entity.github.QuestionAnswer;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

gss-api-app/src/main/java/com/devoops/dto/response/PullRequestRankingResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.AnswerRanking;
+import com.devoops.domain.entity.github.answer.AnswerRanking;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

gss-api-app/src/main/java/com/devoops/dto/response/PullRequestRankingResponses.java

@@ -1,7 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.AnswerRankings;
-import com.devoops.dto.request.AnswerPutRequest;
+import com.devoops.domain.entity.github.answer.AnswerRankings;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;

gss-api-app/src/main/java/com/devoops/dto/response/PullRequestReadResponse.java

@@ -1,8 +1,8 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.PullRequest;
+import com.devoops.domain.entity.github.pr.PullRequest;
 import com.devoops.domain.entity.github.QuestionAnswer;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

gss-api-app/src/main/java/com/devoops/dto/response/RepositoryPullRequestResponse.java

@@ -1,7 +1,7 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.PullRequest;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.pr.PullRequest;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

gss-api-app/src/main/java/com/devoops/dto/response/RepositoryPullRequestResponses.java

@@ -1,7 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.PullRequests;
-import com.devoops.dto.request.AnswerPutRequest;
+import com.devoops.domain.entity.github.pr.PullRequests;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;

gss-api-app/src/main/java/com/devoops/dto/response/RepositorySaveResponse.java

@@ -1,6 +1,6 @@
 package com.devoops.dto.response;
 
-import com.devoops.domain.entity.github.GithubRepository;
+import com.devoops.domain.entity.github.repo.GithubRepository;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 public record RepositorySaveResponse(

gss-api-app/src/main/java/com/devoops/service/GitHubService.java

@@ -1,27 +1,15 @@
 package com.devoops.service;
 
 import com.devoops.client.GitHubClient;
-import com.devoops.domain.entity.github.GithubRepository;
-import com.devoops.domain.entity.github.GithubToken;
-import com.devoops.domain.entity.github.GithubWebhook;
+import com.devoops.domain.entity.github.token.GithubToken;
 import com.devoops.domain.entity.user.User;
-import com.devoops.domain.repository.github.GithubRepoDomainRepository;
-import com.devoops.domain.repository.github.GithubTokenDomainRepository;
-import com.devoops.domain.repository.github.GithubWebhookDomainRepository;
-import com.devoops.dto.request.GitHubWebhookRequest;
 import com.devoops.dto.request.GithubRepoUrl;
 import com.devoops.dto.response.GithubPrResponse;
 import com.devoops.dto.response.GithubRepoInfoResponse;
-import com.devoops.dto.response.WebHookCreateResponse;
-import com.devoops.exception.GithubNotFoundException;
-import com.devoops.exception.custom.GssException;
-import com.devoops.exception.errorcode.ErrorCode;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
@@ -33,32 +21,7 @@ public class GitHubService {
     private static final int MAX_PER_PAGE_PULL_REQUEST = 10;
     private static final String REQUEST_PULL_REQUEST_STATUS = "closed";
 
-    @Value("${dev-oops.mcp.webhook-url}")
-    private String mcpWebhookUrl;
-
     private final GitHubClient gitHubClient;
-    private final GithubRepoDomainRepository githubRepoDomainRepository;
-    private final GithubTokenDomainRepository githubTokenDomainRepository;
-    private final GithubWebhookDomainRepository githubWebhookDomainRepository;
-
-    public void registerWebhook(User user, long repositoryId) {
-
-        GithubRepository githubRepository = githubRepoDomainRepository.findByIdAndUserId(repositoryId, user.getId());
-        GithubToken githubToken = githubTokenDomainRepository.findByUserId(user)
-                .orElseThrow(() -> new GssException(ErrorCode.NO_RESOURCE_FOUND));
-        createWebHook(githubToken, githubRepository);
-    }
-
-    private GithubWebhook createWebHook(GithubToken token, GithubRepository repo) {
-        WebHookCreateResponse webHookCreateResponse = gitHubClient.createWebhook(
-                BEARER_PREFIX + token.getToken(),
-                repo.getOwner(),
-                repo.getName(),
-                GitHubWebhookRequest.ofPullRequestEvent(mcpWebhookUrl)
-        );
-        GithubWebhook webhook = new GithubWebhook(webHookCreateResponse.id(), repo.getId());
-        return githubWebhookDomainRepository.save(webhook);
-    }
 
     public List<GithubPrResponse> getUserPullRequests(
             GithubRepoUrl repoUrl,
@@ -86,27 +49,4 @@ public GithubRepoInfoResponse getRepositoryInfo(GithubRepoUrl repoUrl, GithubTok
                 repoUrl.getRepoName()
         );
     }
-
-    @Transactional
-    public void deleteWebhook(User user, long repositoryId) {
-        GithubRepository repo = githubRepoDomainRepository.findByIdAndUserId(repositoryId, user.getId());
-        GithubToken githubToken = githubTokenDomainRepository.findByUserId(user)
-                .orElseThrow(() -> new GssException(ErrorCode.NO_RESOURCE_FOUND));
-        GithubWebhook webhook = githubWebhookDomainRepository.findByRepositoryId(repo.getId());
-        tryDeleteWebhook(githubToken, webhook, repo);
-        githubWebhookDomainRepository.deleteById(webhook.getId());
-    }
-
-    private void tryDeleteWebhook(GithubToken githubToken, GithubWebhook webhook, GithubRepository repo) {
-        try {
-            gitHubClient.deleteWebhook(
-                    BEARER_PREFIX + githubToken.getToken(),
-                    repo.getOwner(),
-                    repo.getName(),
-                    webhook.getExternalId()
-            );
-        } catch (GithubNotFoundException githubNotFoundException) {
-            log.error("깃허브 레포에서 웹훅을 찾을 수 없습니다 : {}, repo : {} ", githubNotFoundException, repo.getName());
-        }
-    }
 }

gss-api-app/src/main/java/com/devoops/service/facade/AuthFacadeService.java

@@ -1,6 +1,6 @@
 package com.devoops.service.facade;
 
-import com.devoops.domain.entity.github.GithubToken;
+import com.devoops.domain.entity.github.token.GithubToken;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.UserSaveRequest;
 import com.devoops.dto.response.AuthResponse;

gss-api-app/src/main/java/com/devoops/service/facade/PullRequestFacadeService.java

@@ -1,9 +1,9 @@
 package com.devoops.service.facade;
 
-import com.devoops.domain.entity.github.AnswerRankings;
-import com.devoops.domain.entity.github.PullRequest;
+import com.devoops.domain.entity.github.answer.AnswerRankings;
+import com.devoops.domain.entity.github.pr.PullRequest;
 import com.devoops.domain.entity.github.QuestionAnswer;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import com.devoops.dto.response.PullRequestDetailReadResponse;
 import com.devoops.dto.response.PullRequestRankingResponses;
 import com.devoops.dto.response.PullRequestReadResponse;

gss-api-app/src/main/java/com/devoops/service/facade/QuestionFacadeService.java

@@ -1,10 +1,10 @@
 package com.devoops.service.facade;
 
 import com.devoops.command.request.AnswerUpdateCommand;
-import com.devoops.domain.entity.github.Answer;
-import com.devoops.domain.entity.github.Answers;
-import com.devoops.domain.entity.github.PullRequest;
-import com.devoops.domain.entity.github.RecordStatus;
+import com.devoops.domain.entity.github.answer.Answer;
+import com.devoops.domain.entity.github.answer.Answers;
+import com.devoops.domain.entity.github.pr.PullRequest;
+import com.devoops.domain.entity.github.pr.RecordStatus;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.AnswerPutRequests;
 import com.devoops.service.answer.AnswerService;

gss-api-app/src/main/java/com/devoops/service/facade/RepositoryFacadeService.java

@@ -3,14 +3,15 @@
 import static com.devoops.Constants.INITIAL_PULL_REQUEST_COUNT;
 
 import com.devoops.command.request.RepositoryCreateCommand;
-import com.devoops.domain.entity.github.GithubRepository;
-import com.devoops.domain.entity.github.PullRequests;
+import com.devoops.domain.entity.github.repo.GithubRepository;
+import com.devoops.domain.entity.github.pr.PullRequests;
 import com.devoops.domain.entity.user.User;
 import com.devoops.dto.request.GithubRepoUrl;
 import com.devoops.dto.request.RepositorySaveRequest;
 import com.devoops.dto.response.GithubRepoInfoResponse;
 import com.devoops.event.AnalyzeMyPrEvent;
 import com.devoops.service.GitHubService;
+import com.devoops.service.github.WebHookService;
 import com.devoops.service.repository.RepositoryService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -24,13 +25,14 @@ public class RepositoryFacadeService {
 
     private final RepositoryService repositoryService;
     private final GitHubService gitHubService;
+    private final WebHookService webHookService;
     private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public GithubRepository save(RepositorySaveRequest request, User user) {
         GithubRepoUrl repoUrl = new GithubRepoUrl(request.url());
         GithubRepository savedRepository = saveRepository(repoUrl, user);
-        gitHubService.registerWebhook(user, savedRepository.getId());
+        webHookService.registerWebhook(user, savedRepository.getId());
         eventPublisher.publishEvent(new AnalyzeMyPrEvent(repoUrl, user, this));
         return savedRepository;
     }
@@ -62,7 +64,8 @@ public List<GithubRepository> findMyRepositories(User user) {
 
     @Transactional
     public void deleteRepository(User user, long repositoryId) {
-        gitHubService.deleteWebhook(user, repositoryId);
+        //TODO 다른 유저로부터 등록된 상황 고려
         repositoryService.stopTrackingRepository(user, repositoryId);
+        webHookService.deleteWebhook(user, repositoryId);
     }
 }