Skip to content

Commit

Permalink
Fix codefactor warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
DerAndereAndi committed May 28, 2024
1 parent ea7bbb9 commit 6984057
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions features/server/deviceconfiguration.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ func (d *DeviceConfiguration) UpdateKeyValueDataForFilter(
}

partial := model.NewFilterTypePartial()
var delete *model.FilterType
var deleteFilter *model.FilterType
if deleteElements != nil {
delete = &model.FilterType{
deleteFilter = &model.FilterType{
DeviceConfigurationKeyValueListDataSelectors: &model.DeviceConfigurationKeyValueListDataSelectorsType{
KeyId: description.KeyId,
},
DeviceConfigurationKeyValueDataElements: deleteElements,
}
}

if err := d.featureLocal.UpdateData(model.FunctionTypeDeviceConfigurationKeyValueListData, datalist, partial, delete); err != nil {
if err := d.featureLocal.UpdateData(model.FunctionTypeDeviceConfigurationKeyValueListData, datalist, partial, deleteFilter); err != nil {
return errors.New(err.String())
}

Expand Down
4 changes: 2 additions & 2 deletions features/server/deviceconfiguration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@ func (s *DeviceConfigurationSuite) Test_UpdateKeyValueDataForFilter() {
err = s.sut.UpdateKeyValueDataForFilter(data, nil, filter)
assert.Nil(s.T(), err)

delete := &model.DeviceConfigurationKeyValueDataElementsType{
deleteElements := &model.DeviceConfigurationKeyValueDataElementsType{
Value: &model.DeviceConfigurationKeyValueValueElementsType{},
}
data = model.DeviceConfigurationKeyValueDataType{}
err = s.sut.UpdateKeyValueDataForFilter(data, delete, filter)
err = s.sut.UpdateKeyValueDataForFilter(data, deleteElements, filter)
assert.Nil(s.T(), err)

result, err = s.sut.GetKeyValueDataForFilter(filter)
Expand Down
6 changes: 3 additions & 3 deletions features/server/electricalconnection.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ func (e *ElectricalConnection) UpdateCharacteristic(
}

partial := model.NewFilterTypePartial()
var delete *model.FilterType
var deleteFilter *model.FilterType
if deleteElements != nil {
delete = &model.FilterType{
deleteFilter = &model.FilterType{
ElectricalConnectionCharacteristicListDataSelectors: &model.ElectricalConnectionCharacteristicListDataSelectorsType{
CharacteristicId: data.CharacteristicId,
},
Expand All @@ -177,7 +177,7 @@ func (e *ElectricalConnection) UpdateCharacteristic(
ElectricalConnectionCharacteristicData: []model.ElectricalConnectionCharacteristicDataType{data},
}

if err := e.featureLocal.UpdateData(model.FunctionTypeElectricalConnectionCharacteristicListData, datalist, partial, delete); err != nil {
if err := e.featureLocal.UpdateData(model.FunctionTypeElectricalConnectionCharacteristicListData, datalist, partial, deleteFilter); err != nil {
return errors.New(err.String())
}

Expand Down
4 changes: 2 additions & 2 deletions features/server/electricalconnection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ func (s *ElectricalConnectionSuite) Test_UpdateCharacteristic() {
err = s.sut.UpdateCharacteristic(charData, nil)
assert.Nil(s.T(), err)

delete := &model.ElectricalConnectionCharacteristicDataElementsType{
deleteElements := &model.ElectricalConnectionCharacteristicDataElementsType{
Value: &model.ScaledNumberElementsType{},
}
charData.Value = nil
err = s.sut.UpdateCharacteristic(charData, delete)
err = s.sut.UpdateCharacteristic(charData, deleteElements)
assert.Nil(s.T(), err)

data, err = s.sut.GetCharacteristicsForFilter(filter)
Expand Down
6 changes: 3 additions & 3 deletions features/server/loadcontrol.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@ func (l *LoadControl) UpdateLimitDataForFilter(
}

partial := model.NewFilterTypePartial()
var delete *model.FilterType
var deleteFilter *model.FilterType
if deleteElements != nil {
delete = &model.FilterType{
deleteFilter = &model.FilterType{
LoadControlLimitListDataSelectors: &model.LoadControlLimitListDataSelectorsType{
LimitId: description.LimitId,
},
LoadControlLimitDataElements: deleteElements,
}
}

if err := l.featureLocal.UpdateData(model.FunctionTypeLoadControlLimitListData, datalist, partial, delete); err != nil {
if err := l.featureLocal.UpdateData(model.FunctionTypeLoadControlLimitListData, datalist, partial, deleteFilter); err != nil {
return errors.New(err.String())
}

Expand Down
4 changes: 2 additions & 2 deletions features/server/loadcontrol_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@ func (s *LoadControlSuite) Test_GetLimitData() {
assert.Nil(s.T(), result)

data = model.LoadControlLimitDataType{}
delete := &model.LoadControlLimitDataElementsType{
deleteElements := &model.LoadControlLimitDataElementsType{
TimePeriod: &model.TimePeriodElementsType{},
}
err = s.sut.UpdateLimitDataForId(data, delete, *limitId)
err = s.sut.UpdateLimitDataForId(data, deleteElements, *limitId)
assert.Nil(s.T(), err)

result, err = s.sut.GetLimitDataForId(*limitId)
Expand Down
6 changes: 3 additions & 3 deletions features/server/measurement.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ func (m *Measurement) UpdateDataForFilter(
}

partial := model.NewFilterTypePartial()
var delete *model.FilterType
var deleteFilter *model.FilterType
if deleteElements != nil {
delete = &model.FilterType{
deleteFilter = &model.FilterType{
MeasurementListDataSelectors: &model.MeasurementListDataSelectorsType{
MeasurementId: description.MeasurementId,
},
MeasurementDataElements: deleteElements,
}
}

if err := m.featureLocal.UpdateData(model.FunctionTypeMeasurementListData, datalist, partial, delete); err != nil {
if err := m.featureLocal.UpdateData(model.FunctionTypeMeasurementListData, datalist, partial, deleteFilter); err != nil {
return errors.New(err.String())
}

Expand Down
4 changes: 2 additions & 2 deletions features/server/measurement_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ func (s *MeasurementSuite) Test_GetLimitData() {
assert.Nil(s.T(), result)

data = model.MeasurementDataType{}
delete := &model.MeasurementDataElementsType{
deleteElements := &model.MeasurementDataElementsType{
Value: util.Ptr(model.ElementTagType{}),
}
err = s.sut.UpdateDataForId(data, delete, *mId)
err = s.sut.UpdateDataForId(data, deleteElements, *mId)
assert.Nil(s.T(), err)

result, err = s.sut.GetDataForId(*mId)
Expand Down

0 comments on commit 6984057

Please sign in to comment.