From c6c95bb9bc3d8443431d8b1e0e52ce61fb5b3318 Mon Sep 17 00:00:00 2001 From: Dan Lamppa Date: Tue, 7 Jul 2020 17:30:23 -0500 Subject: [PATCH] When a DEP sync event was serialized and deserialized, the dep.Device.ProfileStatus property was not included so its value was not later copied to device.Device.ProfileStatus and saved to the database. (#682) Co-authored-by: Dan Lamppa --- platform/dep/sync/event.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/dep/sync/event.go b/platform/dep/sync/event.go index ae52526b..8c6212b9 100644 --- a/platform/dep/sync/event.go +++ b/platform/dep/sync/event.go @@ -35,6 +35,7 @@ func MarshalEvent(e *Event) ([]byte, error) { Description: d.Description, Color: d.Color, AssetTag: d.AssetTag, + ProfileStatus: d.ProfileStatus, ProfileUuid: d.ProfileUUID, ProfileAssignTime: d.ProfileAssignTime.UnixNano(), ProfilePushTime: d.ProfilePushTime.UnixNano(), @@ -69,6 +70,7 @@ func UnmarshalEvent(data []byte, e *Event) error { Description: d.GetDescription(), Color: d.GetColor(), AssetTag: d.GetAssetTag(), + ProfileStatus: d.GetProfileStatus(), ProfileUUID: d.GetProfileUuid(), ProfileAssignTime: time.Unix(0, d.GetProfileAssignTime()).UTC(), ProfilePushTime: time.Unix(0, d.GetProfilePushTime()).UTC(),