Ensure we always report per-phase measurements for the correct phase

Author: sthelen-enqs

usecases/internal/measurement.go

@@ -29,20 +29,31 @@ func MeasurementPhaseSpecificDataForFilter(
 	}
 
 	var result []float64
+	if validPhaseNameTypes != nil {
+		// pre-allocate result array for each possible phase so we can add phases to it in arbitrary order
+		result = make([]float64, len(validPhaseNameTypes))
+	}
 
 	for _, item := range data {
 		if item.Value == nil || item.MeasurementId == nil {
 			continue
 		}
 
+		phaseIndex := -1
 		if validPhaseNameTypes != nil {
 			filter := model.ElectricalConnectionParameterDescriptionDataType{
 				MeasurementId: item.MeasurementId,
 			}
 			param, err := electricalConnection.GetParameterDescriptionsForFilter(filter)
-			if err != nil || len(param) == 0 ||
-				param[0].AcMeasuredPhases == nil ||
-				!slices.Contains(validPhaseNameTypes, *param[0].AcMeasuredPhases) {
+			if err != nil || len(param) == 0 || param[0].AcMeasuredPhases == nil {
+				// error getting parameter description
+				continue
+			}
+
+			// calculate the offset into result for the measured phase
+			phaseIndex = slices.Index(validPhaseNameTypes, *param[0].AcMeasuredPhases)
+			if phaseIndex == -1 {
+				// ignore phase measurements not specified in validPhaseNameTypes
 				continue
 			}
 		}
@@ -70,7 +81,13 @@ func MeasurementPhaseSpecificDataForFilter(
 
 		value := item.Value.GetValue()
 
-		result = append(result, value)
+		if validPhaseNameTypes == nil {
+			// measurement is not for a specific phase
+			result = append(result, value)
+		} else {
+			// measurement is for a specific phase, store the value at the corresponding phaseIndex
+			result[phaseIndex] = value
+		}
 	}
 
 	return result, nil

usecases/internal/measurement_test.go

@@ -114,7 +114,7 @@ func (s *InternalSuite) Test_MeasurementPhaseSpecificDataForFilter() {
 		ucapi.PhaseNameMapping,
 	)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{

usecases/ma/mgcp/public_test.go

@@ -316,7 +316,7 @@ func (s *GcpMGCPSuite) Test_CurrentPerPhase() {
 
 	data, err = s.sut.CurrentPerPhase(s.smgwEntity)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{
@@ -421,7 +421,7 @@ func (s *GcpMGCPSuite) Test_VoltagePerPhase() {
 
 	data, err = s.sut.VoltagePerPhase(s.smgwEntity)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{

usecases/ma/mpc/public_test.go

@@ -146,7 +146,7 @@ func (s *MaMPCSuite) Test_PowerPerPhase() {
 
 	data, err = s.sut.PowerPerPhase(s.monitoredEntity)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{
@@ -405,7 +405,7 @@ func (s *MaMPCSuite) Test_CurrentPerPhase() {
 
 	data, err = s.sut.CurrentPerPhase(s.monitoredEntity)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{
@@ -510,7 +510,7 @@ func (s *MaMPCSuite) Test_VoltagePerPhase() {
 
 	data, err = s.sut.VoltagePerPhase(s.monitoredEntity)
 	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 0, len(data))
+	assert.Equal(s.T(), []float64{0, 0, 0}, data)
 
 	elParamData := &model.ElectricalConnectionParameterDescriptionListDataType{
 		ElectricalConnectionParameterDescriptionData: []model.ElectricalConnectionParameterDescriptionDataType{