From cfdeb0bc12b6e5071c40f77239687a90586de477 Mon Sep 17 00:00:00 2001
From: JamesMurkin <jamesmurkin@hotmail.com>
Date: Tue, 24 Sep 2024 18:18:24 +0100
Subject: [PATCH] [Lookout] Make pruner removed rejected jobs (#3963)

We have added a new terminal job state but we didn't update the Lookout pruner to remove jobs in this state

This leads to a build up of jobs in Rejected state

This PR addresses this by making it so we now clean up jobs in Rejected state

Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com>
---
 internal/lookoutv2/pruner/pruner.go      | 3 ++-
 internal/lookoutv2/pruner/pruner_test.go | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/lookoutv2/pruner/pruner.go b/internal/lookoutv2/pruner/pruner.go
index 2b87e90d5b6..397bb3b1538 100644
--- a/internal/lookoutv2/pruner/pruner.go
+++ b/internal/lookoutv2/pruner/pruner.go
@@ -103,7 +103,8 @@ func createJobIdsToDeleteTempTable(ctx *armadacontext.Context, db *pgx.Conn, cut
 				4, -- Succeeded
 		   		5, -- Failed
 		   		6, -- Cancelled
-		   		7  -- Preempted
+		   		7, -- Preempted
+		   		9  -- Rejected
 		    )
 		)`, cutOffTime)
 	if err != nil {
diff --git a/internal/lookoutv2/pruner/pruner_test.go b/internal/lookoutv2/pruner/pruner_test.go
index bf34c998b2b..cbe55f2040d 100644
--- a/internal/lookoutv2/pruner/pruner_test.go
+++ b/internal/lookoutv2/pruner/pruner_test.go
@@ -110,6 +110,11 @@ func TestPruneDb(t *testing.T) {
 					ts:    baseTime.Add(-(10*time.Hour + 1*time.Minute)),
 					state: lookout.JobPreempted,
 				},
+				{
+					jobId: sampleJobIds[4],
+					ts:    baseTime.Add(-(10*time.Hour + 1*time.Minute)),
+					state: lookout.JobRejected,
+				},
 			},
 			jobIdsLeft: []string{},
 		},
@@ -195,6 +200,9 @@ func storeJob(job testJob, db *lookoutdb.LookoutDb, converter *instructions.Inst
 		simulator.
 			Preempted(job.ts).
 			Build()
+	case lookout.JobRejected:
+		simulator.
+			Rejected("invalid", job.ts)
 	case lookout.JobRunning:
 		simulator.
 			Build()