fix: support GET for NaN and Inf/-Inf values

USACE · Dec 19, 2024 · 6366222 · 6366222
1 parent 1a636d8
commit 6366222
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/api/internal/db/overrides.go b/api/internal/db/overrides.go
@@ -85,13 +85,13 @@ type IpiMeasurement struct {
 }
 
 type Measurement struct {
-	TimeseriesID uuid.UUID `json:"-"`
-	Time         time.Time `json:"time"`
-	Value        float64   `json:"value"`
-	Masked       *bool     `json:"masked,omitempty"`
-	Validated    *bool     `json:"validated,omitempty"`
-	Annotation   *string   `json:"annotation,omitempty"`
-	Error        string    `json:"error,omitempty"`
+	TimeseriesID uuid.UUID   `json:"-"`
+	Time         time.Time   `json:"time"`
+	Value        FloatNanInf `json:"value"`
+	Masked       *bool       `json:"masked,omitempty"`
+	Validated    *bool       `json:"validated,omitempty"`
+	Annotation   *string     `json:"annotation,omitempty"`
+	Error        string      `json:"error,omitempty"`
 }
 
 type VProfileToken struct {

diff --git a/api/internal/db/timeseries_process.manual.go b/api/internal/db/timeseries_process.manual.go
@@ -174,7 +174,7 @@ func (mrc *ProcessTimeseriesResponseCollection) CollectSingleTimeseries(threshol
 			for i, m := range t.Measurements {
 				mmts[i] = Measurement{
 					Time:  m.Time,
-					Value: m.Value,
+					Value: FloatNanInf(m.Value),
 					Error: m.Error,
 				}
 			}

diff --git a/api/internal/handler/measurement_test.go b/api/internal/handler/measurement_test.go
@@ -9,12 +9,14 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 )
 
+const testTimeseriesIDWithNullValue = "869465fc-dc1e-445e-81f4-9979b5fadda9"
+
 const measurementSchema = `{
     "type": "object",
     "properties": {
         "id": { "type": "string" },
         "time": { "type": "string" },
-        "value": { "type": "number" }
+        "value": { "type": ["number", "null"] }
     },
     "required": ["time", "value"],
     "additionalProperties": true
@@ -123,6 +125,13 @@ func TestMeasurements(t *testing.T) {
 			Body:           createMeasurementsObjectBody,
 			ExpectedStatus: http.StatusCreated,
 		},
+		{
+			Name:           "ListTimeseriesMeasurementsWithNull",
+			URL:            fmt.Sprintf("/timeseries/%s/measurements?after=%s&before=%s", testTimeseriesIDWithNullValue, testMeasurementTimeAfter, testMeasurementTimeBefore),
+			Method:         http.MethodGet,
+			ExpectedStatus: http.StatusOK,
+			ExpectedSchema: objSchema,
+		},
 		{
 			Name:           "CreateTimeseriesMeasurements_Array",
 			URL:            fmt.Sprintf("/projects/%s/timeseries_measurements", testProjectID),

diff --git a/api/internal/service/survey123.go b/api/internal/service/survey123.go
@@ -182,7 +182,7 @@ func (s DBService) Survey123MeasurementCreateOrUpdateBatch(ctx context.Context,
 					arg = append(arg, db.TimeseriesMeasurementCreateOrUpdateBatchParams{
 						TimeseriesID: m.TimeseriesID,
 						Time:         m.Time,
-						Value:        m.Value,
+						Value:        float64(m.Value),
 					})
 				}
 			}
@@ -199,7 +199,7 @@ func (s DBService) Survey123MeasurementCreateOrUpdateBatch(ctx context.Context,
 					arg = append(arg, db.TimeseriesMeasurementCreateOrUpdateBatchParams{
 						TimeseriesID: m.TimeseriesID,
 						Time:         m.Time,
-						Value:        m.Value,
+						Value:        float64(m.Value),
 					})
 				}
 			}
@@ -213,7 +213,7 @@ func (s DBService) Survey123MeasurementCreateOrUpdateBatch(ctx context.Context,
 					arg = append(arg, db.TimeseriesMeasurementCreateOrUpdateBatchParams{
 						TimeseriesID: m.TimeseriesID,
 						Time:         m.Time,
-						Value:        m.Value,
+						Value:        float64(m.Value),
 					})
 				}
 			}
@@ -314,7 +314,7 @@ func parseAttributes(attr map[string]interface{}, eqt map[string]*uuid.UUID) ([]
 					continue
 				}
 			}
-			mm = append(mm, db.Measurement{TimeseriesID: *tsID, Time: t, Value: v, Masked: masked, Annotation: comment})
+			mm = append(mm, db.Measurement{TimeseriesID: *tsID, Time: t, Value: db.FloatNanInf(v), Masked: masked, Annotation: comment})
 		}
 	}
 	return mm, errors.Join(errs...)