From cd495584b0e03314da15922579c5839ac404d34c Mon Sep 17 00:00:00 2001 From: Alex <$(pass /github/email)> Date: Sat, 15 Mar 2025 00:13:23 +0100 Subject: [PATCH] model work --- go-backend/internal/models/bank_account.go | 8 ++++---- go-backend/internal/models/subscription_model.go | 10 +++++----- go-backend/internal/models/user.go | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go-backend/internal/models/bank_account.go b/go-backend/internal/models/bank_account.go index 24996e9..3f6ab37 100644 --- a/go-backend/internal/models/bank_account.go +++ b/go-backend/internal/models/bank_account.go @@ -3,13 +3,13 @@ package models import "time" type BankAccount struct { + ID uint `gorm:"primaryKey"` CreatedAt time.Time UpdatedAt time.Time MandateDateSigned time.Time `gorm:"not null" json:"mandate_date_signed"` Bank string `json:"bank_name" binding:"safe_content"` AccountHolderName string `json:"account_holder_name" binding:"safe_content"` - IBAN string `json:"iban"` - BIC string `json:"bic"` - MandateReference string `gorm:"not null" json:"mandate_reference"` - ID uint `gorm:"primaryKey"` + IBAN string `json:"iban" binding:"safe_content"` + BIC string `json:"bic" binding:"safe_content"` + MandateReference string `gorm:"not null" json:"mandate_reference" binding:"safe_content"` } diff --git a/go-backend/internal/models/subscription_model.go b/go-backend/internal/models/subscription_model.go index df0d289..751496a 100644 --- a/go-backend/internal/models/subscription_model.go +++ b/go-backend/internal/models/subscription_model.go @@ -5,13 +5,13 @@ import ( ) type SubscriptionModel struct { + ID uint `json:"id" gorm:"primaryKey"` CreatedAt time.Time UpdatedAt time.Time - Name string `gorm:"unique" json:"name" binding:"required"` - Details string `json:"details"` - Conditions string `json:"conditions"` - RequiredMembershipField string `json:"required_membership_field"` - ID uint `json:"id" gorm:"primaryKey"` + Name string `gorm:"uniqueIndex:idx_subscriptions_name" json:"name" binding:"required,safe_content"` + Details string `json:"details" binding:"safe_content"` + Conditions string `json:"conditions" binding:"safe_content"` + RequiredMembershipField string `json:"required_membership_field" binding:"safe_content"` MonthlyFee float32 `json:"monthly_fee"` HourlyRate float32 `json:"hourly_rate"` IncludedPerYear int16 `json:"included_hours_per_year"` diff --git a/go-backend/internal/models/user.go b/go-backend/internal/models/user.go index c4130c1..49974c3 100644 --- a/go-backend/internal/models/user.go +++ b/go-backend/internal/models/user.go @@ -21,26 +21,26 @@ type User struct { ID uint `gorm:"primarykey" json:"id"` CreatedAt time.Time UpdatedAt time.Time - DeletedAt *time.Time `gorm:"index"` + DeletedAt *time.Time DateOfBirth time.Time `gorm:"not null" json:"dateofbirth" binding:"required_unless=RoleID 0,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:"safe_content"` - Email string `gorm:"unique;not null" json:"email" binding:"required,email,safe_content"` + Email string `gorm:"uniqueIndex:idx_users_email,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"` + BankAccount BankAccount `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE" json:"bank_account"` BankAccountID uint - Verifications *[]Verification `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;"` - Membership Membership `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"membership"` + Verifications *[]Verification `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"` + Membership Membership `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE" json:"membership"` MembershipID uint - Licence *Licence `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"licence"` + Licence *Licence `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE" json:"licence"` LicenceID uint PaymentStatus int8 `json:"payment_status"` Status int8 `json:"status"`