add & moved to validations folder; del validator/v10
This commit is contained in:
@@ -1,15 +1,10 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/go-playground/validator/v10"
|
||||
|
||||
"GoMembership/internal/models"
|
||||
"GoMembership/internal/repositories"
|
||||
"GoMembership/internal/utils"
|
||||
"GoMembership/pkg/errors"
|
||||
)
|
||||
|
||||
type MembershipServiceInterface interface {
|
||||
@@ -37,9 +32,6 @@ func (service *MembershipService) FindMembershipByUserID(userID uint) (*models.M
|
||||
|
||||
// Membership_Subscriptions
|
||||
func (service *MembershipService) RegisterSubscription(subscription *models.SubscriptionModel) (uint, error) {
|
||||
if err := validateSubscriptionData(subscription); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return service.SubscriptionRepo.CreateSubscriptionModel(subscription)
|
||||
}
|
||||
|
||||
@@ -48,15 +40,7 @@ func (service *MembershipService) GetMembershipModelNames() ([]string, error) {
|
||||
}
|
||||
|
||||
func (service *MembershipService) GetModelByName(modelname *string) (*models.SubscriptionModel, error) {
|
||||
sModelNames, err := service.SubscriptionRepo.GetMembershipModelNames()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if !slices.Contains(sModelNames, *modelname) {
|
||||
return nil, errors.ErrNotFound
|
||||
}
|
||||
return service.SubscriptionRepo.GetModelByName(modelname)
|
||||
return repositories.GetModelByName(modelname)
|
||||
}
|
||||
|
||||
func (service *MembershipService) GetSubscriptions(where map[string]interface{}) (*[]models.SubscriptionModel, error) {
|
||||
@@ -65,12 +49,3 @@ func (service *MembershipService) GetSubscriptions(where map[string]interface{})
|
||||
}
|
||||
return service.SubscriptionRepo.GetSubscriptions(where)
|
||||
}
|
||||
|
||||
func validateSubscriptionData(subscription *models.SubscriptionModel) error {
|
||||
validate := validator.New()
|
||||
// subscriptionModel and membershipField don't have to be evaluated if adding a new subscription
|
||||
validate.RegisterValidation("subscriptionModel", func(fl validator.FieldLevel) bool { return true })
|
||||
validate.RegisterValidation("membershipField", func(fl validator.FieldLevel) bool { return true })
|
||||
validate.RegisterValidation("safe_content", utils.ValidateSafeContent)
|
||||
return validate.Struct(subscription)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user