wip
This commit is contained in:
@@ -74,15 +74,13 @@ func (s *UserService) Update(user *models.User) (*models.User, error) {
|
||||
}
|
||||
user.BankAccount.ID = existingUser.BankAccount.ID
|
||||
|
||||
user.SetPassword(user.Password)
|
||||
|
||||
// Validate subscription model
|
||||
selectedModel, err := repositories.GetSubscriptionByName(&user.Membership.SubscriptionModel.Name)
|
||||
selectedModel, err := repositories.GetSubscriptionByName(&user.Membership.Subscription.Name)
|
||||
if err != nil {
|
||||
return nil, errors.ErrSubscriptionNotFound
|
||||
}
|
||||
user.Membership.SubscriptionModel = *selectedModel
|
||||
user.Membership.SubscriptionModelID = selectedModel.ID
|
||||
user.Membership.Subscription = *selectedModel
|
||||
user.Membership.SubscriptionID = selectedModel.ID
|
||||
|
||||
if err := user.Update(s.DB); err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
@@ -97,14 +95,13 @@ func (s *UserService) Update(user *models.User) (*models.User, error) {
|
||||
}
|
||||
|
||||
func (s *UserService) Register(user *models.User) (id uint, token string, err error) {
|
||||
user.SetPassword(user.Password)
|
||||
|
||||
selectedModel, err := repositories.GetSubscriptionByName(&user.Membership.SubscriptionModel.Name)
|
||||
selectedModel, err := repositories.GetSubscriptionByName(&user.Membership.Subscription.Name)
|
||||
if err != nil {
|
||||
return 0, "", errors.ErrSubscriptionNotFound
|
||||
}
|
||||
user.Membership.SubscriptionModel = *selectedModel
|
||||
user.Membership.SubscriptionModelID = selectedModel.ID
|
||||
user.Membership.Subscription = *selectedModel
|
||||
user.Membership.SubscriptionID = selectedModel.ID
|
||||
user.Status = constants.UnverifiedStatus
|
||||
user.BankAccount.MandateDateSigned = time.Now()
|
||||
v, err := user.SetVerification(constants.VerificationTypes.Email)
|
||||
|
||||
Reference in New Issue
Block a user