add checkbox styling, driverslicence handling and validation
This commit is contained in:
@@ -35,6 +35,7 @@ type UserService struct {
|
||||
func (service *UserService) UpdateUser(user *models.User, userRole int8) (*models.User, error) {
|
||||
|
||||
if err := validateUserData(user, userRole); err != nil {
|
||||
logger.Info.Printf("UPDATING user: %#v", user)
|
||||
logger.Error.Printf("Failed to validate user data: %v", err)
|
||||
return nil, errors.ErrInvalidUserData
|
||||
}
|
||||
@@ -44,6 +45,10 @@ func (service *UserService) UpdateUser(user *models.User, userRole int8) (*model
|
||||
}
|
||||
|
||||
user.UpdatedAt = time.Now()
|
||||
if user.DriversLicence.Status == 0 {
|
||||
// This is a new drivers licence
|
||||
user.DriversLicence.Status = constants.UnverifiedStatus
|
||||
}
|
||||
|
||||
updatedUser, err := service.Repo.UpdateUser(user)
|
||||
|
||||
@@ -71,6 +76,7 @@ func (service *UserService) RegisterUser(user *models.User) (uint, string, error
|
||||
user.CreatedAt = time.Now()
|
||||
user.UpdatedAt = time.Now()
|
||||
user.PaymentStatus = constants.AwaitingPaymentStatus
|
||||
// user.DriversLicence.Status = constants.UnverifiedStatus
|
||||
user.BankAccount.MandateDateSigned = time.Now()
|
||||
id, err := service.Repo.CreateUser(user)
|
||||
|
||||
@@ -162,13 +168,14 @@ func validateUserData(user *models.User, userRole int8) error {
|
||||
validate.RegisterValidation("bic", utils.ValidateToTrue)
|
||||
validate.RegisterValidation("subscriptionModel", utils.ValidateToTrue)
|
||||
validate.RegisterValidation("iban", utils.ValidateToTrue)
|
||||
|
||||
validate.RegisterValidation("euDriversLicence", utils.ValidateToTrue)
|
||||
} else {
|
||||
validate.RegisterValidation("membershipField", utils.ValidateRequiredMembershipField)
|
||||
validate.RegisterValidation("age", utils.AgeValidator)
|
||||
validate.RegisterValidation("bic", utils.BICValidator)
|
||||
validate.RegisterValidation("subscriptionModel", utils.SubscriptionModelValidator)
|
||||
validate.RegisterValidation("iban", utils.IBANValidator)
|
||||
validate.RegisterValidation("euDriversLicence", utils.ValidateDriversLicence)
|
||||
}
|
||||
return validate.Struct(user)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user