sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Nil validation on ListSettingsValues request

Browse Source 
That validation was just wrong. It enforced identifier values to be
empty.
This commit is contained in:
Benedikt Kulmann
2020-06-03 15:24:39 +02:00
parent aae6356138
commit 6baabf2148
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/assets/embed.go
+2 -2
View File
@@ -1,5 +1,5 @@
// Code generated by fileb0x at "2020-05-18 11:04:02.579403 +0200 CEST m=+0.032731659" from config file "embed.yml" DO NOT EDIT.
// modification hash(8cc9a42d333f443b4cd19fc245770308.8058aec596c5fb73022d09bb97af796e)
// Code generated by fileb0x at "2020-06-03 13:34:57.567257 +0200 CEST m=+0.040129778" from config file "embed.yml" DO NOT EDIT.
// modification hash(65d24f2e8af3a68b0d8a76c191429e1f.8058aec596c5fb73022d09bb97af796e)
package assets
pkg/service/v0/validator.go
+4 -2
View File
@@ -1,6 +1,7 @@
package svc
import (
"fmt"
"regexp"
validation "github.com/go-ozzo/ozzo-validation/v4"
@@ -55,13 +56,14 @@ func validateGetSettingsValue(req *proto.GetSettingsValueRequest) error {
}
func validateListSettingsValues(req *proto.ListSettingsValuesRequest) error {
fmt.Println(req.Identifier)
return validation.ValidateStruct(
req.Identifier,
validation.Field(&req.Identifier.AccountUuid, is.UUID),
validation.Field(&req.Identifier.Extension, validation.Match(regexForKeys)),
validation.Field(&req.Identifier.Extension, validation.When(req.Identifier.BundleKey != "", validation.Required).Else(validation.Nil)),
validation.Field(&req.Identifier.Extension, validation.When(req.Identifier.BundleKey != "", validation.Required)),
validation.Field(&req.Identifier.BundleKey, validation.Match(regexForKeys)),
validation.Field(&req.Identifier.BundleKey, validation.When(req.Identifier.SettingKey != "", validation.Required).Else(validation.Nil)),
validation.Field(&req.Identifier.BundleKey, validation.When(req.Identifier.SettingKey != "", validation.Required)),
validation.Field(&req.Identifier.SettingKey, validation.Match(regexForKeys)),
)
}