Simplify

Author: DerAndereAndi

uclpcserver/public.go

@@ -110,32 +110,15 @@ func (e *UCLPCServer) PendingConsumptionLimits() map[model.MsgCounterType]api.Lo
 
 	result := make(map[model.MsgCounterType]api.LoadLimit)
 
-	descriptions := util.GetLocalLimitDescriptionsForTypeCategoryDirectionScope(
-		e.service,
-		model.LoadControlLimitTypeTypeSignDependentAbsValueLimit,
-		model.LoadControlCategoryTypeObligation,
-		model.EnergyDirectionTypeConsume,
-		model.ScopeTypeTypeActivePowerLimit,
-	)
-	if len(descriptions) != 1 || descriptions[0].LimitId == nil {
-		return result
-	}
-	description := descriptions[0]
-
 	for key, msg := range e.pendingLimits {
 		data := msg.Cmd.LoadControlLimitListData
 
-		if data == nil || data.LoadControlLimitData == nil || len(data.LoadControlLimitData) == 0 {
-			continue
-		}
+		// elements are only added to the map if all required fields exist
+		// therefor not check for these are needed here
 
 		// we assume there is always only one limit
 		element := data.LoadControlLimitData[0]
 
-		if description.LimitId == nil || element.LimitId == nil || *description.LimitId != *element.LimitId {
-			continue
-		}
-
 		limit := api.LoadLimit{}
 
 		if element.TimePeriod != nil {

uclpcserver/public_test.go

@@ -40,47 +40,14 @@ func (s *UCLPCServerSuite) Test_PendingConsumptionLimits() {
 			MsgCounter: eebusutil.Ptr(msgCounter),
 		},
 		Cmd: model.CmdType{
-			LoadControlLimitListData: &model.LoadControlLimitListDataType{},
-		},
-	}
-
-	s.sut.loadControlWriteCB(msg)
-
-	data = s.sut.PendingConsumptionLimits()
-	assert.Equal(s.T(), 0, len(data))
-
-	msg.Cmd = model.CmdType{
-		LoadControlLimitListData: &model.LoadControlLimitListDataType{
-			LoadControlLimitData: []model.LoadControlLimitDataType{},
-		},
-	}
-
-	s.sut.loadControlWriteCB(msg)
-
-	data = s.sut.PendingConsumptionLimits()
-	assert.Equal(s.T(), 0, len(data))
-
-	msg.Cmd = model.CmdType{
-		LoadControlLimitListData: &model.LoadControlLimitListDataType{
-			LoadControlLimitData: []model.LoadControlLimitDataType{
-				{},
-			},
-		},
-	}
-
-	s.sut.loadControlWriteCB(msg)
-
-	data = s.sut.PendingConsumptionLimits()
-	assert.Equal(s.T(), 0, len(data))
-
-	msg.Cmd = model.CmdType{
-		LoadControlLimitListData: &model.LoadControlLimitListDataType{
-			LoadControlLimitData: []model.LoadControlLimitDataType{
-				{
-					LimitId:       eebusutil.Ptr(model.LoadControlLimitIdType(0)),
-					IsLimitActive: eebusutil.Ptr(true),
-					Value:         model.NewScaledNumberType(1000),
-					TimePeriod:    model.NewTimePeriodTypeWithRelativeEndTime(time.Minute * 2),
+			LoadControlLimitListData: &model.LoadControlLimitListDataType{
+				LoadControlLimitData: []model.LoadControlLimitDataType{
+					{
+						LimitId:       eebusutil.Ptr(model.LoadControlLimitIdType(0)),
+						IsLimitActive: eebusutil.Ptr(true),
+						Value:         model.NewScaledNumberType(1000),
+						TimePeriod:    model.NewTimePeriodTypeWithRelativeEndTime(time.Minute * 2),
+					},
 				},
 			},
 		},

uclpcserver/uclpc.go

@@ -1,6 +1,7 @@
 package uclpcserver
 
 import (
+	"errors"
 	"sync"
 
 	"github.com/enbility/cemd/api"
@@ -48,14 +49,9 @@ func (c *UCLPCServer) UseCaseName() model.UseCaseNameType {
 	return model.UseCaseNameTypeLimitationOfPowerConsumption
 }
 
-func (e *UCLPCServer) loadControlWriteCB(msg *spineapi.Message) {
-	e.pendingMux.Lock()
-	defer e.pendingMux.Unlock()
-
-	if msg.RequestHeader == nil || msg.RequestHeader.MsgCounter == nil ||
-		msg.Cmd.LoadControlLimitListData == nil {
-		return
-	}
+func (e *UCLPCServer) loadControlLimitId() (limitid model.LoadControlLimitIdType, err error) {
+	limitid = model.LoadControlLimitIdType(0)
+	err = errors.New("not found")
 
 	descriptions := util.GetLocalLimitDescriptionsForTypeCategoryDirectionScope(
 		e.service,
@@ -69,16 +65,34 @@ func (e *UCLPCServer) loadControlWriteCB(msg *spineapi.Message) {
 	}
 	description := descriptions[0]
 
-	data := msg.Cmd.LoadControlLimitListData
+	if description.LimitId == nil {
+		return
+	}
+
+	return *description.LimitId, nil
+}
 
-	if data == nil || data.LoadControlLimitData == nil || len(data.LoadControlLimitData) == 0 {
+func (e *UCLPCServer) loadControlWriteCB(msg *spineapi.Message) {
+	e.pendingMux.Lock()
+	defer e.pendingMux.Unlock()
+
+	if msg.RequestHeader == nil || msg.RequestHeader.MsgCounter == nil ||
+		msg.Cmd.LoadControlLimitListData == nil {
 		return
 	}
 
-	// we assume there is always only one limit
-	element := data.LoadControlLimitData[0]
+	limitId, err := e.loadControlLimitId()
+	if err != nil {
+		return
+	}
 
-	if description.LimitId == nil || element.LimitId == nil || *description.LimitId != *element.LimitId {
+	data := msg.Cmd.LoadControlLimitListData
+
+	// we assume there is always only one limit
+	if data == nil || data.LoadControlLimitData == nil ||
+		len(data.LoadControlLimitData) == 0 ||
+		data.LoadControlLimitData[0].LimitId == nil ||
+		limitId != *data.LoadControlLimitData[0].LimitId {
 		return
 	}