diff --git a/go-backend/internal/models/bank_account.go b/go-backend/internal/models/bank_account.go index 2ad00c0..48458d4 100644 --- a/go-backend/internal/models/bank_account.go +++ b/go-backend/internal/models/bank_account.go @@ -13,7 +13,7 @@ type BankAccount struct { ID uint `gorm:"primaryKey"` CreatedAt time.Time UpdatedAt time.Time - User User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"` + User User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE" json:"-" binding:"-"` UserID uint `gorm:"index" json:"user_id"` MandateDateSigned time.Time `json:"mandate_date_signed"` Bank string `json:"bank_name" binding:"safe_content"` diff --git a/go-backend/internal/models/consents.go b/go-backend/internal/models/consents.go index 15041c3..bc42409 100644 --- a/go-backend/internal/models/consents.go +++ b/go-backend/internal/models/consents.go @@ -17,7 +17,7 @@ type Consent struct { Email string `json:"email" binding:"email,safe_content"` ConsentType string `gorm:"not null" json:"consent_type" binding:"safe_content"` UserID *uint `json:"user_id"` - User *User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:SET NULL;"` + User *User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:SET NULL;" json:"-" binding:"-"` } func (c *Consent) BeforeSave(tx *gorm.DB) (err error) { diff --git a/go-backend/internal/models/membership.go b/go-backend/internal/models/membership.go index 9b56031..17712bd 100644 --- a/go-backend/internal/models/membership.go +++ b/go-backend/internal/models/membership.go @@ -10,7 +10,7 @@ import ( type Membership struct { ID uint `gorm:"primaryKey" json:"id"` UserID uint `gorm:"index" json:"user_id"` - User User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"` + User User `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE" json:"-" binding:"-"` CreatedAt time.Time UpdatedAt time.Time StartDate time.Time `json:"start_date"` diff --git a/go-backend/internal/services/email_service.go b/go-backend/internal/services/email_service.go index 887e630..b431b94 100644 --- a/go-backend/internal/services/email_service.go +++ b/go-backend/internal/services/email_service.go @@ -72,12 +72,14 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e Token string BASEURL string UserID uint + Logo string }{ FirstName: user.FirstName, LastName: user.LastName, Token: *token, BASEURL: config.Site.BaseURL, UserID: user.ID, + Logo: config.Templates.LogoURI, } logger.Error.Printf("USERIID: %#v", user.ID) @@ -99,6 +101,7 @@ func (s *EmailService) SendGrantBackendAccessEmail(user *models.User, token *str BASEURL string FRONTEND_PATH string UserID uint + Logo string }{ FirstName: user.FirstName, LastName: user.LastName, @@ -106,6 +109,7 @@ func (s *EmailService) SendGrantBackendAccessEmail(user *models.User, token *str FRONTEND_PATH: config.Site.FrontendPath, BASEURL: config.Site.BaseURL, UserID: user.ID, + Logo: config.Templates.LogoURI, } subject := constants.MailGrantBackendAccessSubject @@ -131,6 +135,7 @@ func (s *EmailService) SendChangePasswordEmail(user *models.User, token *string) BASEURL string FRONTEND_PATH string UserID uint + Logo string }{ FirstName: user.FirstName, LastName: user.LastName, @@ -138,6 +143,7 @@ func (s *EmailService) SendChangePasswordEmail(user *models.User, token *string) FRONTEND_PATH: config.Site.FrontendPath, BASEURL: config.Site.BaseURL, UserID: user.ID, + Logo: config.Templates.LogoURI, } subject := constants.MailChangePasswordSubject diff --git a/go-backend/internal/validation/setup.go b/go-backend/internal/validation/setup.go index f005ed8..51ffcf8 100644 --- a/go-backend/internal/validation/setup.go +++ b/go-backend/internal/validation/setup.go @@ -1,8 +1,6 @@ package validation import ( - "GoMembership/internal/models" - "github.com/gin-gonic/gin/binding" "gorm.io/gorm" @@ -15,7 +13,7 @@ func SetupValidators(db *gorm.DB) { v.RegisterValidation("safe_content", ValidateSafeContent) // Register struct-level validations - v.RegisterStructValidation(ValidateUserFactory(db), models.User{}) - v.RegisterStructValidation(ValidateSubscription, models.Subscription{}) + // v.RegisterStructValidation(ValidateUserFactory(db), models.User{}) + // v.RegisterStructValidation(ValidateSubscription, models.Subscription{}) } }