IAM Device: fix meta parsing

philips-software · Sep 13, 2022 · 5503654 · 5503654
1 parent 9b6174b
commit 5503654
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/iam/devices_service.go b/iam/devices_service.go
@@ -41,10 +41,7 @@ type Device struct {
 	GlobalReferenceID string           `json:"globalReferenceId" validate:"required,min=3,max=50"`
 	Text              string           `json:"text,omitempty"`
 	ApplicationID     string           `json:"applicationId" validate:"required"`
-	Meta              struct {
-		VersionID   string     `json:"versionId,omitempty"`
-		LastUpdated *time.Time `json:"lastUpdated,omitempty"`
-	} `json:"meta,omitempty"`
+	Meta              *Meta            `json:"meta,omitempty"`
 }
 
 // GetDevicesOptions describes search criteria for looking up devices
@@ -100,7 +97,7 @@ func (p *DevicesService) GetDeviceByID(deviceID string) (*Device, *Response, err
 		ID: &deviceID,
 	})
 	if devices == nil || len(*devices) == 0 {
-		return nil, resp, ErrNotFound
+		return nil, resp, fmt.Errorf("GetDeviceByID: %v %w", err, ErrNotFound)
 	}
 	return &(*devices)[0], resp, err
 }

diff --git a/iam/devices_service_test.go b/iam/devices_service_test.go
@@ -32,18 +32,19 @@ func TestDevicesCRUD(t *testing.T) {
       "applicationId": "711171ab-d28c-4616-a314-f95584e280c3",
       "deviceExtId": {
         "type": {
-          "code": "ID"
+          "code": "ID",
+          "text": "Device Identifier"
         },
-        "system": "http://www.philips.co.id/c-m-ho/fake/fakedevice",
+        "system": "https://www.philips.co.id/c-m-ho/fake/fakedevice",
         "value": "0001"
       },
       "type": "Device",
       "isActive": true,
       "globalReferenceId": "c157bd2e-e992-4b5e-88ab-911766b7b8f4",
       "id": "`+deviceID+`",
       "meta": {
-        "versionId": "0",
-        "lastModified": "2020-08-23T20:47:374.040Z"
+        "versionId": "1",
+        "lastModified": "2022-09-13T20:35:52Z"
       }
     }
   ]
@@ -63,7 +64,7 @@ func TestDevicesCRUD(t *testing.T) {
         "type": {
           "code": "ID"
         },
-        "system": "http://www.philips.co.id/c-m-ho/fake/fakedevice",
+        "system": "https://www.philips.co.id/c-m-ho/fake/fakedevice",
         "value": "0001"
       },
       "type": "Device",
@@ -72,7 +73,7 @@ func TestDevicesCRUD(t *testing.T) {
       "id": "`+deviceID+`",
       "meta": {
         "versionId": "1",
-        "lastModified": "2020-08-23T20:47:374.040Z"
+        "lastModified": "2022-09-13T20:35:52Z"
       }
     }`)
 		case "DELETE":
@@ -102,7 +103,7 @@ func TestDevicesCRUD(t *testing.T) {
 				Code: "ID",
 				Text: "Device identification",
 			},
-			System: "http://www.philips.co.id/c-m-ho/fake/fakedevice",
+			System: "https://www.philips.co.id/c-m-ho/fake/fakedevice",
 			Value:  "0001",
 		},
 	}

diff --git a/iam/organization.go b/iam/organization.go
@@ -16,11 +16,13 @@ type OrgAddress struct {
 type Meta struct {
 	ResourceType string     `json:"resourceType,omitempty"`
 	LastModified *time.Time `json:"lastModified,omitempty"`
+	LastUpdated  *time.Time `json:"lastUpdated,omitempty"`
 	Created      *time.Time `json:"created,omitempty"`
 	UpdatedBy    string     `json:"updatedBy,omitempty"`
 	CreatedBy    string     `json:"createdBy,omitempty"`
 	Location     string     `json:"location,omitempty"`
-	Version      string     `json:"version,omitempty"`
+	Version      string     `json:"version,omitempty"`   // No
+	VersionID    string     `json:"versionId,omitempty"` // Consistency
 }
 
 type Attribute struct {

diff --git a/internal/version.go b/internal/version.go
@@ -1,5 +1,5 @@
 package internal
 
 const (
-	LibraryVersion = "0.73.3"
+	LibraryVersion = "0.73.4"
 )