This Branch can be merged now

- Using AdditionalFields instead of the "c8y_RelayArray" JSON Tag - Using the generic.JsonFromObject Method instead of the json.Marshal Method
qvest-digital · Oct 26, 2020 · 40af04e · 40af04e
1 parent f71db6b
commit 40af04e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/devicecontrol/operations.go b/devicecontrol/operations.go
@@ -15,7 +15,7 @@ const (
 
 type OperationCollection struct {
 	Self       string                    `json:"self"`
-	Operations []Operation               `json:"operations"`
+	Operations []Operation               `json:"operations" jsonc:"collection"`
 	Statistics *generic.PagingStatistics `json:"statistics"`
 	Prev       string                    `json:"prev"`
 	Next       string                    `json:"next"`
@@ -30,7 +30,6 @@ type Operation struct {
 	Status        string    `json:"status"`
 	FailureReason string    `json:"failureReason"`
 	Description   string    `json:"description"`
-	RelayArray    []string  `json:"c8y_RelayArray"`
 	Delivery      struct {
 		Time   time.Time `json:"time"`
 		Status string    `json:"status"`

diff --git a/inventory/inventoryApi.go b/inventory/inventoryApi.go
@@ -116,7 +116,8 @@ func (inventoryApi *inventoryApi) Update(managedObjectId string, managedObject *
 	if len(managedObjectId) == 0 {
 		return nil, generic.ClientError("Updating managedObject without an id is not allowed", "UpdateManagedObject")
 	}
-	bytes, err := json.Marshal(managedObject)
+
+	bytes, err := generic.JsonFromObject(managedObject)
 	if err != nil {
 		return nil, generic.ClientError(fmt.Sprintf("Error while marshalling the update managedObject: %s", err.Error()), "UpdateManagedObject")
 	}

diff --git a/inventory/model.go b/inventory/model.go
@@ -14,9 +14,9 @@ type NewManagedObject struct {
 }
 
 type ManagedObjectUpdate struct {
-	Type       string   `json:"type,omitempty"`
-	Name       string   `json:"name,omitempty"`
-	RelayArray []string `json:"c8y_RelayArray"`
+	Type             string                 `json:"type,omitempty"`
+	Name             string                 `json:"name,omitempty"`
+	AdditionalFields map[string]interface{} `jsonc:"flat"`
 }
 
 type (
@@ -50,8 +50,6 @@ type (
 
 		C8YSupportedOperations *[]string              `json:"c8y_SupportedOperations,omitempty"`
 		AdditionalFields       map[string]interface{} `jsonc:"flat"`
-
-		RelayArray []string `json:"c8y_RelayArray"`
 	}
 
 	AssetParents struct {