RHINENG-25147: refactor workspaces

base/database/utils.go

@@ -26,16 +26,16 @@ func (j joinsT) apply(tx *gorm.DB) *gorm.DB {
 	return tx
 }
 
-func Systems(tx *gorm.DB, accountID int, groups map[string]string, joins ...join) *gorm.DB {
+func Systems(tx *gorm.DB, accountID int, workspaceIDs []string, joins ...join) *gorm.DB {
 	tx = tx.Table("system_inventory si").
 		Joins("JOIN system_patch spatch ON si.id = spatch.system_id AND si.rh_account_id = spatch.rh_account_id").
 		Where("si.rh_account_id = ?", accountID)
 	tx = (joinsT)(joins).apply(tx)
-	return ApplyInventoryWorkspaceFilter(tx, groups)
+	return ApplyInventoryWorkspaceFilter(tx, workspaceIDs)
 }
 
-func SystemAdvisories(tx *gorm.DB, accountID int, groups map[string]string, joins ...join) *gorm.DB {
-	tx = Systems(tx, accountID, groups).
+func SystemAdvisories(tx *gorm.DB, accountID int, workspaceIDs []string, joins ...join) *gorm.DB {
+	tx = Systems(tx, accountID, workspaceIDs).
 		Joins("JOIN system_advisories sa on sa.system_id = si.id AND sa.rh_account_id = ?", accountID)
 	return (joinsT)(joins).apply(tx)
 }
@@ -46,8 +46,8 @@ func SystemPackagesShort(tx *gorm.DB, accountID int, joins ...join) *gorm.DB {
 	return (joinsT)(joins).apply(tx)
 }
 
-func SystemPackages(tx *gorm.DB, accountID int, groups map[string]string, joins ...join) *gorm.DB {
-	tx = Systems(tx, accountID, groups).
+func SystemPackages(tx *gorm.DB, accountID int, workspaceIDs []string, joins ...join) *gorm.DB {
+	tx = Systems(tx, accountID, workspaceIDs).
 		Joins("JOIN system_package2 spkg on spkg.system_id = si.id AND spkg.rh_account_id = ?", accountID).
 		Joins("JOIN package p on p.id = spkg.package_id").
 		Joins("JOIN package_name pn on pn.id = spkg.name_id")
@@ -65,9 +65,9 @@ func PackageByName(tx *gorm.DB, pkgName string, joins ...join) *gorm.DB {
 	return (joinsT)(joins).apply(tx)
 }
 
-func SystemAdvisoriesByInventoryID(tx *gorm.DB, accountID int, groups map[string]string, inventoryID string,
+func SystemAdvisoriesByInventoryID(tx *gorm.DB, accountID int, workspaceIDs []string, inventoryID string,
 	joins ...join) *gorm.DB {
-	tx = SystemAdvisories(tx, accountID, groups).Where("si.inventory_id = ?::uuid", inventoryID)
+	tx = SystemAdvisories(tx, accountID, workspaceIDs).Where("si.inventory_id = ?::uuid", inventoryID)
 	return (joinsT)(joins).apply(tx)
 }
 
@@ -240,21 +240,11 @@ func ReadReplicaConfigured() bool {
 	return len(utils.CoreCfg.DBReadReplicaHost) > 0 && utils.CoreCfg.DBReadReplicaPort != 0
 }
 
-func ApplyInventoryWorkspaceFilter(tx *gorm.DB, groups map[string]string) *gorm.DB {
-	if _, ok := groups[utils.KeyGrouped]; !ok {
-		if _, ok := groups[utils.KeyUngrouped]; ok {
-			// show only systems with '[]' group
-			return tx.Where("si.workspaces = '[]'")
-		}
-		// return query without WHERE if there are no groups
-		return tx
-	}
-
-	db := DB.Where("si.workspaces @> ANY (?::jsonb[])", groups[utils.KeyGrouped])
-	if _, ok := groups[utils.KeyUngrouped]; ok {
-		db = db.Or("si.workspaces = '[]'")
+func ApplyInventoryWorkspaceFilter(tx *gorm.DB, workspaceIDs []string) *gorm.DB {
+	if len(workspaceIDs) == 0 {
+		utils.LogWarn("there should always be some workspaces, at least root workspace")
 	}
-	return tx.Where(db)
+	return tx.Where("si.workspace_id IN (?)", workspaceIDs)
 }
 
 // LEFT JOIN templates to spatch (system_patch)

base/database/utils_test.go

@@ -11,38 +11,31 @@ var (
 	// counts of systems from system_inventory (+ system_patch join in Systems())
 	nGroup1    int64 = 7
 	nGroup2    int64 = 2
-	nUngrouped int64 = 7
+	nUngrouped int64 = 9
 	nAll       int64 = 18
 )
 
-var testCases = []map[int64]map[string]string{
-	{nGroup1: {utils.KeyGrouped: `{"[{\"id\":\"inventory-group-1\"}]"}`}},
-	{nGroup2: {utils.KeyGrouped: `{"[{\"id\":\"inventory-group-2\"}]"}`}},
-	{nGroup1 + nGroup2: {utils.KeyGrouped: `{"[{\"id\":\"inventory-group-1\"}]","[{\"id\":\"inventory-group-2\"}]"}`}},
-	{nGroup1 + nUngrouped: {
-		utils.KeyGrouped:   `{"[{\"id\":\"inventory-group-1\"}]"}`,
-		utils.KeyUngrouped: "[]",
-	}},
-	{nUngrouped: {
-		utils.KeyGrouped:   `{"[{\"id\":\"non-existing-group\"}]"}`,
-		utils.KeyUngrouped: "[]",
-	}},
-	{0: {utils.KeyGrouped: `{"[{\"id\":\"non-existing-group\"}]"}`}},
-	{nUngrouped: {utils.KeyUngrouped: "[]"}},
-	{nAll: {}},
-	{nAll: nil},
+var testCases = []map[int64][]string{
+	{nGroup1: {"inventory-group-1"}},
+	{nGroup2: {"inventory-group-2"}},
+	{nGroup1 + nGroup2: {"inventory-group-1", "inventory-group-2"}},
+	{nGroup1 + nUngrouped: {"inventory-group-1", "root-workspace"}},
+	{nUngrouped: {"non-existing-group", "root-workspace"}},
+	{0: {"non-existing-group"}},
+	{nUngrouped: {"root-workspace"}},
+	{nAll: {"inventory-group-1", "inventory-group-2", "root-workspace"}},
 }
 
 func TestApplyInventoryWorkspaceFilter(t *testing.T) {
 	utils.SkipWithoutDB(t)
 	Configure()
 
 	for _, tc := range testCases {
-		for expectedCount, groups := range tc {
+		for expectedCount, workspaceIDs := range tc {
 			var count int64
 			ApplyInventoryWorkspaceFilter(DB.Table("system_inventory si").
 				Joins("JOIN system_patch spatch ON si.id = spatch.system_id AND si.rh_account_id = spatch.rh_account_id"),
-				groups).Count(&count)
+				workspaceIDs).Count(&count)
 			assert.Equal(t, expectedCount, count)
 		}
 	}

base/inventory/inventory.go

@@ -2,9 +2,6 @@ package inventory
 
 import (
 	"app/base/types"
-	"database/sql/driver"
-	"encoding/json"
-	"errors"
 
 	"github.com/google/uuid"
 )
@@ -86,35 +83,6 @@ type Group struct {
 	Name string `json:"name"`
 }
 
-// Groups is a slice of Group that implements driver.Valuer and sql.Scanner
-// for storing/loading as JSONB in the database (e.g. system_inventory.workspaces).
-type Groups []Group
-
-// Value implements driver.Valuer for GORM: marshal to JSON for DB write.
-func (g *Groups) Value() (driver.Value, error) {
-	if g == nil {
-		return nil, nil
-	}
-	return json.Marshal(g)
-}
-
-// Scan implements sql.Scanner for GORM: unmarshal from JSON on DB read.
-func (g *Groups) Scan(value interface{}) error {
-	if value == nil {
-		*g = nil
-		return nil
-	}
-	b, ok := value.([]byte)
-	if !ok {
-		return errors.New("inventory.Groups: type assertion to []byte failed")
-	}
-	if len(b) == 0 {
-		*g = nil
-		return nil
-	}
-	return json.Unmarshal(b, g)
-}
-
 type Workloads struct {
 	Sap     SapWorkload     `json:"sap,omitempty"`
 	Ansible AnsibleWorkload `json:"ansible,omitempty"`

base/models/models.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"app/base/inventory"
 	"time"
 
 	"github.com/google/uuid"
@@ -71,9 +70,10 @@ type SystemInventory struct {
 	BuiltPkgcache                    bool    `gorm:"column:built_pkgcache"`
 	Arch                             *string
 	Bootc                            bool
-	Tags                             []byte            `gorm:"column:tags"`
-	Created                          time.Time         // set by trigger system_platform_insert_trigger
-	Workspaces                       *inventory.Groups `gorm:"column:workspaces"`
+	Tags                             []byte    `gorm:"column:tags"`
+	Created                          time.Time // set by trigger system_platform_insert_trigger
+	WorkspaceID                      *string   `gorm:"column:workspace_id"`
+	WorkspaceName                    *string   `gorm:"column:workspace_name"`
 	StaleTimestamp                   *time.Time
 	StaleWarningTimestamp            *time.Time
 	CulledTimestamp                  *time.Time

base/utils/gin.go

@@ -13,14 +13,12 @@ import (
 )
 
 const (
-	KeyApiver          = "apiver"
-	KeyAccount         = "account"
-	KeyOrgID           = "org_id"
-	KeyUser            = "user"
-	KeySystem          = "system_cn"
-	KeyInventoryGroups = "inventoryGroups"
-	KeyGrouped         = "grouped"
-	KeyUngrouped       = "ungrouped"
+	KeyApiver              = "apiver"
+	KeyAccount             = "account"
+	KeyOrgID               = "org_id"
+	KeyUser                = "user"
+	KeySystem              = "system_cn"
+	KeyInventoryWorkspaces = "workspaceIDs"
 	// ReadHeaderTimeout same as nginx default
 	ReadHeaderTimeout = 60 * time.Second
 )

database_admin/migrations/153_simplify_workspaces.up.sql

@@ -0,0 +1,13 @@
+ALTER TABLE system_inventory
+    ADD COLUMN workspace_id TEXT CHECK (NOT empty(workspace_id)),
+    ADD COLUMN workspace_name TEXT CHECK (NOT empty(workspace_name));
+
+UPDATE system_inventory
+    SET workspace_id = workspaces->0->>'id',
+        workspace_name = workspaces->0->>'name';
+
+CREATE INDEX IF NOT EXISTS system_inventory_workspace_id_index ON system_inventory (workspace_id);
+CREATE INDEX IF NOT EXISTS system_inventory_workspace_name_index ON system_inventory (workspace_name);
+
+ALTER TABLE system_inventory
+    DROP COLUMN workspaces;

database_admin/schema/create_schema.sql

@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS schema_migrations
 
 
 INSERT INTO schema_migrations
-VALUES (152, false);
+VALUES (153, false);
 
 -- ---------------------------------------------------------------------------
 -- Functions
@@ -592,7 +592,8 @@ CREATE TABLE IF NOT EXISTS system_inventory
     ansible_workload_controller_version TEXT        CHECK (NOT empty(ansible_workload_controller_version)),
     mssql_workload                      BOOLEAN     NOT NULL DEFAULT false,
     mssql_workload_version              TEXT        CHECK (NOT empty(mssql_workload_version)),
-    workspaces                          JSONB,
+    workspace_id                        TEXT        CHECK (NOT empty(workspace_id)),
+    workspace_name                      TEXT        CHECK (NOT empty(workspace_name)),
     PRIMARY KEY (rh_account_id, id),
     UNIQUE (rh_account_id, inventory_id)
 ) PARTITION BY HASH (rh_account_id);
@@ -624,7 +625,8 @@ SELECT create_table_partition_triggers('system_inventory_on_update',
 CREATE INDEX IF NOT EXISTS system_inventory_inventory_id_idx ON system_inventory (inventory_id);
 CREATE INDEX IF NOT EXISTS system_inventory_tags_index ON system_inventory USING GIN (tags JSONB_PATH_OPS);
 CREATE INDEX IF NOT EXISTS system_inventory_stale_timestamp_index ON system_inventory (stale_timestamp);
-CREATE INDEX IF NOT EXISTS system_inventory_workspaces_index ON system_inventory USING GIN (workspaces);
+CREATE INDEX IF NOT EXISTS system_inventory_workspace_id_index ON system_inventory (workspace_id);
+CREATE INDEX IF NOT EXISTS system_inventory_workspace_name_index ON system_inventory (workspace_name);
 
 CREATE TABLE IF NOT EXISTS deleted_system
 (