Merge pull request #674 from judehung/issue-673

fix(data): Add reading id mapping during conversion
edgexfoundry · Oct 19, 2021 · 06c8706 · 06c8706
2 parents 3eb1cdc + fcb12ca
commit 06c8706
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/dtos/reading.go b/dtos/reading.go
@@ -287,6 +287,7 @@ func (b BaseReading) Validate() error {
 func ToReadingModel(r BaseReading) models.Reading {
 	var readingModel models.Reading
 	br := models.BaseReading{
+		Id:           r.Id,
 		Origin:       r.Origin,
 		DeviceName:   r.DeviceName,
 		ResourceName: r.ResourceName,

diff --git a/dtos/reading_test.go b/dtos/reading_test.go
@@ -17,6 +17,7 @@ import (
 )
 
 var testSimpleReading = BaseReading{
+	Id:           TestUUID,
 	DeviceName:   TestDeviceName,
 	ResourceName: TestReadingName,
 	ProfileName:  TestDeviceProfileName,
@@ -31,6 +32,7 @@ func Test_ToReadingModel(t *testing.T) {
 	valid := testSimpleReading
 	expectedSimpleReading := models.SimpleReading{
 		BaseReading: models.BaseReading{
+			Id:           TestUUID,
 			DeviceName:   TestDeviceName,
 			ResourceName: TestReadingName,
 			ProfileName:  TestDeviceProfileName,

diff --git a/dtos/requests/event_test.go b/dtos/requests/event_test.go
@@ -283,6 +283,7 @@ func Test_AddEventReqToEventModels(t *testing.T) {
 	valid := eventRequestData()
 	s := models.SimpleReading{
 		BaseReading: models.BaseReading{
+			Id:           ExampleUUID,
 			DeviceName:   TestDeviceName,
 			ResourceName: TestDeviceResourceName,
 			ProfileName:  TestDeviceProfileName,