Fix merge

Author: ZIJ

backend/controllers/github.go

@@ -92,20 +92,6 @@ func (d DiggerController) GithubAppWebHook(c *gin.Context) {
 			c.String(http.StatusAccepted, "Failed to handle webhook event.")
 			return
 		}
-	case *github.InstallationRepositoriesEvent:
-		slog.Info("Processing InstallationRepositoriesEvent",
-			"action", *event.Action,
-			"installationId", *event.Installation.ID,
-			"repositoriesAdded", len(event.RepositoriesAdded),
-			"repositoriesRemoved", len(event.RepositoriesRemoved),
-		)
-
-		err := handleInstallationRepositoriesEvent(event, appId64)
-		if err != nil {
-			slog.Error("Failed to handle installation repositories event", "error", err)
-			c.String(http.StatusAccepted, "Failed to handle webhook event.")
-			return
-		}
 	case *github.PushEvent:
 		slog.Info("Processing PushEvent",
 			"repo", *event.Repo.FullName,

backend/controllers/github_installation.go

@@ -4,9 +4,11 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"strings"
 
 	"github.com/diggerhq/digger/backend/models"
 	"github.com/diggerhq/digger/backend/utils"
+	ci_github "github.com/diggerhq/digger/libs/ci/github"
 	"github.com/google/go-github/v61/github"
 )
 
@@ -27,6 +29,19 @@ func fetchRepoIdentifiers(ctx context.Context, client *github.Client, repo *gith
 	defaultBranch = repo.GetDefaultBranch()
 	cloneURL = repo.GetCloneURL()
 
+	if owner == "" || name == "" {
+		if repoFullName != "" {
+			if parts := strings.Split(repoFullName, "/"); len(parts) == 2 {
+				if owner == "" {
+					owner = parts[0]
+				}
+				if name == "" {
+					name = parts[1]
+				}
+			}
+		}
+	}
+
 	if repoFullName == "" && owner != "" && name != "" {
 		repoFullName = fmt.Sprintf("%s/%s", owner, name)
 	}
@@ -180,7 +195,21 @@ func handleInstallationUpsertEvent(ctx context.Context, gh utils.GithubClientPro
 
 	repoList := installation.Repositories
 	if len(repoList) == 0 {
-		slog.Warn("No repositories found to sync for installation", "installationId", installationId)
+		client, _, err := gh.Get(appIdFromPayload, installationId)
+		if err != nil {
+			slog.Error("Error creating GitHub client to list repos for upsert", "installationId", installationId, "error", err)
+			return err
+		}
+		repos, err := ci_github.ListGithubRepos(client)
+		if err != nil {
+			slog.Error("Error listing repos for upsert fallback", "installationId", installationId, "error", err)
+			return err
+		}
+		repoList = repos
+	}
+
+	if len(repoList) == 0 {
+		slog.Warn("No repositories found to sync for installation after fallback", "installationId", installationId)
 		return nil
 	}
 

backend/controllers/github_test.go

@@ -866,34 +866,3 @@ func TestJobsTreeWithThreeLevels(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, result["333"].DiggerJobID, parentLinks[0].ParentDiggerJobId)
 }
-
-func TestHandleInstallationRepositoriesEvent(t *testing.T) {
-	teardownSuite, database := setupSuite(t)
-	defer teardownSuite(t)
-
-	// Test repositories added event
-	var addedEvent github.InstallationRepositoriesEvent
-	err := json.Unmarshal([]byte(installationRepositoriesAddedPayload), &addedEvent)
-	assert.NoError(t, err)
-
-	err = handleInstallationRepositoriesEvent(&addedEvent, 360162)
-	assert.NoError(t, err)
-
-	// Verify repo was added
-	installation, err := database.GetGithubAppInstallationByIdAndRepo(41584295, "diggerhq/test-github-action")
-	assert.NoError(t, err)
-	assert.NotNil(t, installation)
-	assert.Equal(t, "diggerhq/test-github-action", installation.Repo)
-
-	// Test repositories removed event
-	var removedEvent github.InstallationRepositoriesEvent
-	err = json.Unmarshal([]byte(installationRepositoriesDeletedPayload), &removedEvent)
-	assert.NoError(t, err)
-
-	err = handleInstallationRepositoriesEvent(&removedEvent, 360162)
-	assert.NoError(t, err)
-
-	// Verify repo was removed (soft deleted)
-	installation, err = database.GetGithubAppInstallationByIdAndRepo(41584295, "diggerhq/test-github-action")
-	assert.Error(t, err) // Should error because repo is deleted
-}