Fixes #1006: Keep track of project status even if plans have been deleted

server/events/command_runner.go

@@ -327,6 +327,7 @@ func (c *DefaultCommandRunner) automerge(ctx *CommandContext, pullStatus models.
 
 	// Make the API call to perform the merge.
 	ctx.Log.Info("automerging pull request")
+
 	err := c.VCSClient.MergePull(ctx.Pull)
 
 	if err != nil {
@@ -337,6 +338,7 @@ func (c *DefaultCommandRunner) automerge(ctx *CommandContext, pullStatus models.
 			ctx.Log.Err("failed to comment about automerge failing: %s", err)
 		}
 	}
+
 }
 
 func (c *DefaultCommandRunner) runProjectCmds(cmds []models.ProjectCommandContext, cmdName models.CommandName) CommandResult {

server/events/db/boltdb.go

@@ -344,6 +344,41 @@ func (b *BoltDB) DeleteProjectStatus(pull models.PullRequest, workspace string,
 	return errors.Wrap(err, "DB transaction failed")
 }
 
+// UpdateProjectStatus updates all project statuses under pull that match
+// workspace and repoRelDir.
+func (b *BoltDB) UpdateProjectStatus(pull models.PullRequest, workspace string, repoRelDir string, targetStatus models.ProjectPlanStatus) error {
+	key, err := b.pullKey(pull)
+	if err != nil {
+		return err
+	}
+	err = b.db.Update(func(tx *bolt.Tx) error {
+		bucket := tx.Bucket(b.pullsBucketName)
+		currStatusPtr, err := b.getPullFromBucket(bucket, key)
+		if err != nil {
+			return err
+		}
+		if currStatusPtr == nil {
+			return nil
+		}
+		currStatus := *currStatusPtr
+
+		// Create a new projectStatuses array without the ones we want to
+		// delete.
+		var newProjects []models.ProjectStatus
+		for _, p := range currStatus.Projects {
+			if p.Workspace == workspace && p.RepoRelDir == repoRelDir {
+				p.Status = targetStatus
+			}
+			newProjects = append(newProjects, p)
+		}
+
+		// Overwrite the old pull status.
+		currStatus.Projects = newProjects
+		return b.writePullToBucket(bucket, key, currStatus)
+	})
+	return errors.Wrap(err, "DB transaction failed")
+}
+
 func (b *BoltDB) pullKey(pull models.PullRequest) ([]byte, error) {
 	hostname := pull.BaseRepo.VCSHost.Hostname
 	if strings.Contains(hostname, pullKeySeparator) {

server/events/models/models.go

@@ -476,12 +476,15 @@ const (
 	// PlannedPlanStatus means that a plan has been successfully generated but
 	// not yet applied.
 	PlannedPlanStatus
-	// ErrorApplyStatus means that a plan has been generated but there was an
+	// ErroredApplyStatus means that a plan has been generated but there was an
 	// error while applying it.
 	ErroredApplyStatus
 	// AppliedPlanStatus means that a plan has been generated and applied
 	// successfully.
 	AppliedPlanStatus
+	// NotPlannedPlanStatus means that either no plan has been generated yet or
+	// a plan has been deleted - eg after using the UI to unlock the project
+	NotPlannedPlanStatus
 )
 
 // String returns a string representation of the status.
@@ -495,6 +498,8 @@ func (p ProjectPlanStatus) String() string {
 		return "apply_errored"
 	case AppliedPlanStatus:
 		return "applied"
+	case NotPlannedPlanStatus:
+		return "not_planned"
 	default:
 		panic("missing String() impl for ProjectPlanStatus")
 	}

server/locks_controller.go

@@ -108,8 +108,8 @@ func (l *LocksController) DeleteLock(w http.ResponseWriter, r *http.Request) {
 				l.Logger.Err("unable to delete workspace: %s", err)
 			}
 		}
-		if err := l.DB.DeleteProjectStatus(lock.Pull, lock.Workspace, lock.Project.Path); err != nil {
-			l.Logger.Err("unable to delete project status: %s", err)
+		if err := l.DB.UpdateProjectStatus(lock.Pull, lock.Workspace, lock.Project.Path, models.NotPlannedPlanStatus); err != nil {
+			l.Logger.Err("unable to update project status: %s", err)
 		}
 
 		// Once the lock has been deleted, comment back on the pull request.