RHINENG-22325: use only necessary subset of Template attributes for Inventory Views

Author: MichaelMraka

base/database/testing.go

@@ -400,8 +400,12 @@ func DeleteSystem(t *testing.T, inventoryID string) {
 
 func CreateTemplate(t *testing.T, account int, uuid string, inventoryIDs []string) {
 	template := &models.Template{
-		RhAccountID: account, UUID: uuid, Name: uuid, EnvironmentID: strings.ReplaceAll(uuid, "-", ""),
-		Arch: "x86_64", Version: "8",
+		TemplateBase: models.TemplateBase{
+			RhAccountID: account, UUID: uuid, Name: uuid,
+		},
+		EnvironmentID: strings.ReplaceAll(uuid, "-", ""),
+		Arch:          "x86_64",
+		Version:       "8",
 	}
 
 	tx := DB.Begin()

base/inventory_views/inventory_views.go

@@ -35,7 +35,7 @@ type InventoryViewsEvent struct {
 	Hosts     []InventoryViewsHost `json:"hosts"`
 }
 
-func MakeInventoryViewsHosts(systems []*models.SystemPlatform, templates map[int64]models.Template) (
+func MakeInventoryViewsHosts(systems []*models.SystemPlatform, templates map[int64]models.TemplateBase) (
 	[]InventoryViewsHost, error) {
 	hosts := make([]InventoryViewsHost, len(systems))
 	for i, system := range systems {
@@ -69,7 +69,7 @@ func MakeInventoryViewsHosts(systems []*models.SystemPlatform, templates map[int
 	return hosts, nil
 }
 
-func FindSystemsTemplates(tx *gorm.DB, systems []*models.SystemPlatform) (map[int64]models.Template, error) {
+func FindSystemsTemplates(tx *gorm.DB, systems []*models.SystemPlatform) (map[int64]models.TemplateBase, error) {
 	templateIDs := make([]int64, 0, len(systems))
 	for _, system := range systems {
 		if system.TemplateID == nil {
@@ -78,14 +78,15 @@ func FindSystemsTemplates(tx *gorm.DB, systems []*models.SystemPlatform) (map[in
 		templateIDs = append(templateIDs, *system.TemplateID)
 	}
 
-	templates := make([]models.Template, 0, len(templateIDs))
-	q := tx.Model(&models.Template{}).Where("id IN (?)", templateIDs).Select("id, name, uuid")
+	templates := make([]models.TemplateBase, 0, len(templateIDs))
+	q := tx.Model(&models.TemplateBase{}).
+		Where("rh_account_id = ? AND id IN (?)", systems[0].RhAccountID, templateIDs)
 	err := q.Find(&templates).Error
 	if err != nil {
 		return nil, err
 	}
 
-	templatesMap := make(map[int64]models.Template, len(templates))
+	templatesMap := make(map[int64]models.TemplateBase, len(templates))
 	for _, t := range templates {
 		templatesMap[t.ID] = t
 	}

base/models/models.go

@@ -25,12 +25,16 @@ func (Reporter) TableName() string {
 	return "reporter"
 }
 
+type TemplateBase struct {
+	ID          int64 `gorm:"primaryKey"`
+	RhAccountID int   `gorm:"primaryKey"`
+	UUID        string
+	Name        string
+}
+
 type Template struct {
-	ID            int64 `gorm:"primaryKey"`
-	RhAccountID   int   `gorm:"primaryKey"`
-	UUID          string
+	TemplateBase
 	EnvironmentID string
-	Name          string
 	Arch          string
 	Version       string
 	// Config      pgtype.JSONB // currently unused
@@ -40,7 +44,7 @@ type Template struct {
 	LastEdited  *time.Time
 }
 
-func (Template) TableName() string {
+func (TemplateBase) TableName() string {
 	return "template"
 }
 

listener/templates.go

@@ -118,10 +118,12 @@ func TemplateUpdate(template mqueue.TemplateResponse) error {
 	}
 
 	row := models.Template{
-		RhAccountID:   accountID,
-		UUID:          template.UUID,
+		TemplateBase: models.TemplateBase{
+			RhAccountID: accountID,
+			UUID:        template.UUID,
+			Name:        template.Name,
+		},
 		EnvironmentID: template.EnvironmentID,
-		Name:          template.Name,
 		Arch:          template.Arch,
 		Version:       template.Version,
 		//Config:      nil,