gorm model fixes
This commit is contained in:
@@ -13,7 +13,7 @@ type BankAccount struct {
|
|||||||
ID uint `gorm:"primaryKey"`
|
ID uint `gorm:"primaryKey"`
|
||||||
CreatedAt time.Time
|
CreatedAt time.Time
|
||||||
UpdatedAt 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"`
|
UserID uint `gorm:"index" json:"user_id"`
|
||||||
MandateDateSigned time.Time `json:"mandate_date_signed"`
|
MandateDateSigned time.Time `json:"mandate_date_signed"`
|
||||||
Bank string `json:"bank_name" binding:"safe_content"`
|
Bank string `json:"bank_name" binding:"safe_content"`
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ type Consent struct {
|
|||||||
Email string `json:"email" binding:"email,safe_content"`
|
Email string `json:"email" binding:"email,safe_content"`
|
||||||
ConsentType string `gorm:"not null" json:"consent_type" binding:"safe_content"`
|
ConsentType string `gorm:"not null" json:"consent_type" binding:"safe_content"`
|
||||||
UserID *uint `json:"user_id"`
|
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) {
|
func (c *Consent) BeforeSave(tx *gorm.DB) (err error) {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
type Membership struct {
|
type Membership struct {
|
||||||
ID uint `gorm:"primaryKey" json:"id"`
|
ID uint `gorm:"primaryKey" json:"id"`
|
||||||
UserID uint `gorm:"index" json:"user_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
|
CreatedAt time.Time
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
StartDate time.Time `json:"start_date"`
|
StartDate time.Time `json:"start_date"`
|
||||||
|
|||||||
@@ -72,12 +72,14 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e
|
|||||||
Token string
|
Token string
|
||||||
BASEURL string
|
BASEURL string
|
||||||
UserID uint
|
UserID uint
|
||||||
|
Logo string
|
||||||
}{
|
}{
|
||||||
FirstName: user.FirstName,
|
FirstName: user.FirstName,
|
||||||
LastName: user.LastName,
|
LastName: user.LastName,
|
||||||
Token: *token,
|
Token: *token,
|
||||||
BASEURL: config.Site.BaseURL,
|
BASEURL: config.Site.BaseURL,
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
|
Logo: config.Templates.LogoURI,
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Error.Printf("USERIID: %#v", user.ID)
|
logger.Error.Printf("USERIID: %#v", user.ID)
|
||||||
@@ -99,6 +101,7 @@ func (s *EmailService) SendGrantBackendAccessEmail(user *models.User, token *str
|
|||||||
BASEURL string
|
BASEURL string
|
||||||
FRONTEND_PATH string
|
FRONTEND_PATH string
|
||||||
UserID uint
|
UserID uint
|
||||||
|
Logo string
|
||||||
}{
|
}{
|
||||||
FirstName: user.FirstName,
|
FirstName: user.FirstName,
|
||||||
LastName: user.LastName,
|
LastName: user.LastName,
|
||||||
@@ -106,6 +109,7 @@ func (s *EmailService) SendGrantBackendAccessEmail(user *models.User, token *str
|
|||||||
FRONTEND_PATH: config.Site.FrontendPath,
|
FRONTEND_PATH: config.Site.FrontendPath,
|
||||||
BASEURL: config.Site.BaseURL,
|
BASEURL: config.Site.BaseURL,
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
|
Logo: config.Templates.LogoURI,
|
||||||
}
|
}
|
||||||
|
|
||||||
subject := constants.MailGrantBackendAccessSubject
|
subject := constants.MailGrantBackendAccessSubject
|
||||||
@@ -131,6 +135,7 @@ func (s *EmailService) SendChangePasswordEmail(user *models.User, token *string)
|
|||||||
BASEURL string
|
BASEURL string
|
||||||
FRONTEND_PATH string
|
FRONTEND_PATH string
|
||||||
UserID uint
|
UserID uint
|
||||||
|
Logo string
|
||||||
}{
|
}{
|
||||||
FirstName: user.FirstName,
|
FirstName: user.FirstName,
|
||||||
LastName: user.LastName,
|
LastName: user.LastName,
|
||||||
@@ -138,6 +143,7 @@ func (s *EmailService) SendChangePasswordEmail(user *models.User, token *string)
|
|||||||
FRONTEND_PATH: config.Site.FrontendPath,
|
FRONTEND_PATH: config.Site.FrontendPath,
|
||||||
BASEURL: config.Site.BaseURL,
|
BASEURL: config.Site.BaseURL,
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
|
Logo: config.Templates.LogoURI,
|
||||||
}
|
}
|
||||||
|
|
||||||
subject := constants.MailChangePasswordSubject
|
subject := constants.MailChangePasswordSubject
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package validation
|
package validation
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"GoMembership/internal/models"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin/binding"
|
"github.com/gin-gonic/gin/binding"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
|
||||||
@@ -15,7 +13,7 @@ func SetupValidators(db *gorm.DB) {
|
|||||||
v.RegisterValidation("safe_content", ValidateSafeContent)
|
v.RegisterValidation("safe_content", ValidateSafeContent)
|
||||||
|
|
||||||
// Register struct-level validations
|
// Register struct-level validations
|
||||||
v.RegisterStructValidation(ValidateUserFactory(db), models.User{})
|
// v.RegisterStructValidation(ValidateUserFactory(db), models.User{})
|
||||||
v.RegisterStructValidation(ValidateSubscription, models.Subscription{})
|
// v.RegisterStructValidation(ValidateSubscription, models.Subscription{})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user