Merge pull request #383 from unfoldingWord/root-v1.20-and-main

Adds Status for PR
unfoldingWord · Nov 14, 2023 · b845c49 · b845c49
2 parents f397867 + 562f42f
commit b845c49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/structs/pull.go b/modules/structs/pull.go
@@ -52,7 +52,7 @@ type PullRequest struct {
 
 	PinOrder int `json:"pin_order"`
 
-	HasConflicts    bool     `json:"has_conflicts"`    // DCS Customizations
+	Status          string   `json:"status"`           // DCS Customizations
 	ConflictedFiles []string `json:"conflicted_files"` // DCS Customizations
 }
 

diff --git a/services/convert/pull.go b/services/convert/pull.go
@@ -74,8 +74,8 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
 		PinOrder:  apiIssue.PinOrder,
 
-		HasConflicts:    pr.IsFilesConflicted(), // DCS Customizations
-		ConflictedFiles: pr.ConflictedFiles,     // DCS Customizations
+		Status:          pr.Status.String(), // DCS Customizations
+		ConflictedFiles: pr.ConflictedFiles, // DCS Customizations
 
 		AllowMaintainerEdit: pr.AllowMaintainerEdit,