fix/graphql/database: fix repo permission sync count to ignore soft deleted repositories

Author: ggilmore

internal/database/permission_sync_jobs.go

@@ -722,7 +722,8 @@ FROM
   JOIN users ON users.id = latest_user_sync_jobs.user_id
 WHERE
   latest_user_sync_jobs.state = 'failed'
-  AND users.deleted_at IS NULL; -- exclude jobs from soft-deleted users (hard deleted users are taken care of by the CASCADE foreign key constraint)
+  AND users.deleted_at IS NULL;
+-- exclude jobs from soft-deleted users (hard deleted users are taken care of by the CASCADE foreign key constraint)
 `
 
 // CountUsersWithFailingSyncJob returns count of users with LATEST sync job failing.
@@ -735,16 +736,29 @@ func (s *permissionSyncJobStore) CountUsersWithFailingSyncJob(ctx context.Contex
 }
 
 const countReposWithFailingSyncJobsQuery = `
-SELECT COUNT(*)
-FROM (
-  SELECT DISTINCT ON (repository_id) id, state
-  FROM permission_sync_jobs
+WITH latest_repo_sync_jobs AS (
+  SELECT
+    DISTINCT ON (repository_id) repository_id,
+    id,
+    state
+  FROM
+    permission_sync_jobs
   WHERE
-	repository_id is NOT NULL
-	AND state IN ('completed', 'failed')
-  ORDER BY repository_id, finished_at DESC
-) AS tmp
-WHERE state = 'failed';
+    repository_id is NOT NULL
+    AND state IN ('completed', 'failed')
+  ORDER BY
+    repository_id,
+    finished_at DESC
+)
+SELECT
+  COUNT(*)
+FROM
+  latest_repo_sync_jobs
+  JOIN repo ON repo.id = latest_repo_sync_jobs.repository_id
+WHERE
+  latest_repo_sync_jobs.state = 'failed'
+  AND repo.deleted_at IS NULL;
+-- exclude jobs from soft-deleted repos (hard deleted repos are taken care of by the CASCADE foreign key constraint)
 `
 
 // CountReposWithFailingSyncJob returns count of repos with LATEST sync job failing.

internal/database/permission_sync_jobs_test.go

@@ -1004,6 +1004,31 @@ func TestPermissionSyncJobs_CountReposWithFailingSyncJob(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, int32(2), count, "wrong count")
 	})
+
+	t.Run("Should not count jobs with a deleted repo", func(t *testing.T) {
+		cleanupSyncJobs(t, db, ctx)
+		tempRepo := types.Repo{Name: "test-repo-tmp", ID: 301}
+		err := reposStore.Create(ctx, &tempRepo)
+		require.NoError(t, err)
+		t.Cleanup(func() {
+			_ = reposStore.Delete(ctx, tempRepo.ID) // Ensure we clean up after ourselves.
+		})
+
+		createSyncJob(t, store, ctx, 0, tempRepo.ID) // id = 1
+		finishSyncJobWithFailure(t, db, ctx, 1, clock.Now().Add(-1*time.Hour))
+
+		count, err := store.CountReposWithFailingSyncJob(ctx)
+		require.NoError(t, err)
+		require.Equal(t, int32(1), count, "wrong count")
+
+		// Delete tempRepo
+		err = reposStore.Delete(ctx, tempRepo.ID)
+		require.NoError(t, err)
+		count, err = store.CountReposWithFailingSyncJob(ctx)
+		require.NoError(t, err)
+
+		require.Equal(t, int32(0), count, "wrong count")
+	})
 }
 
 // createSyncJobs creates 10 sync jobs, half with the ReasonManualUserSync reason