Merge pull request #933 from weichou1229/issue-931-2

feat: Allow store reading value as null
edgexfoundry · Oct 7, 2024 · 4ed9aff · 4ed9aff
2 parents c49e7a4 + 11f0ae7
commit 4ed9aff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/dtos/reading.go b/dtos/reading.go
@@ -327,7 +327,7 @@ func ToReadingModel(r BaseReading) models.Reading {
 	} else {
 		readingModel = models.SimpleReading{
 			BaseReading: br,
-			Value:       *r.Value,
+			Value:       r.Value,
 		}
 	}
 	return readingModel
@@ -370,7 +370,7 @@ func FromReadingModelToDTO(reading models.Reading) BaseReading {
 			ValueType:     r.ValueType,
 			Units:         r.Units,
 			Tags:          r.Tags,
-			SimpleReading: SimpleReading{Value: &r.Value},
+			SimpleReading: SimpleReading{Value: r.Value},
 		}
 	}
 

diff --git a/dtos/reading_test.go b/dtos/reading_test.go
@@ -45,7 +45,7 @@ func Test_ToReadingModel(t *testing.T) {
 			Units:        TestUnit,
 			Tags:         testTags,
 		},
-		Value: TestValue,
+		Value: &TestSimpleValue,
 	}
 	tests := []struct {
 		name    string
@@ -73,7 +73,7 @@ func TestFromReadingModelToDTO(t *testing.T) {
 			Units:        TestUnit,
 			Tags:         testTags,
 		},
-		Value: TestValue,
+		Value: &TestSimpleValue,
 	}
 	expectedDTO := BaseReading{
 		Id:           TestUUID,

diff --git a/dtos/requests/event_test.go b/dtos/requests/event_test.go
@@ -281,6 +281,7 @@ func TestAddEvent_UnmarshalCBOR(t *testing.T) {
 
 func Test_AddEventReqToEventModels(t *testing.T) {
 	valid := eventRequestData()
+	testReadingValue := "45"
 	s := models.SimpleReading{
 		BaseReading: models.BaseReading{
 			Id:           ExampleUUID,
@@ -290,7 +291,7 @@ func Test_AddEventReqToEventModels(t *testing.T) {
 			Origin:       TestOriginTime,
 			ValueType:    common.ValueTypeUint8,
 		},
-		Value: TestReadingValue,
+		Value: &testReadingValue,
 	}
 	expectedEventModel := models.Event{
 		Id:          ExampleUUID,

diff --git a/models/reading.go b/models/reading.go
@@ -24,7 +24,7 @@ type BinaryReading struct {
 
 type SimpleReading struct {
 	BaseReading `json:",inline"`
-	Value       string
+	Value       *string
 }
 
 type ObjectReading struct {