revert: "feat: Allow store reading as null value"

This reverts commit faff7e1 Signed-off-by: bruce <[email protected]>
edgexfoundry · Oct 17, 2024 · 636acee · 636acee
1 parent 0f2c1aa
commit 636acee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/internal/core/data/application/event_test.go b/internal/core/data/application/event_test.go
@@ -47,7 +47,7 @@ var persistedEvent = models.Event{
 
 func buildReadings() []models.Reading {
 	ticks := pkgCommon.MakeTimestamp()
-	testValue := "45"
+
 	r1 := models.SimpleReading{
 		BaseReading: models.BaseReading{
 			Id:           uuid.New().String(),
@@ -57,7 +57,7 @@ func buildReadings() []models.Reading {
 			ProfileName:  "TempProfile",
 			ValueType:    common.ValueTypeUint16,
 		},
-		Value: &testValue,
+		Value: "45",
 	}
 
 	r2 := models.BinaryReading{
@@ -81,7 +81,7 @@ func buildReadings() []models.Reading {
 			ProfileName:  "TempProfile",
 			ValueType:    common.ValueTypeUint16,
 		},
-		Value: &testValue,
+		Value: "33",
 	}
 
 	r4 := models.SimpleReading{
@@ -93,7 +93,7 @@ func buildReadings() []models.Reading {
 			ProfileName:  "TempProfile",
 			ValueType:    common.ValueTypeUint16,
 		},
-		Value: &testValue,
+		Value: "44",
 	}
 
 	r5 := models.SimpleReading{
@@ -105,7 +105,7 @@ func buildReadings() []models.Reading {
 			ProfileName:  "TempProfile",
 			ValueType:    common.ValueTypeUint16,
 		},
-		Value: &testValue,
+		Value: "55",
 	}
 
 	var readings []models.Reading

diff --git a/internal/core/data/controller/http/event_test.go b/internal/core/data/controller/http/event_test.go
@@ -75,7 +75,7 @@ var persistedReading = models.SimpleReading{
 		ProfileName:  TestDeviceProfileName,
 		ValueType:    common.ValueTypeUint8,
 	},
-	Value: &testReadingValue,
+	Value: TestReadingValue,
 }
 
 var persistedEvent = models.Event{

diff --git a/internal/pkg/infrastructure/postgres/reading.go b/internal/pkg/infrastructure/postgres/reading.go
@@ -258,7 +258,7 @@ func queryReadings(ctx context.Context, connPool *pgxpool.Pool, sql string, args
 			// reading type is SimpleReading
 			simpleReading := model.SimpleReading{
 				BaseReading: baseReading,
-				Value:       readingDBModel.Value,
+				Value:       *readingDBModel.Value,
 			}
 			reading = simpleReading
 		} else {
@@ -351,7 +351,7 @@ func addReadingsInTx(tx pgx.Tx, readings []model.Reading, eventId string) error
 			// convert SimpleReading struct to Reading DB model
 			readingDBModel = dbModels.Reading{
 				BaseReading:   baseReading,
-				SimpleReading: dbModels.SimpleReading{Value: contractReadingModel.Value},
+				SimpleReading: dbModels.SimpleReading{Value: &contractReadingModel.Value},
 			}
 		default:
 			return errors.NewCommonEdgeX(errors.KindContractInvalid, "failed to convert reading to none of BinaryReading/ObjectReading/SimpleReading structs", nil)

diff --git a/internal/pkg/infrastructure/redis/reading_test.go b/internal/pkg/infrastructure/redis/reading_test.go
@@ -23,7 +23,6 @@ const (
 )
 
 func simpleReadingData() models.SimpleReading {
-	testValue := "123"
 	return models.SimpleReading{
 		BaseReading: models.BaseReading{
 			Id:           exampleUUID,
@@ -33,7 +32,7 @@ func simpleReadingData() models.SimpleReading {
 			ResourceName: testResourceName,
 			ValueType:    common.ValueTypeString,
 		},
-		Value: &testValue,
+		Value: "123",
 	}
 }