fix(api): sync progress

sweetr-dev · Jul 9, 2024 · fe17756 · fe17756
1 parent f47bb9b
commit fe17756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/apps/api/src/app/github/services/github-pull-request.service.ts b/apps/api/src/app/github/services/github-pull-request.service.ts
@@ -37,9 +37,10 @@ type RepositoryData = Omit<
 export const syncPullRequest = async (
   gitInstallationId: number,
   pullRequestId: string,
-  { syncReviews, initialSync } = {
+  { syncReviews, initialSync, failCount } = {
     syncReviews: false,
     initialSync: false,
+    failCount: 0,
   }
 ) => {
   logger.info("syncPullRequest", {
@@ -59,6 +60,10 @@ export const syncPullRequest = async (
     return;
   }
 
+  if (initialSync && failCount === 0) {
+    incrementInitialSyncProgress(workspace.id, "done", 1);
+  }
+
   const gitPrData = await fetchPullRequest(gitInstallationId, pullRequestId);
 
   if (gitPrData.repository.isFork) {
@@ -86,10 +91,6 @@ export const syncPullRequest = async (
     gitPrData
   );
 
-  if (initialSync) {
-    incrementInitialSyncProgress(workspace.id, "done", 1);
-  }
-
   if (syncReviews) {
     logger.debug("syncPullRequest: Adding job to sync reviews", {
       gitPrData,

diff --git a/apps/api/src/app/github/workers/github-sync-pull-request.worker.ts b/apps/api/src/app/github/workers/github-sync-pull-request.worker.ts
@@ -37,6 +37,7 @@ export const syncPullRequestWorker = createWorker(
     const options = {
       syncReviews: job.data.syncReviews || false,
       initialSync: job.data.initialSync || false,
+      failCount: job.attemptsMade,
     };
 
     await withDelayedRetryOnRateLimit(