fix: job run scheduler termination column

client/rust/src/gen/api.rs

@@ -1498,12 +1498,12 @@ pub struct JobPreemptedEvent {
     pub cluster_id: ::prost::alloc::string::String,
     #[prost(string, tag = "6")]
     pub run_id: ::prost::alloc::string::String,
-    #[prost(string, tag = "7")]
-    pub preemptive_job_id: ::prost::alloc::string::String,
     #[prost(string, tag = "8")]
     pub preemptive_run_id: ::prost::alloc::string::String,
     #[prost(string, tag = "9")]
     pub reason: ::prost::alloc::string::String,
+    #[prost(string, tag = "10")]
+    pub preempting_job_id: ::prost::alloc::string::String,
 }
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct JobSucceededEvent {

internal/common/ingest/testfixtures/event.go

@@ -21,6 +21,7 @@ import (
 const (
 	JobId                      = "01f3j0g1md4qx7z5qb148qnh4r"
 	RunId                      = "123e4567-e89b-12d3-a456-426614174000"
+	PreemptingJobId            = "456e7890-e89b-12d3-a456-426614174001"
 	PartitionMarkerGroupId     = "223e4567-e89b-12d3-a456-426614174000"
 	JobsetName                 = "testJobset"
 	ExecutorId                 = "testCluster"
@@ -43,6 +44,7 @@ const (
 	LeaseReturnedMsg           = "lease returned error message"
 	UnschedulableMsg           = "test pod is unschedulable"
 	PreemptionReason           = "job preempted"
+	CancelReason               = "sample cancel reason"
 	PartitionMarkerPartitionId = 456
 
 	ExecutorCordonReason = "bad executor"
@@ -467,6 +469,19 @@ var JobRunPreempted = &armadaevents.EventSequence_Event{
 	},
 }
 
+// JobRunPreemptedFairShare represents a fair-share preemption where the preempting job is known.
+var JobRunPreemptedFairShare = &armadaevents.EventSequence_Event{
+	Created: testfixtures.BasetimeProto,
+	Event: &armadaevents.EventSequence_Event_JobRunPreempted{
+		JobRunPreempted: &armadaevents.JobRunPreempted{
+			PreemptedJobId:  JobId,
+			PreemptedRunId:  RunId,
+			PreemptingJobId: PreemptingJobId,
+			Reason:          PreemptionReason,
+		},
+	},
+}
+
 var JobRunFailed = &armadaevents.EventSequence_Event{
 	Created: testfixtures.BasetimeProto,
 	Event: &armadaevents.EventSequence_Event_JobRunErrors{

internal/lookout/application.go

@@ -48,6 +48,7 @@ func Serve(configuration configuration.LookoutConfig) error {
 	getJobRunErrorRepo := repository.NewSqlGetJobRunErrorRepository(db, decompressor)
 	getJobRunDebugMessageRepo := repository.NewSqlGetJobRunDebugMessageRepository(db, decompressor)
 	getJobSpecRepo := repository.NewSqlGetJobSpecRepository(db, decompressor)
+	getJobRunSchedulerTerminationReasonRepo := repository.NewSqlGetJobRunSchedulerTerminationReasonRepository(db)
 
 	// create new service API
 	api := operations.NewLookoutAPI(swaggerSpec)
@@ -134,6 +135,19 @@ func Serve(configuration configuration.LookoutConfig) error {
 		},
 	)
 
+	api.GetJobRunSchedulerTerminationReasonHandler = operations.GetJobRunSchedulerTerminationReasonHandlerFunc(
+		func(params operations.GetJobRunSchedulerTerminationReasonParams) middleware.Responder {
+			ctx := armadacontext.New(params.HTTPRequest.Context(), logger)
+			result, err := getJobRunSchedulerTerminationReasonRepo.GetJobRunSchedulerTerminationReason(ctx, params.GetJobRunSchedulerTerminationReasonRequest.RunID)
+			if err != nil {
+				return operations.NewGetJobRunSchedulerTerminationReasonBadRequest().WithPayload(conversions.ToSwaggerError(err.Error()))
+			}
+			return operations.NewGetJobRunSchedulerTerminationReasonOK().WithPayload(&operations.GetJobRunSchedulerTerminationReasonOKBody{
+				SchedulerTerminationReason: result,
+			})
+		},
+	)
+
 	api.GetJobErrorHandler = operations.GetJobErrorHandlerFunc(
 		func(params operations.GetJobErrorParams) middleware.Responder {
 			ctx := armadacontext.New(params.HTTPRequest.Context(), logger)