Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
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 com.devoops.jpa.repository.github.GithubWebHookDomainRepositoryImpl;
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
@RequiredArgsConstructor
public class GitHubService {
Expand Down Expand Up @@ -91,12 +93,20 @@ public void deleteWebhook(User user, long repositoryId) {
GithubToken githubToken = githubTokenDomainRepository.findByUserId(user)
.orElseThrow(() -> new GssException(ErrorCode.NO_RESOURCE_FOUND));
GithubWebhook webhook = githubWebhookDomainRepository.findByRepositoryId(repo.getId());
gitHubClient.deleteWebhook(
BEARER_PREFIX + githubToken.getToken(),
repo.getOwner(),
repo.getName(),
webhook.getExternalId()
);
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());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.times;

Expand All @@ -16,6 +17,7 @@
import com.devoops.dto.response.GithubRepoInfoResponse;
import com.devoops.dto.response.OwnerResponse;
import com.devoops.dto.response.WebHookCreateResponse;
import com.devoops.exception.GithubNotFoundException;
import com.devoops.exception.custom.GssException;
import com.devoops.exception.errorcode.ErrorCode;
import org.junit.jupiter.api.Nested;
Expand Down Expand Up @@ -78,4 +80,23 @@ private void mockingGithubClient() {
.thenReturn(mockWebHookCreateResponse);
}
}

@Nested
class Delete {

@Test
void 웹훅을_찾지_못해도_레포지토리_트래킹을_끊을_수_있다() {
User user = userGenerator.generate("김건우");
GithubRepository repo = repoGenerator.generate(user, "건우의 레포");
webhookGenerator.generate(user, repo);
Mockito.doThrow(new GithubNotFoundException("mocking error"))
.when(gitHubClient)
.deleteWebhook(anyString(), anyString(), anyString(), anyLong());

repositoryFacadeService.deleteRepository(user, repo.getId());

GithubRepository foundRepo = githubRepoDomainRepository.findByIdAndUserId(repo.getId(), user.getId());
assertThat(foundRepo.isTracking()).isFalse();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.devoops.client;

import com.devoops.exception.GithubNotFoundException;
import com.devoops.exception.custom.GssException;
import com.devoops.exception.errorcode.ErrorCode;
import java.util.Map;
Expand Down Expand Up @@ -27,7 +28,7 @@ public ExchangeFilterFunction githubErrorLogger() {
"response", body
));
if (response.statusCode().isSameCodeAs(HttpStatusCode.valueOf(404))) {
return Mono.error(new GssException(ErrorCode.MALFORMED_GITHUB_REPOSITORY_URL));
return Mono.error(new GithubNotFoundException("깃허브에서 자원을 찾을 수 없습니다."));
}
return Mono.error(new GssException(ErrorCode.GITHUB_CLIENT_ERROR));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.devoops.exception;

public class GithubNotFoundException extends RuntimeException {
public GithubNotFoundException(String message) {
super(message);
}
}
Loading