Manager: adjust code for WorkerStatusChangeRequest extraction

See preceeding OpenAPI change.

internal/manager/api_impl/worker_mgt.go

@@ -84,12 +84,12 @@ func (f *Flamenco) RequestWorkerStatusChange(e echo.Context, workerUUID string)
 	// Store the status change.
 	logger = logger.With().
 		Str("status", string(dbWorker.Status)).
-		Str("requested", string(change.StatusRequested)).
+		Str("requested", string(change.Status)).
 		Bool("lazy", change.IsLazy).
 		Logger()
 
 	logger.Info().Msg("worker status change requested")
-	dbWorker.StatusRequested = change.StatusRequested
+	dbWorker.StatusRequested = change.Status
 	dbWorker.LazyStatusRequest = change.IsLazy
 	if err := f.persist.SaveWorker(e.Request().Context(), dbWorker); err != nil {
 		logger.Error().Err(err).Msg("error saving worker after status change request")
@@ -111,8 +111,10 @@ func workerSummary(w persistence.Worker) api.WorkerSummary {
 		Version:  w.Software,
 	}
 	if w.StatusRequested != "" {
-		summary.StatusRequested = &w.StatusRequested
-		summary.LazyStatusRequest = &w.LazyStatusRequest
+		summary.StatusChange = &api.WorkerStatusChangeRequest{
+			Status: w.StatusRequested,
+			IsLazy: w.LazyStatusRequest,
+		}
 	}
 	return summary
 }

internal/manager/api_impl/worker_mgt_test.go

@@ -41,15 +41,17 @@ func TestFetchWorkers(t *testing.T) {
 				Id:       worker1.UUID,
 				Nickname: worker1.Name,
 				Status:   worker1.Status,
-				StatusRequested: nil,
 				Version:  worker1.Software,
 			},
 			{
 				Id:       worker2.UUID,
 				Nickname: worker2.Name,
 				Status:   worker2.Status,
-				StatusRequested: &worker2.StatusRequested,
 				Version:  worker2.Software,
+				StatusChange: &api.WorkerStatusChangeRequest{
+					Status: worker2.StatusRequested,
+					IsLazy: false,
+				},
 			},
 		},
 	}
@@ -114,7 +116,7 @@ func TestFetchWorker(t *testing.T) {
 			Nickname:     "дрон",
 			Version:      "3.0",
 			Status:       api.WorkerStatusAwake,
-			StatusRequested: &requestedStatus,
+			StatusChange: &api.WorkerStatusChangeRequest{Status: requestedStatus},
 		},
 		IpAddress:          "fe80::5054:ff:fede:2ad7",
 		Platform:           "linux",
@@ -144,14 +146,16 @@ func TestRequestWorkerStatusChange(t *testing.T) {
 		Id:       worker.UUID,
 		Nickname: worker.Name,
 		Status:   prevStatus,
-		StatusRequested:   &requestStatus,
-		LazyStatusRequest: ptr(true),
 		Updated:  worker.UpdatedAt,
 		Version:  worker.Software,
+		StatusChange: &api.WorkerStatusChangeRequest{
+			Status: requestStatus,
+			IsLazy: true,
+		},
 	})
 
 	echo := mf.prepareMockedJSONRequest(api.WorkerStatusChangeRequest{
-		StatusRequested: requestStatus,
+		Status: requestStatus,
 		IsLazy: true,
 	})
 	err := mf.flamenco.RequestWorkerStatusChange(echo, workerUUID)

internal/manager/api_impl/workers.go

@@ -94,9 +94,6 @@ func (f *Flamenco) SignOn(e echo.Context) error {
 	if prevStatus != "" {
 		update.PreviousStatus = &prevStatus
 	}
-	if w.StatusRequested != "" {
-		update.StatusRequested = &w.StatusRequested
-	}
 	f.broadcaster.BroadcastWorkerUpdate(update)
 
 	resp := api.WorkerStateChange{}

internal/manager/api_impl/workers_test.go

@@ -103,7 +103,6 @@ func TestWorkerSignOn(t *testing.T) {
 		Nickname:       "Lazy Boi",
 		PreviousStatus: &prevStatus,
 		Status:         api.WorkerStatusStarting,
-		StatusRequested: nil,
 		Updated:        worker.UpdatedAt,
 		Version:        "3.0-testing",
 	})
@@ -210,7 +209,6 @@ func TestWorkerStateChanged(t *testing.T) {
 		Nickname:       worker.Name,
 		PreviousStatus: &prevStatus,
 		Status:         api.WorkerStatusAwake,
-		StatusRequested: nil,
 		Updated:        worker.UpdatedAt,
 		Version:        worker.Software,
 	})

internal/manager/webupdates/worker_updates.go

@@ -22,8 +22,10 @@ func NewWorkerUpdate(worker *persistence.Worker) api.SocketIOWorkerUpdate {
 	}
 
 	if worker.StatusRequested != "" {
-		workerUpdate.StatusRequested = &worker.StatusRequested
-		workerUpdate.LazyStatusRequest = &worker.LazyStatusRequest
+		workerUpdate.StatusChange = &api.WorkerStatusChangeRequest{
+			Status: worker.StatusRequested,
+			IsLazy: worker.LazyStatusRequest,
+		}
 	}
 
 	return workerUpdate