load projects on push (#1964)

* load projects on push

Author: motatoes

backend/controllers/github.go

@@ -101,6 +101,12 @@ func (d DiggerController) GithubAppWebHook(c *gin.Context) {
 				return
 			}
 		}
+	case *github.PushEvent:
+		slog.Info("Processing PushEvent",
+			"repo", *event.Repo.FullName,
+		)
+
+		go handlePushEvent(gh, event, appId64)
 
 	case *github.IssueCommentEvent:
 		slog.Info("Processing IssueCommentEvent",
@@ -384,11 +390,40 @@ func handleInstallationDeletedEvent(installation *github.InstallationEvent, appI
 	return nil
 }
 
+func handlePushEvent(gh utils.GithubClientProvider, payload *github.PushEvent, appId int64) error {
+	slog.Debug("Handling push event", "appId", appId, "payload", payload)
+	defer func() {
+		if r := recover(); r != nil {
+			stack := string(debug.Stack())
+			slog.Error("Recovered from panic in handlePushEvent", "error", r)
+			fmt.Printf("Stack trace:\n%s\n", stack)
+		}
+	}()
+
+	installationId := *payload.Installation.ID
+	repoName := *payload.Repo.Name
+	repoOwner := *payload.Repo.Owner.Login
+	repoFullName := *payload.Repo.FullName
+	cloneURL := *payload.Repo.CloneURL
+	ref := *payload.Ref
+	defaultBranch := *payload.Repo.DefaultBranch
+
+	if strings.HasSuffix(ref, defaultBranch) {
+		err := services.LoadProjectsFromGithubRepo(gh, strconv.FormatInt(installationId, 10), repoFullName, repoOwner, repoName, cloneURL, defaultBranch)
+		if err != nil {
+			slog.Error("Failed to load projects from GitHub repo", "error", err)
+		}
+	}
+
+	return nil
+}
+
 func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullRequestEvent, ciBackendProvider ci_backends.CiBackendProvider, appId int64) error {
 	defer func() {
 		if r := recover(); r != nil {
 			stack := string(debug.Stack())
-			slog.Error("Recovered from panic in handlePullRequestEvent", "error", r, slog.Group("stack", slog.String("trace", stack)))
+			slog.Error("Recovered from panic in handlePullRequestEvent", "error", r, slog.Group("stack"))
+			fmt.Printf("Stack trace:\n%s\n", stack)
 		}
 	}()
 
@@ -1151,7 +1186,8 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 	defer func() {
 		if r := recover(); r != nil {
 			stack := string(debug.Stack())
-			slog.Error("Recovered from panic in handleIssueCommentEvent", "error", r, slog.Group("stack", slog.String("trace", stack)))
+			slog.Error("Recovered from panic in handleIssueCommentEvent", "error", r, slog.Group("stack"))
+			fmt.Printf("Stack trace:\n%s\n", stack)
 		}
 	}()
 

backend/controllers/github_test.go

@@ -614,7 +614,7 @@ func setupSuite(tb testing.TB) (func(tb testing.TB), *models.Database) {
 
 	// create test project
 	projectName := "test project"
-	_, err = database.CreateProject(projectName, org, repo, false, false)
+	_, err = database.CreateProject(projectName, org, repo.RepoFullName, false, false)
 	if err != nil {
 		panic(err)
 	}

backend/controllers/policies.go

@@ -249,7 +249,7 @@ func upsertPolicyForRepoAndProject(c *gin.Context, policyType string) {
 	if projectResult.RowsAffected == 0 {
 		projectModel = models.Project{
 			OrganisationID: orgID.(uint),
-			RepoID:         repoModel.ID,
+			RepoFullName:   repoModel.RepoFullName,
 			Name:           projectName,
 		}
 		err := models.DB.GormDB.Create(&projectModel).Error

backend/controllers/projects.go

@@ -251,7 +251,7 @@ func ProjectDetails(c *gin.Context) {
 	slog.Info("Successfully retrieved project details",
 		"projectId", projectId,
 		"projectName", project.Name,
-		"repoName", project.Repo.Name,
+		"repoFullName", project.RepoFullName,
 	)
 
 	c.JSON(http.StatusOK, project.MapToJsonStruct())
@@ -355,9 +355,8 @@ func ReportProjectsForRepo(c *gin.Context) {
 			project := models.Project{
 				Name:              request.Name,
 				ConfigurationYaml: request.ConfigurationYaml,
-				RepoID:            repo.ID,
 				OrganisationID:    org.ID,
-				Repo:              &repo,
+				RepoFullName:      repo.RepoFullName,
 				Organisation:      org,
 			}
 

backend/controllers/runs.go

@@ -57,6 +57,13 @@ func RunsForProject(c *gin.Context) {
 		return
 	}
 
+	repo, err := models.DB.GetRepoByFullName(org.ID, project.RepoFullName)
+	if err != nil {
+		slog.Error("Could not fetch repo", "projectId", projectId, "repoFullName", project.RepoFullName, "error", err)
+		c.String(http.StatusInternalServerError, "Could not fetch repo")
+		return
+	}
+
 	if project.OrganisationID != org.ID {
 		slog.Warn("Forbidden access: not allowed to access project",
 			"projectOrgId", project.OrganisationID,
@@ -66,9 +73,9 @@ func RunsForProject(c *gin.Context) {
 		return
 	}
 
-	runs, err := models.DB.ListDiggerRunsForProject(project.Name, project.Repo.ID)
+	runs, err := models.DB.ListDiggerRunsForProject(project.Name, repo.ID)
 	if err != nil {
-		slog.Error("Could not fetch runs", "projectId", projectId, "repoId", project.Repo.ID, "error", err)
+		slog.Error("Could not fetch runs", "projectId", projectId, "repoId", repo.ID, "error", err)
 		c.String(http.StatusInternalServerError, "Could not fetch runs")
 		return
 	}
@@ -87,7 +94,7 @@ func RunsForProject(c *gin.Context) {
 	slog.Info("Successfully fetched runs for project",
 		"projectId", projectId,
 		"projectName", project.Name,
-		"repoId", project.Repo.ID,
+		"repoId", repo.ID,
 		"runCount", len(runs))
 
 	response := make(map[string]interface{})

backend/migrations/20250530015921.sql

@@ -0,0 +1,5 @@
+-- Modify "projects" table
+ALTER TABLE "public"."projects" DROP COLUMN "repo_id", ADD COLUMN "repo_full_name" text NULL;
+-- Create index "idx_project_org" to table: "projects"
+DROP INDEX IF EXISTS "idx_project";
+CREATE UNIQUE INDEX "idx_project_org" ON "public"."projects" ("name", "organisation_id", "repo_full_name");

backend/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:7qYia+JfrMJUdNvsjR8hZosttT36aVdOje5TP3ekX4w=
+h1:IeQ6uHSz71Ox7tBqG6sy05KmaRMpYqhr0SeipkVSEbM=
 20231227132525.sql h1:43xn7XC0GoJsCnXIMczGXWis9d504FAWi4F1gViTIcw=
 20240115170600.sql h1:IW8fF/8vc40+eWqP/xDK+R4K9jHJ9QBSGO6rN9LtfSA=
 20240116123649.sql h1:R1JlUIgxxF6Cyob9HdtMqiKmx/BfnsctTl5rvOqssQw=
@@ -49,3 +49,4 @@ h1:7qYia+JfrMJUdNvsjR8hZosttT36aVdOje5TP3ekX4w=
 20250416152705.sql h1:yeszz4c/BlyVgUUIk7aTUz/DUNMC40+9fe1Q8Ya4TVI=
 20250512172515.sql h1:iIZIhFq3TTyjTzsxNWv3k4FcIkXfOCdHtmHNmYqjBMM=
 20250512213729.sql h1:n8bYIXWko9xOUs+FPcG7lS3GXMVQBSygXX7Hpj20eVs=
+20250530015921.sql h1:FidRW+0ur3mCDBPgP7V/sqr2jjfmi/CFJPRpNxTmqGs=

backend/models/orgs.go

@@ -55,8 +55,6 @@ func (p *ProjectRun) MapToJsonStruct() interface{} {
 		Id:            p.ID,
 		ProjectID:     p.ProjectID,
 		ProjectName:   p.Project.Name,
-		RepoUrl:       p.Project.Repo.RepoUrl,
-		RepoFullName:  p.Project.Repo.RepoFullName,
 		StartedAt:     time.UnixMilli(p.StartedAt),
 		EndedAt:       time.UnixMilli(p.EndedAt),
 		Status:        p.Status,
@@ -75,11 +73,10 @@ const (
 
 type Project struct {
 	gorm.Model
-	Name              string `gorm:"uniqueIndex:idx_project"`
-	OrganisationID    uint   `gorm:"uniqueIndex:idx_project"`
+	Name              string `gorm:"uniqueIndex:idx_project_org"`
+	OrganisationID    uint   `gorm:"uniqueIndex:idx_project_org"`
 	Organisation      *Organisation
-	RepoID            uint `gorm:"uniqueIndex:idx_project"`
-	Repo              *Repo
+	RepoFullName      string `gorm:"uniqueIndex:idx_project_org"`
 	ConfigurationYaml string // TODO: probably needs to be deleted
 	Status            ProjectStatus
 	IsGenerated       bool
@@ -112,12 +109,8 @@ func (p *Project) MapToJsonStruct() interface{} {
 		Id:                    p.ID,
 		Name:                  p.Name,
 		OrganisationID:        p.OrganisationID,
-		RepoID:                p.RepoID,
 		OrganisationName:      p.Organisation.Name,
-		RepoFullName:          p.Repo.RepoFullName,
-		RepoName:              p.Repo.RepoName,
-		RepoOrg:               p.Repo.RepoOrganisation,
-		RepoUrl:               p.Repo.RepoUrl,
+		RepoFullName:          p.RepoFullName,
 		LastActivityTimestamp: p.UpdatedAt.String(),
 		LastActivityAuthor:    "unknown",
 		LastActivityStatus:    string(status),

backend/models/scheduler_test.go

@@ -54,7 +54,7 @@ func setupSuiteScheduler(tb testing.TB) (func(tb testing.TB), *Database) {
 	}
 
 	projectName := "test project"
-	_, err = database.CreateProject(projectName, org, repo, false, false)
+	_, err = database.CreateProject(projectName, org, repo.RepoFullName, false, false)
 	if err != nil {
 		panic(err)
 	}