From e8700af85f8f74d784f7d6327b93316517e7a7ab Mon Sep 17 00:00:00 2001 From: Sourav Bhowmik Date: Mon, 28 Oct 2024 12:48:40 +0100 Subject: [PATCH] feat: added user json as createdBy field in getLicense --- pkg/api/licenses.go | 2 +- pkg/models/types.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/api/licenses.go b/pkg/api/licenses.go index 8260528..3e84f87 100644 --- a/pkg/api/licenses.go +++ b/pkg/api/licenses.go @@ -85,7 +85,7 @@ func FilterLicense(c *gin.Context) { } var licenses []models.LicenseDB - query := db.DB.Model(&licenses) + query := db.DB.Model(&licenses).Preload("User") if active != "" { parsedActive, err := strconv.ParseBool(active) diff --git a/pkg/models/types.go b/pkg/models/types.go index 0b03331..ef63f1d 100644 --- a/pkg/models/types.go +++ b/pkg/models/types.go @@ -47,6 +47,8 @@ type LicenseDB struct { Marydone *bool `json:"marydone" gorm:"column:marydone;not null;default:false"` ExternalRef datatypes.JSONType[LicenseDBSchemaExtension] `json:"external_ref"` Obligations []*Obligation `gorm:"many2many:obligation_licenses;" json:"obligations"` + UserId int64 `json:"-" example:"123"` // Foreign key to User + User User `gorm:"foreignKey:UserId;references:Id" json:"user"` // Reference to User } func (l *LicenseDB) BeforeSave(tx *gorm.DB) (err error) { @@ -99,6 +101,8 @@ type LicenseUpdateJSONSchema struct { Marydone *bool `json:"marydone" example:"false"` ExternalRef datatypes.JSONType[LicenseDBSchemaExtension] `json:"external_ref"` Obligations []*Obligation `json:"obligations"` + UserId int64 `json:"-" example:"123"` // Foreign key to User + User User `json:"-"` // Reference to User } // UpdateExternalRefsJSONPayload struct represents the external ref key value pairs for update