From cfcad2343de79928d373bafec14c9f417ba3c7fc Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 19 Nov 2024 13:41:14 +0100 Subject: [PATCH] hard stuff --- models/collaborative_area/collaborative_area.go | 6 +++--- .../shallow_collaborative_area.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models/collaborative_area/collaborative_area.go b/models/collaborative_area/collaborative_area.go index f479635..e7a4885 100644 --- a/models/collaborative_area/collaborative_area.go +++ b/models/collaborative_area/collaborative_area.go @@ -32,9 +32,9 @@ type CollaborativeArea struct { Description string `json:"description,omitempty" bson:"description,omitempty" validate:"required"` // Description is the description of the workspace CollaborativeAreaRule *CollaborativeAreaRule `json:"collaborative_area,omitempty" bson:"collaborative_area,omitempty"` // CollaborativeArea is the collaborative area of the workspace Attributes map[string]interface{} `json:"attributes,omitempty" bson:"attributes,omitempty"` // Attributes is the attributes of the workspace (TODO) - Workspaces []string `json:"workspaces" bson:"workspaces,omitempty"` // Workspaces is the workspaces of the workspace - Workflows []string `json:"workflows" bson:"workflows,omitempty"` // Workflows is the workflows of the workspace - Peers []string `json:"peers" bson:"peers,omitempty"` // Peers is the peers of the workspace + Workspaces []string `json:"workspaces" bson:"workspaces"` // Workspaces is the workspaces of the workspace + Workflows []string `json:"workflows" bson:"workflows"` // Workflows is the workflows of the workspace + Peers []string `json:"peers" bson:"peers"` // Peers is the peers of the workspace Rules []string `json:"rules" bson:"rules,omitempty"` // Rules is the rules of the workspace SharedRules []*rule.Rule `json:"shared_rules,omitempty" bson:"-"` // SharedRules is the shared rules of the workspace diff --git a/models/collaborative_area/shallow_collaborative_area/shallow_collaborative_area.go b/models/collaborative_area/shallow_collaborative_area/shallow_collaborative_area.go index 178ef8d..b6a55dd 100644 --- a/models/collaborative_area/shallow_collaborative_area/shallow_collaborative_area.go +++ b/models/collaborative_area/shallow_collaborative_area/shallow_collaborative_area.go @@ -15,9 +15,9 @@ type ShallowCollaborativeArea struct { Version string `json:"version,omitempty" bson:"version,omitempty"` Description string `json:"description,omitempty" bson:"description,omitempty" validate:"required"` Attributes map[string]interface{} `json:"attributes,omitempty" bson:"attributes,omitempty"` - Workspaces []string `json:"workspaces,omitempty" bson:"workspaces,omitempty"` - Workflows []string `json:"workflows,omitempty" bson:"workflows,omitempty"` - Peers []string `json:"peers,omitempty" bson:"peers,omitempty"` + Workspaces []string `json:"workspaces" bson:"workspaces"` + Workflows []string `json:"workflows" bson:"workflows"` + Peers []string `json:"peers" bson:"peers"` Rules []string `json:"rules,omitempty" bson:"rules,omitempty"` }