Merge pull request #2717 from iain-anderson/device-moved

fix(metadata): Notify both device services when a Device is moved…
edgexfoundry · Sep 29, 2020 · 1366034 · 1366034
2 parents 486acce + bea4f5e
commit 1366034
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/internal/core/metadata/operators/device/events.go b/internal/core/metadata/operators/device/events.go
@@ -1,9 +1,10 @@
 package device
 
 type DeviceEvent struct {
-	DeviceId   string
-	DeviceName string
-	Error      error
-	HttpMethod string
-	ServiceId  string
+	DeviceId           string
+	DeviceName         string
+	Error              error
+	HttpMethod         string
+	ServiceId          string
+	SecondaryServiceId string
 }
diff --git a/internal/core/metadata/operators/device/notify.go b/internal/core/metadata/operators/device/notify.go
@@ -85,6 +85,19 @@ func (op deviceNotifier) Execute() {
 		if err := op.callback(service, deviceId, httpMethod, models.DEVICE); err != nil {
 			op.logger.Error(err.Error())
 		}
+
+		if msg.SecondaryServiceId != "" {
+			// Callback for secondary device service
+			service, err := op.database.GetDeviceServiceById(msg.SecondaryServiceId)
+			if err != nil {
+				op.logger.Error(err.Error())
+				return
+			}
+
+			if err := op.callback(service, deviceId, httpMethod, models.DEVICE); err != nil {
+				op.logger.Error(err.Error())
+			}
+		}
 	}
 }
 

diff --git a/internal/core/metadata/operators/device/update.go b/internal/core/metadata/operators/device/update.go
@@ -143,6 +143,10 @@ func (op updateDevice) Execute() (err error) {
 	evt.HttpMethod = http.MethodPut
 	evt.ServiceId = op.device.Service.Id
 
+	if op.device.Service.Id != oldDevice.Service.Id {
+		evt.SecondaryServiceId = oldDevice.Service.Id
+	}
+
 	op.events <- evt
 
 	return nil