Merge pull request #1701 from diggerhq/feat/triggered-by

improvements to the triggered by btn

next/controllers/github_after_merge.go

@@ -208,7 +208,7 @@ func handlePushEventApplyAfterMerge(gh nextutils.GithubClientProvider, payload *
  return fmt.Errorf("error creating digger run stage")
  }
 
- diggerRun, err := dbmodels.DB.CreateDiggerRun("push", 0, dbmodels.RunQueued, commitId, "", installationId, repo.ID, project.ID, projectName, dbmodels.PlanAndApply, planStage.ID, applyStage.ID)
+ diggerRun, err := dbmodels.DB.CreateDiggerRun("push", 0, dbmodels.RunQueued, commitId, "", installationId, repo.ID, project.ID, projectName, dbmodels.PlanAndApply, planStage.ID, applyStage.ID, nil)
  if err != nil {
  log.Printf("Error creating digger run: %v", err)
  return fmt.Errorf("error creating digger run")

next/controllers/runs.go

@@ -74,6 +74,7 @@ func (d DiggerController) TriggerRunForProjectAssumingUser(c *gin.Context) {
  return
  }
  projectId := request.ProjectId
+ userId := request.UserId
 
  p := dbmodels.DB.Query.Project
  project, err := dbmodels.DB.Query.Project.Where(p.ID.Eq(projectId)).First()
@@ -136,7 +137,7 @@ func (d DiggerController) TriggerRunForProjectAssumingUser(c *gin.Context) {
  return
  }
 
- diggerRun, err := dbmodels.DB.CreateDiggerRun("push", 0, dbmodels.RunQueued, *commitSha, "", installationId, repoId, projectId, projectName, dbmodels.PlanAndApply, planStage.ID, applyStage.ID)
+ diggerRun, err := dbmodels.DB.CreateDiggerRun("user", 0, dbmodels.RunQueued, *commitSha, "", installationId, repoId, projectId, projectName, dbmodels.PlanAndApply, planStage.ID, applyStage.ID, &userId)
  if err != nil {
  log.Printf("Error creating digger run: %v", err)
  c.JSON(http.StatusBadRequest, gin.H{"error": "error creating digger run"})

next/dbgen/dbgen.go

@@ -45,7 +45,10 @@ func main() {
 
  // need to make approver_user_id nullable and gorm gen does not generate it as a string pointer, for some reason
  g.ApplyBasic(
- g.GenerateModel("digger_runs", gen.FieldType("approver_user_id", "*string")),
+ g.GenerateModel("digger_runs",
+ gen.FieldType("approver_user_id", "*string"),
+ gen.FieldType("triggered_by_user_id", "*string"),
+ ),
  )
 
  g.ApplyBasic(

next/dbmodels/storage.go

@@ -756,7 +756,7 @@ func (db *Database) ListDiggerRunsForProject(projectName string, repoId uint) ([
  return runs, nil
 }
 
-func (db *Database) CreateDiggerRun(Triggertype string, PrNumber int, Status DiggerRunStatus, CommitId string, DiggerConfig string, GithubInstallationId int64, RepoId int64, projectId string, ProjectName string, RunType RunType, planStageId string, applyStageId string) (*model.DiggerRun, error) {
+func (db *Database) CreateDiggerRun(Triggertype string, PrNumber int, Status DiggerRunStatus, CommitId string, DiggerConfig string, GithubInstallationId int64, RepoId int64, projectId string, ProjectName string, RunType RunType, planStageId string, applyStageId string, triggeredByUserId *string) (*model.DiggerRun, error) {
  dr := &model.DiggerRun{
  ID: uuid.NewString(),
  Triggertype: Triggertype,
@@ -774,6 +774,7 @@ func (db *Database) CreateDiggerRun(Triggertype string, PrNumber int, Status Dig
  IsApproved: false,
  ApprovalAuthor: "",
  ApplyLogs: "",
+ TriggeredByUserID: triggeredByUserId,
  }
  result := db.GormDB.Create(dr)
  if result.Error != nil {