fix tests for libs

Author: motatoes

backend/controllers/projects.go

@@ -1518,15 +1518,43 @@ func DeleteOlderPRCommentsIfEnabled(gh utils.GithubClientProvider, batch *models
 		}
 
 		for _, prBatch := range prBatches {
+			if prBatch.BatchType == orchestrator_scheduler.DiggerCommandApply {
+				slog.Info("found previous apply job for PR therefore not deleting earlier comments")
+				return nil
+			}
+		}
+
+		allDeletesSuccessful := true
+		for _, prBatch := range prBatches {
+			if prBatch.ID == batch.ID {
+				// don't delete the current batch comments
+				continue
+			}
 			jobs, err := models.DB.GetDiggerJobsForBatch(prBatch.ID)
 			if err != nil {
-
+				slog.Error("could not get jobs for batch", "batchId", prBatch.ID, "error", err)
+				// won't return error here since can still continue deleting rest of batches
+				continue
 			}
 			for _, prJob := range jobs {
-				prService.DeleteComment(strconv.FormatInt(*prJob.PRCommentId, 10))
+				if prJob.PRCommentId == nil {
+					slog.Debug("PR comment not found for job, ignoring deletion", "JobID", prJob.ID)
+					continue
+				}
+				err = prService.DeleteComment(strconv.FormatInt(*prJob.PRCommentId, 10))
+				if err != nil {
+					slog.Error("Could not delete comment for job", "jobID", prJob.ID, "commentID", prJob.PRCommentId, "error", err)
+					allDeletesSuccessful = false
+				}
 			}
 		}
 
+		if !allDeletesSuccessful {
+			slog.Warn("some of the previous comments failed to delete")
+		}
+
+		return nil
+
 	} else {
 		if batch.BatchType != orchestrator_scheduler.DiggerCommandPlan {
 			slog.Debug("Skipping deletion of prior comments - not an plan command",

backend/migrations/20250512213729.sql

@@ -0,0 +1,4 @@
+-- Modify "digger_batches" table
+ALTER TABLE "public"."digger_batches" ADD COLUMN "created_at" timestamptz NULL, ADD COLUMN "updated_at" timestamptz NULL, ADD COLUMN "deleted_at" timestamptz NULL;
+-- Create index "idx_digger_batches_deleted_at" to table: "digger_batches"
+CREATE INDEX "idx_digger_batches_deleted_at" ON "public"."digger_batches" ("deleted_at");

backend/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:0Z77pgu5xSmp7FGW57wL3fSpDTpVmqh3DKj/F67WBX8=
+h1:7qYia+JfrMJUdNvsjR8hZosttT36aVdOje5TP3ekX4w=
 20231227132525.sql h1:43xn7XC0GoJsCnXIMczGXWis9d504FAWi4F1gViTIcw=
 20240115170600.sql h1:IW8fF/8vc40+eWqP/xDK+R4K9jHJ9QBSGO6rN9LtfSA=
 20240116123649.sql h1:R1JlUIgxxF6Cyob9HdtMqiKmx/BfnsctTl5rvOqssQw=
@@ -48,3 +48,4 @@ h1:0Z77pgu5xSmp7FGW57wL3fSpDTpVmqh3DKj/F67WBX8=
 20250325134924.sql h1:5vywDVuT0FPmQKP75AvxopxOeuKXsTEN00rgQjnA+ss=
 20250416152705.sql h1:yeszz4c/BlyVgUUIk7aTUz/DUNMC40+9fe1Q8Ya4TVI=
 20250512172515.sql h1:iIZIhFq3TTyjTzsxNWv3k4FcIkXfOCdHtmHNmYqjBMM=
+20250512213729.sql h1:n8bYIXWko9xOUs+FPcG7lS3GXMVQBSygXX7Hpj20eVs=

backend/models/scheduler.go

@@ -24,6 +24,7 @@ const DiggerVCSGitlab DiggerVCSType = "gitlab"
 const DiggerVCSBitbucket DiggerVCSType = "bitbucket"
 
 type DiggerBatch struct {
+	gorm.Model
 	ID                       uuid.UUID `gorm:"primary_key"`
 	VCS                      DiggerVCSType
 	PrNumber                 int
@@ -172,4 +173,3 @@ func (b *DiggerBatch) MapToJsonStruct() (orchestrator_scheduler.SerializedBatch,
 
 	return res, nil
 }
-

libs/digger_config/converters.go

@@ -210,9 +210,9 @@ func ConvertDiggerYamlToConfig(diggerYaml *DiggerConfigYaml) (*DiggerConfig, gra
 	}
 
 	if diggerYaml.DeletePriorComments != nil {
-		diggerConfig.DeletePriorComments = false
-	} else {
 		diggerConfig.DeletePriorComments = *diggerYaml.DeletePriorComments
+	} else {
+		diggerConfig.DeletePriorComments = false
 	}
 
 	if diggerYaml.AutoMergeStrategy != nil {