as: Add metering to normalized uplink

Author: johanstokking

pkg/messageprocessors/normalizedpayload/uplink.go

@@ -76,6 +76,16 @@ type Water struct {
 	Temperature *float64
 }
 
+// WaterMetering is a water metering measurement.
+type WaterMetering struct {
+	Total *float64
+}
+
+// Metering is a metering measurement.
+type Metering struct {
+	Water WaterMetering
+}
+
 // Position is a position measurement.
 type Position struct {
 	Latitude  *float64
@@ -91,6 +101,7 @@ type Measurement struct {
 	Wind     Wind
 	Rain     Rain
 	Water    Water
+	Metering Metering
 	Action   Action
 	Position Position
 }
@@ -444,6 +455,22 @@ var fieldParsers = map[string]fieldParser{
 			return &dst.Water.Temperature
 		},
 	),
+	"metering": object(
+		func(dst *Measurement) *Metering {
+			return &dst.Metering
+		},
+	),
+	"metering.water": object(
+		func(dst *Measurement) *WaterMetering {
+			return &dst.Metering.Water
+		},
+	),
+	"metering.water.total": parseNumber(
+		func(dst *Measurement) **float64 {
+			return &dst.Metering.Water.Total
+		},
+		minimum(0.0),
+	),
 	"action": object(
 		func(dst *Measurement) *Action {
 			return &dst.Action

pkg/messageprocessors/normalizedpayload/uplink_test.go

@@ -688,6 +688,45 @@ func TestUplink(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "metering",
+			normalizedPayload: []*structpb.Struct{
+				{
+					Fields: map[string]*structpb.Value{
+						"metering": {
+							Kind: &structpb.Value_StructValue{
+								StructValue: &structpb.Struct{
+									Fields: map[string]*structpb.Value{
+										"water": {
+											Kind: &structpb.Value_StructValue{
+												StructValue: &structpb.Struct{
+													Fields: map[string]*structpb.Value{
+														"total": {
+															Kind: &structpb.Value_NumberValue{
+																NumberValue: 100.5,
+															},
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: []normalizedpayload.Measurement{
+				{
+					Metering: normalizedpayload.Metering{
+						Water: normalizedpayload.WaterMetering{
+							Total: float64Ptr(100.5),
+						},
+					},
+				},
+			},
+		},
 	} {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {