support workflow url

Author: motatoes

backend/controllers/github.go

@@ -700,7 +700,7 @@ func TriggerDiggerJobs(client *github.Client, repoOwner string, repoName string,
 			return fmt.Errorf("failed to trigger github workflow, %v\n", err)
 		} else {
 
-			_, workflowRunUrl, err := utils.GetWorkflowIdAndUrlFromDiggerJobId(client, repoOwner, repoName, job)
+			_, workflowRunUrl, err := utils.GetWorkflowIdAndUrlFromDiggerJobId(client, repoOwner, repoName, job.DiggerJobID)
 			if err != nil {
 				log.Printf("failed to find workflow url: %v\n", err)
 			}

backend/controllers/projects.go

@@ -291,6 +291,22 @@ func SetJobStatusForProject(c *gin.Context) {
 	switch request.Status {
 	case "started":
 		job.Status = orchestrator_scheduler.DiggerJobStarted
+		client, _, err := utils.GetGithubClient(&utils.DiggerGithubRealClientProvider{}, job.Batch.GithubInstallationId, job.Batch.RepoFullName)
+		if err != nil {
+			log.Printf("Error Creating github client: %v", err)
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Error Creating github client"})
+			return
+		}
+		_, workflowRunUrl, err := utils.GetWorkflowIdAndUrlFromDiggerJobId(client, job.Batch.RepoOwner, job.Batch.RepoName, job.DiggerJobID)
+		if err != nil {
+			log.Printf("Error getting workflow ID from job: %v", err)
+		} else {
+			job.WorkflowRunUrl = &workflowRunUrl
+			err = models.DB.UpdateDiggerJob(job)
+			if err != nil {
+				log.Printf("Error updating digger job: %v", err)
+			}
+		}
 	case "succeeded":
 		job.Status = orchestrator_scheduler.DiggerJobSucceeded
 		go func() {

backend/services/scheduler.go

@@ -70,7 +70,7 @@ func TriggerJob(client *github.Client, repoOwner string, repoName string, batchI
 		return
 	}
 
-	_, workflowRunUrl, err := utils.GetWorkflowIdAndUrlFromDiggerJobId(client, repoOwner, repoName, *job)
+	_, workflowRunUrl, err := utils.GetWorkflowIdAndUrlFromDiggerJobId(client, repoOwner, repoName, job.DiggerJobID)
 	if err != nil {
 		log.Printf("failed to find workflow url: %v\n", err)
 	}

backend/utils/github.go

@@ -92,7 +92,7 @@ func (gh *DiggerGithubClientMockProvider) Get(githubAppId int64, installationId
 	return ghClient, &token, nil
 }
 
-func GetGithubService(gh GithubClientProvider, installationId int64, repoFullName string, repoOwner string, repoName string) (*github2.GithubService, *string, error) {
+func GetGithubClient(gh GithubClientProvider, installationId int64, repoFullName string) (*github.Client, *string, error) {
 	installation, err := models.DB.GetGithubAppInstallationByIdAndRepo(installationId, repoFullName)
 	if err != nil {
 		log.Printf("Error getting installation: %v", err)
@@ -106,6 +106,10 @@ func GetGithubService(gh GithubClientProvider, installationId int64, repoFullNam
 	}
 
 	ghClient, token, err := gh.Get(installation.GithubAppId, installation.GithubInstallationId)
+	return ghClient, token, err
+}
+func GetGithubService(gh GithubClientProvider, installationId int64, repoFullName string, repoOwner string, repoName string) (*github2.GithubService, *string, error) {
+	ghClient, token, err := GetGithubClient(gh, installationId, repoFullName)
 	if err != nil {
 		log.Printf("Error creating github app client: %v", err)
 		return nil, nil, fmt.Errorf("Error creating github app client: %v", err)
@@ -139,7 +143,7 @@ func SetPRStatusForJobs(prService *github2.GithubService, prNumber int, jobs []o
 	return nil
 }
 
-func GetWorkflowIdAndUrlFromDiggerJobId(client *github.Client, repoOwner string, repoName string, job models.DiggerJob) (int64, string, error) {
+func GetWorkflowIdAndUrlFromDiggerJobId(client *github.Client, repoOwner string, repoName string, diggerJobID string) (int64, string, error) {
 	timeFilter := time.Now().Add(-5 * time.Minute)
 	runs, _, err := client.Actions.ListRepositoryWorkflowRuns(context.Background(), repoOwner, repoName, &github.ListWorkflowRunsOptions{
 		Created: ">= " + timeFilter.Format(time.RFC3339),
@@ -149,23 +153,24 @@ func GetWorkflowIdAndUrlFromDiggerJobId(client *github.Client, repoOwner string,
 	}
 
 	for _, workflowRun := range runs.WorkflowRuns {
+		println(*workflowRun.ID)
 		workflowjobs, _, err := client.Actions.ListWorkflowJobs(context.Background(), repoOwner, repoName, *workflowRun.ID, nil)
 		if err != nil {
 			return 0, "#", fmt.Errorf("error listing workflow jobs for run %v %v", workflowRun.ID, err)
 		}
 
 		for _, workflowjob := range workflowjobs.Jobs {
 			for _, step := range workflowjob.Steps {
-				if strings.Contains(*step.Name, job.DiggerJobID) {
+				if strings.Contains(*step.Name, diggerJobID) {
 					return *workflowRun.ID, fmt.Sprintf("https://github.com/%v/%v/actions/runs/%v", repoOwner, repoName, *workflowRun.ID), nil
 				}
 			}
 
 		}
 	}
-
 	return 0, "#", fmt.Errorf("workflow not found")
 }
+
 func TriggerGithubWorkflow(client *github.Client, repoOwner string, repoName string, job models.DiggerJob, jobString string, commentId int64) error {
 	log.Printf("TriggerGithubWorkflow: repoOwner: %v, repoName: %v, commentId: %v", repoOwner, repoName, commentId)
 	_, err := client.Actions.CreateWorkflowDispatchEventByFileName(context.Background(), repoOwner, repoName, "digger_workflow.yml", github.CreateWorkflowDispatchEventRequest{