Adds ability to validate oneof for space separated strings #541
Conversation
Fixes Or Enhances go-playground#525. **Make sure that you've checked the boxes below before you submit PR:** - [x] Tests exist or have been written that cover this particular change. Change Details: * Adds the ability to match on space separated strings when using the `oneof` validation. Space separted strings must be surrounded by single quotes to be validated as one string. For example: ``` oneof='Awaiting Verification' 'Verified' 'Failed Verification' ``` passes validation for a field that is exactly `Failed Verification` (though just `Failed` would...fail). @go-playground/admins
baked_in.go
Outdated
| @@ -177,7 +178,8 @@ func parseOneOfParam2(s string) []string { | |||
| oneofValsCacheRWLock.RUnlock() | |||
| if !ok { | |||
| oneofValsCacheRWLock.Lock() | |||
| vals = strings.Fields(s) | |||
| re := regexp.MustCompile(`'[^']*'|\S+`) | |||
There was a problem hiding this comment.
Can this be moved out out the hotpath? eg. a global variable 🙏
There was a problem hiding this comment.
Good idea, I will do that.
baked_in.go
Outdated
| @@ -213,7 +215,8 @@ func isOneOf(fl FieldLevel) bool { | |||
| panic(fmt.Sprintf("Bad field type %T", field.Interface())) | |||
| } | |||
| for i := 0; i < len(vals); i++ { | |||
| if vals[i] == v { | |||
| val := strings.Replace(vals[i], "'", "", -1) | |||
There was a problem hiding this comment.
instead of separating this logic from the parseOneOfParam2 function is it possible to do the replace before adding to the oneofValsCache cache, then the output of the function is constent and all other validations can benefit from the same changes 😄 eg. required_with*
There was a problem hiding this comment.
I'll give this a shot 👍
|
Thanks for taking a look @deankarn. I'll try to find time to address your comments in the coming week. |
JonathanWThom
force-pushed
the
jt/space-separated-oneof
branch
from
2ba4e5d
to
3b3263e
Compare
JonathanWThom
force-pushed
the
jt/space-separated-oneof
branch
from
3b3263e
to
685d3e2
Compare
|
I believe I've accommodated your feedback - let me know if there's anything else that could be improved. Thanks! |
|
Np I still have to cut a release, merging and porting some other things before cutting one also :) |
…rated-oneof Adds ability to validate oneof for space separated strings
Fixes Or Enhances #525.
Make sure that you've checked the boxes below before you submit PR:
Change Details:
oneofvalidation. Space separted strings must be surrounded by singlequotes to be validated as one string. For example:
passes validation for a field that is exactly
Failed Verification(though just
Failedwould...fail).@go-playground/admins