Alex/GoMembership
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

removed e164 phone validation

Browse Source
This commit is contained in:
$(pass /github/name)
2024-07-13 00:48:23 +02:00
parent ac037b12e0
commit 05745ec831
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/models/user.go
View File

@@ -11,7 +11,7 @@ type User struct {
DateOfBirth time.Time `gorm:"not null" json:"date_of_birth" validate:"required,age"` DateOfBirth time.Time `gorm:"not null" json:"date_of_birth" validate:"required,age"`
CreatedAt time.Time CreatedAt time.Time
Salt *string `json:"-"` Salt *string `json:"-"`
Phone string `json:"phone" validate:"omitempty,omitnil,e164"` Phone string `json:"phone" validate:"omitempty,omitnil"`
Notes *string `json:"notes"` Notes *string `json:"notes"`
FirstName string `gorm:"not null" json:"first_name" validate:"required,alphaunicode"` FirstName string `gorm:"not null" json:"first_name" validate:"required,alphaunicode"`
Password string `json:"password"` Password string `json:"password"`

12
internal/utils/validators.go
View File

@@ -3,7 +3,6 @@ package utils
// import "regexp" // import "regexp"
import ( import (
// "reflect"
"GoMembership/internal/database" "GoMembership/internal/database"
"GoMembership/internal/models" "GoMembership/internal/models"
"GoMembership/pkg/logger" "GoMembership/pkg/logger"
@@ -69,16 +68,22 @@ func ValidateRequiredMembershipField(fl validator.FieldLevel) bool {
// Get the value of the field specified by RequiredMembershipField // Get the value of the field specified by RequiredMembershipField
fieldValue := reflect.ValueOf(membership).FieldByName(fieldName) fieldValue := reflect.ValueOf(membership).FieldByName(fieldName)
logger.Info.Printf("Starting fieldValue Validation for %v: %#v", fieldName, fieldValue)
// Check if the fieldValue is valid // Check if the fieldValue is valid
if !fieldValue.IsValid() { if !fieldValue.IsValid() {
return false return false
} }
logger.Info.Printf("fieldValue is valid: %#v", fieldValue)
// Check if the fieldValue is a nil pointer // Check if the fieldValue is a nil pointer
if fieldValue.Kind() == reflect.Ptr && fieldValue.IsNil() { if fieldValue.Kind() == reflect.Ptr && fieldValue.IsNil() {
return false return false
} }
logger.Info.Println("fieldValue is not a nil pointer")
// Ensure that the fieldValue is an int64 // Ensure that the fieldValue is an int64
var fieldInt64 int64 var fieldInt64 int64
if fieldValue.Kind() == reflect.Int64 { if fieldValue.Kind() == reflect.Int64 {
@@ -86,12 +91,17 @@ func ValidateRequiredMembershipField(fl validator.FieldLevel) bool {
} else { } else {
return false return false
} }
logger.Info.Println("fieldValue is a int")
var membershipIDs []int64 var membershipIDs []int64
if err := database.DB.Model(&models.Membership{}).Pluck("id", &membershipIDs).Error; err != nil { if err := database.DB.Model(&models.Membership{}).Pluck("id", &membershipIDs).Error; err != nil {
logger.Error.Fatalf("Couldn't get SubscriptionModel names: %#v", err) logger.Error.Fatalf("Couldn't get SubscriptionModel names: %#v", err)
return false return false
} }
logger.Info.Printf("found ids of members: %#v", membershipIDs)
// logger.Info.Printf("FIELD_NAME: %#v\nVALUE: %#v", fieldName, fieldValue) // logger.Info.Printf("FIELD_NAME: %#v\nVALUE: %#v", fieldName, fieldValue)
// Check if the field value is zero (empty) // Check if the field value is zero (empty)
return slices.Contains(membershipIDs, fieldInt64) return slices.Contains(membershipIDs, fieldInt64)