Improve getting proper loadlimit values

Author: DerAndereAndi

ucopev/public.go

@@ -29,7 +29,13 @@ func (e *UCOPEV) CurrentLimits(entity spineapi.EntityRemoteInterface) ([]float64
 //   - and others
 func (e *UCOPEV) LoadControlLimits(entity spineapi.EntityRemoteInterface) (
 	limits []api.LoadLimitsPhase, resultErr error) {
-	return util.LoadControlLimits(e.service, entity, e.validEntityTypes, model.LoadControlCategoryTypeObligation)
+	return util.LoadControlLimits(
+		e.service,
+		entity,
+		e.validEntityTypes,
+		model.LoadControlLimitTypeTypeMaxValueLimit,
+		model.LoadControlCategoryTypeObligation,
+		model.ScopeTypeTypeOverloadProtection)
 }
 
 // send new LoadControlLimits to the remote EV

ucoscev/public.go

@@ -28,7 +28,13 @@ func (e *UCOSCEV) CurrentLimits(entity spineapi.EntityRemoteInterface) ([]float6
 //   - ErrDataNotAvailable if no such limit is (yet) available
 //   - and others
 func (e *UCOSCEV) LoadControlLimits(entity spineapi.EntityRemoteInterface) (limits []api.LoadLimitsPhase, resultErr error) {
-	return util.LoadControlLimits(e.service, entity, e.validEntityTypes, model.LoadControlCategoryTypeRecommendation)
+	return util.LoadControlLimits(
+		e.service,
+		entity,
+		e.validEntityTypes,
+		model.LoadControlLimitTypeTypeMaxValueLimit,
+		model.LoadControlCategoryTypeRecommendation,
+		model.ScopeTypeTypeSelfConsumption)
 }
 
 // send new LoadControlLimits to the remote EV

util/loadcontrol.go

@@ -18,7 +18,9 @@ func LoadControlLimits(
 	service eebusapi.ServiceInterface,
 	entity spineapi.EntityRemoteInterface,
 	entityTypes []model.EntityTypeType,
-	category model.LoadControlCategoryType) (limits []api.LoadLimitsPhase, resultErr error) {
+	limitType model.LoadControlLimitTypeType,
+	limitCategory model.LoadControlCategoryType,
+	scopeType model.ScopeTypeType) (limits []api.LoadLimitsPhase, resultErr error) {
 	limits = nil
 	resultErr = api.ErrNoCompatibleEntity
 	if entity == nil || !IsCompatibleEntity(entity, entityTypes) {
@@ -34,7 +36,8 @@ func LoadControlLimits(
 	resultErr = eebusapi.ErrDataNotAvailable
 	// find out the appropriate limitId for each phase value
 	// limitDescription contains the measurementId for each limitId
-	limitDescriptions, err := evLoadControl.GetLimitDescriptionsForCategory(category)
+	limitDescriptions, err := evLoadControl.GetLimitDescriptionsForTypeCategoryDirectionScope(
+		limitType, limitCategory, "", scopeType)
 	if err != nil {
 		return
 	}

util/loadcontrol_test.go

@@ -12,14 +12,16 @@ import (
 func (s *UtilSuite) Test_LoadControlLimits() {
 	var data []api.LoadLimitsPhase
 	var err error
+	limitType := model.LoadControlLimitTypeTypeMaxValueLimit
+	scope := model.ScopeTypeTypeSelfConsumption
 	category := model.LoadControlCategoryTypeObligation
 	entityTypes := []model.EntityTypeType{model.EntityTypeTypeEV}
 
-	data, err = LoadControlLimits(s.service, s.mockRemoteEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.mockRemoteEntity, entityTypes, limitType, category, scope)
 	assert.NotNil(s.T(), err)
 	assert.Nil(s.T(), data)
 
-	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, limitType, category, scope)
 	assert.NotNil(s.T(), err)
 	assert.Nil(s.T(), data)
 
@@ -29,16 +31,22 @@ func (s *UtilSuite) Test_LoadControlLimits() {
 				LimitId:       eebusutil.Ptr(model.LoadControlLimitIdType(0)),
 				LimitCategory: eebusutil.Ptr(category),
 				MeasurementId: eebusutil.Ptr(model.MeasurementIdType(0)),
+				LimitType:     eebusutil.Ptr(limitType),
+				ScopeType:     eebusutil.Ptr(scope),
 			},
 			{
 				LimitId:       eebusutil.Ptr(model.LoadControlLimitIdType(1)),
 				LimitCategory: eebusutil.Ptr(category),
 				MeasurementId: eebusutil.Ptr(model.MeasurementIdType(1)),
+				LimitType:     eebusutil.Ptr(limitType),
+				ScopeType:     eebusutil.Ptr(scope),
 			},
 			{
 				LimitId:       eebusutil.Ptr(model.LoadControlLimitIdType(2)),
 				LimitCategory: eebusutil.Ptr(category),
 				MeasurementId: eebusutil.Ptr(model.MeasurementIdType(2)),
+				LimitType:     eebusutil.Ptr(limitType),
+				ScopeType:     eebusutil.Ptr(scope),
 			},
 		},
 	}
@@ -47,7 +55,7 @@ func (s *UtilSuite) Test_LoadControlLimits() {
 	fErr := rFeature.UpdateData(model.FunctionTypeLoadControlLimitDescriptionListData, descData, nil, nil)
 	assert.Nil(s.T(), fErr)
 
-	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, limitType, category, scope)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), 3, len(data))
 	assert.Equal(s.T(), 0.0, data[0].Value)
@@ -79,7 +87,7 @@ func (s *UtilSuite) Test_LoadControlLimits() {
 	fErr = rElFeature.UpdateData(model.FunctionTypeElectricalConnectionParameterDescriptionListData, paramData, nil, nil)
 	assert.Nil(s.T(), fErr)
 
-	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, limitType, category, scope)
 	assert.NotNil(s.T(), err)
 	assert.Nil(s.T(), data)
 
@@ -102,7 +110,7 @@ func (s *UtilSuite) Test_LoadControlLimits() {
 	fErr = rFeature.UpdateData(model.FunctionTypeLoadControlLimitListData, limitData, nil, nil)
 	assert.Nil(s.T(), fErr)
 
-	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, limitType, category, scope)
 	assert.NotNil(s.T(), err)
 	assert.Nil(s.T(), data)
 
@@ -131,7 +139,7 @@ func (s *UtilSuite) Test_LoadControlLimits() {
 	fErr = rElFeature.UpdateData(model.FunctionTypeElectricalConnectionPermittedValueSetListData, permData, nil, nil)
 	assert.Nil(s.T(), fErr)
 
-	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, category)
+	data, err = LoadControlLimits(s.service, s.monitoredEntity, entityTypes, limitType, category, scope)
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), 3, len(data))
 	assert.Equal(s.T(), 16.0, data[0].Value)