From 3f073adb76347407d6317fb36ac07d74551812eb Mon Sep 17 00:00:00 2001 From: Aldino Kemal Date: Thu, 10 Feb 2022 12:01:37 +0700 Subject: [PATCH] fix: move user validation code --- validations/send_validation.go | 25 +------------------------ validations/user_validation.go | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 validations/user_validation.go diff --git a/validations/send_validation.go b/validations/send_validation.go index 271ed09..33d6d68 100644 --- a/validations/send_validation.go +++ b/validations/send_validation.go @@ -3,34 +3,11 @@ package validations import ( "github.com/aldinokemal/go-whatsapp-web-multidevice/structs" "github.com/aldinokemal/go-whatsapp-web-multidevice/utils" - "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/go-ozzo/ozzo-validation/v4/is" "strings" ) -func ValidateUserInfo(request structs.UserInfoRequest) { - err := validation.ValidateStruct(&request, - validation.Field(&request.PhoneNumber, validation.Required, is.E164, validation.Length(10, 15)), - ) - - if err != nil { - panic(utils.ValidationError{ - Message: err.Error(), - }) - } -} -func ValidateUserAvatar(request structs.UserAvatarRequest) { - err := validation.ValidateStruct(&request, - validation.Field(&request.PhoneNumber, validation.Required, is.E164, validation.Length(10, 15)), - ) - - if err != nil { - panic(utils.ValidationError{ - Message: err.Error(), - }) - } -} - func ValidateSendMessage(request structs.SendMessageRequest) { err := validation.ValidateStruct(&request, validation.Field(&request.PhoneNumber, validation.Required, is.E164, validation.Length(10, 15)), diff --git a/validations/user_validation.go b/validations/user_validation.go new file mode 100644 index 0000000..cdbe067 --- /dev/null +++ b/validations/user_validation.go @@ -0,0 +1,31 @@ +package validations + +import ( + "github.com/aldinokemal/go-whatsapp-web-multidevice/structs" + "github.com/aldinokemal/go-whatsapp-web-multidevice/utils" + validation "github.com/go-ozzo/ozzo-validation/v4" + "github.com/go-ozzo/ozzo-validation/v4/is" +) + +func ValidateUserInfo(request structs.UserInfoRequest) { + err := validation.ValidateStruct(&request, + validation.Field(&request.PhoneNumber, validation.Required, is.E164, validation.Length(10, 15)), + ) + + if err != nil { + panic(utils.ValidationError{ + Message: err.Error(), + }) + } +} +func ValidateUserAvatar(request structs.UserAvatarRequest) { + err := validation.ValidateStruct(&request, + validation.Field(&request.PhoneNumber, validation.Required, is.E164, validation.Length(10, 15)), + ) + + if err != nil { + panic(utils.ValidationError{ + Message: err.Error(), + }) + } +}