diff --git a/internal/models/bank_account.go b/internal/models/bank_account.go index 671c9f4..7a75517 100644 --- a/internal/models/bank_account.go +++ b/internal/models/bank_account.go @@ -6,10 +6,10 @@ type BankAccount struct { CreatedAt time.Time UpdatedAt time.Time MandateDateSigned time.Time `gorm:"not null" json:"mandate_date_signed"` - Bank string `json:"bank_name" validate:"omitempty,alphanumunicode,safe_content"` - AccountHolderName string `json:"account_holder_name" validate:"omitempty,alphaunicode,safe_content"` - IBAN string `gorm:"not null" json:"iban" validate:"iban"` - BIC string `json:"bic" validate:"omitempty,bic"` + Bank string `json:"bank_name" binding:"omitempty,alphanumunicode,safe_content"` + AccountHolderName string `json:"account_holder_name" binding:"omitempty,alphaunicode,safe_content"` + IBAN string `gorm:"not null" json:"iban" binding:"iban"` + BIC string `json:"bic" binding:"omitempty,bic"` MandateReference string `gorm:"not null" json:"mandate_reference"` ID uint `gorm:"primaryKey"` } diff --git a/internal/models/consents.go b/internal/models/consents.go index 1576c68..0712ea6 100644 --- a/internal/models/consents.go +++ b/internal/models/consents.go @@ -7,10 +7,10 @@ import ( type Consent struct { CreatedAt time.Time UpdatedAt time.Time - FirstName string `gorm:"not null" json:"first_name" validate:"safe_content"` - LastName string `gorm:"not null" json:"last_name" validate:"safe_content"` - Email string `json:"email" validate:"email,safe_content"` - ConsentType string `gorm:"not null" json:"consent_type" validate:"safe_content"` + FirstName string `gorm:"not null" json:"first_name" binding:"safe_content"` + LastName string `gorm:"not null" json:"last_name" binding:"safe_content"` + Email string `json:"email" binding:"email,safe_content"` + ConsentType string `gorm:"not null" json:"consent_type" binding:"safe_content"` ID uint `gorm:"primaryKey"` User User UserID uint diff --git a/internal/models/drivers_licence.go b/internal/models/drivers_licence.go index 47b82c2..a6d6581 100644 --- a/internal/models/drivers_licence.go +++ b/internal/models/drivers_licence.go @@ -6,15 +6,15 @@ import ( type DriversLicence struct { ID uint `json:"id" gorm:"primaryKey"` - Status int8 `json:"status" validate:"omitempty,number"` - LicenceNumber string `json:"number" validate:"omitempty,euDriversLicence,safe_content"` - IssuedDate time.Time `json:"issued_date" validate:"omitempty,lte"` - ExpirationDate time.Time `json:"expiration_date" validate:"omitempty,gt"` - IssuingCountry string `json:"country" validate:"safe_content"` + Status int8 `json:"status" binding:"omitempty,number"` + LicenceNumber string `json:"number" binding:"omitempty,euDriversLicence,safe_content"` + IssuedDate time.Time `json:"issued_date" binding:"omitempty,lte"` + ExpirationDate time.Time `json:"expiration_date" binding:"omitempty,gt"` + IssuingCountry string `json:"country" binding:"safe_content"` LicenceCategories []LicenceCategory `json:"licence_categories" gorm:"many2many:licence_2_categories"` } type LicenceCategory struct { ID uint `json:"id" gorm:"primaryKey"` - Category string `json:"category" validate:"safe_content"` + Category string `json:"category" binding:"safe_content"` } diff --git a/internal/models/membership.go b/internal/models/membership.go index 8eaa4c5..2e02d2e 100644 --- a/internal/models/membership.go +++ b/internal/models/membership.go @@ -7,9 +7,9 @@ type Membership struct { UpdatedAt time.Time StartDate time.Time `json:"start_date"` EndDate time.Time `json:"end_date"` - Status int8 `json:"status" validate:"safe_content"` + Status int8 `json:"status" binding:"number,safe_content"` SubscriptionModel SubscriptionModel `gorm:"foreignKey:SubscriptionModelID" json:"subscription_model"` SubscriptionModelID uint `json:"subsription_model_id"` - ParentMembershipID uint `json:"parent_member_id" validate:"omitempty,omitnil,number"` + ParentMembershipID uint `json:"parent_member_id" binding:"omitempty,omitnil,number"` ID uint `json:"id"` } diff --git a/internal/models/subscription_model.go b/internal/models/subscription_model.go index a65842a..df0d289 100644 --- a/internal/models/subscription_model.go +++ b/internal/models/subscription_model.go @@ -7,13 +7,13 @@ import ( type SubscriptionModel struct { CreatedAt time.Time UpdatedAt time.Time - Name string `gorm:"unique" json:"name" validate:"required,subscriptionModel,safe_content"` - Details string `json:"details" validate:"required"` + Name string `gorm:"unique" json:"name" binding:"required"` + Details string `json:"details"` Conditions string `json:"conditions"` - RequiredMembershipField string `json:"required_membership_field" validate:"membershipField"` + RequiredMembershipField string `json:"required_membership_field"` ID uint `json:"id" gorm:"primaryKey"` - MonthlyFee float32 `json:"monthly_fee" validate:"number,gte=0"` - HourlyRate float32 `json:"hourly_rate" validate:"number,gte=0"` - IncludedPerYear int16 `json:"included_hours_per_year" validate:"omitempty,number,gte=0"` - IncludedPerMonth int16 `json:"included_hours_per_month" validate:"omitempty,number,gte=0"` + MonthlyFee float32 `json:"monthly_fee"` + HourlyRate float32 `json:"hourly_rate"` + IncludedPerYear int16 `json:"included_hours_per_year"` + IncludedPerMonth int16 `json:"included_hours_per_month"` } diff --git a/internal/models/user.go b/internal/models/user.go index 45a38b1..367204c 100644 --- a/internal/models/user.go +++ b/internal/models/user.go @@ -10,18 +10,18 @@ import ( type User struct { gorm.Model - DateOfBirth time.Time `gorm:"not null" json:"date_of_birth" validate:"required,age"` - Company string `json:"company" validate:"omitempty,omitnil,safe_content"` - Phone string `json:"phone" validate:"omitempty,omitnil,safe_content"` - Notes string `json:"notes" validate:"safe_content"` - FirstName string `gorm:"not null" json:"first_name" validate:"required,safe_content"` - Password string `json:"password" validate:"required_unless=RoleID 0,safe_content"` - Email string `gorm:"unique;not null" json:"email" validate:"required,email,safe_content"` - LastName string `gorm:"not null" json:"last_name" validate:"required,safe_content"` - ProfilePicture string `json:"profile_picture" validate:"omitempty,omitnil,image,safe_content"` - Address string `gorm:"not null" json:"address" validate:"required,safe_content"` - ZipCode string `gorm:"not null" json:"zip_code" validate:"required,alphanum,safe_content"` - City string `form:"not null" json:"city" validate:"required,alphaunicode,safe_content"` + DateOfBirth time.Time `gorm:"not null" json:"date_of_birth" binding:"required,safe_content"` + Company string `json:"company" binding:"omitempty,omitnil,safe_content"` + Phone string `json:"phone" binding:"omitempty,omitnil,safe_content"` + Notes string `json:"notes" binding:"safe_content"` + FirstName string `gorm:"not null" json:"first_name" binding:"required,safe_content"` + Password string `json:"password" binding:"required_unless=RoleID 0,safe_content"` + Email string `gorm:"unique;not null" json:"email" binding:"required,email,safe_content"` + LastName string `gorm:"not null" json:"last_name" binding:"required,safe_content"` + ProfilePicture string `json:"profile_picture" binding:"omitempty,omitnil,image,safe_content"` + Address string `gorm:"not null" json:"address" binding:"required,safe_content"` + ZipCode string `gorm:"not null" json:"zip_code" binding:"required,alphanum,safe_content"` + City string `form:"not null" json:"city" binding:"required,alphaunicode,safe_content"` Consents []Consent `gorm:"constraint:OnUpdate:CASCADE"` BankAccount BankAccount `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"bank_account"` BankAccountID uint