From 9b2f9451767ef72f02f8a33541e07f1818d66d8f Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 17 Mar 2026 09:01:47 +0100 Subject: [PATCH] forgot about sessionID use ExecutionsID --- models/booking/booking.go | 3 +-- models/order/order.go | 3 +-- models/resources/purchase_resource/purchase_resource.go | 3 +-- models/workflow_execution/workflow_execution.go | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/models/booking/booking.go b/models/booking/booking.go index 3843bba..4318e01 100644 --- a/models/booking/booking.go +++ b/models/booking/booking.go @@ -38,8 +38,7 @@ type Booking struct { // Authorization: identifies who created this draft and the Check session it belongs to. // Used to verify UPDATE and DELETE orders from remote schedulers. - SchedulerPeerID string `json:"scheduler_peer_id,omitempty" bson:"scheduler_peer_id,omitempty"` - SchedulingSessionID string `json:"scheduling_session_id,omitempty" bson:"scheduling_session_id,omitempty"` + SchedulerPeerID string `json:"scheduler_peer_id,omitempty" bson:"scheduler_peer_id,omitempty"` } func (b *Booking) CalcDeltaOfExecution() map[string]map[string]models.MetricResume { diff --git a/models/order/order.go b/models/order/order.go index efb1f3a..0d2d8d3 100644 --- a/models/order/order.go +++ b/models/order/order.go @@ -17,8 +17,7 @@ import ( type Order struct { utils.AbstractObject - ExecutionsID string `json:"executions_id" bson:"executions_id" validate:"required"` - SchedulingSessionID string `json:"scheduling_session_id,omitempty" bson:"scheduling_session_id,omitempty"` + ExecutionsID string `json:"executions_id" bson:"executions_id" validate:"required"` Status enum.CompletionStatus `json:"status" bson:"status" default:"0"` Purchases []*purchase_resource.PurchaseResource `json:"purchases" bson:"purchases"` Bookings []*booking.Booking `json:"bookings" bson:"bookings"` diff --git a/models/resources/purchase_resource/purchase_resource.go b/models/resources/purchase_resource/purchase_resource.go index e8e1ccf..b3e2f31 100644 --- a/models/resources/purchase_resource/purchase_resource.go +++ b/models/resources/purchase_resource/purchase_resource.go @@ -21,8 +21,7 @@ type PurchaseResource struct { ResourceType tools.DataType `json:"resource_type" bson:"resource_type" validate:"required"` // Authorization: identifies who created this draft and the Check session it belongs to. - SchedulerPeerID string `json:"scheduler_peer_id,omitempty" bson:"scheduler_peer_id,omitempty"` - SchedulingSessionID string `json:"scheduling_session_id,omitempty" bson:"scheduling_session_id,omitempty"` + SchedulerPeerID string `json:"scheduler_peer_id,omitempty" bson:"scheduler_peer_id,omitempty"` } func (d *PurchaseResource) GetAccessor(request *tools.APIRequest) utils.Accessor { diff --git a/models/workflow_execution/workflow_execution.go b/models/workflow_execution/workflow_execution.go index a1607e1..1e658ee 100755 --- a/models/workflow_execution/workflow_execution.go +++ b/models/workflow_execution/workflow_execution.go @@ -34,9 +34,8 @@ type WorkflowExecution struct { State enum.BookingStatus `json:"state" bson:"state" default:"0"` // TEMPORARY TODO DEFAULT 1 -> 0 State is the state of the workflow WorkflowID string `json:"workflow_id" bson:"workflow_id,omitempty"` // WorkflowID is the ID of the workflow - BookingsState map[string]bool `json:"bookings_state" bson:"bookings_state,omitempty"` // WorkflowID is the ID of the workflow - PurchasesState map[string]bool `json:"purchases_state" bson:"purchases_state,omitempty"` // WorkflowID is the ID of the workflow - SchedulingSessionID string `json:"scheduling_session_id,omitempty" bson:"scheduling_session_id,omitempty"` + BookingsState map[string]bool `json:"bookings_state" bson:"bookings_state,omitempty"` // WorkflowID is the ID of the workflow + PurchasesState map[string]bool `json:"purchases_state" bson:"purchases_state,omitempty"` // WorkflowID is the ID of the workflow SelectedInstances workflow.ConfigItem `json:"selected_instances"` SelectedPartnerships workflow.ConfigItem `json:"selected_partnerships"`