RHINENG-26547: re-apply workspace related code changes

base/core/gintesting.go

@@ -17,6 +17,15 @@ type ContextKV struct {
 
 var V3APICtx = ContextKV{Key: utils.KeyApiver, Value: 3}
 
+var WorkspacesTestCtx = ContextKV{
+	Key: utils.KeyInventoryWorkspaces,
+	Value: []string{
+		"00000000-0000-0000-0000-000000000001",
+		"00000000-0000-0000-0000-000000000002",
+		"00000000-0000-0000-0000-999999999999",
+	},
+}
+
 func InitRouter(handler gin.HandlerFunc, contextKVs ...ContextKV) *gin.Engine {
 	return InitRouterWithPath(handler, "/", contextKVs...)
 }
@@ -32,6 +41,7 @@ func InitRouterWithParams(handler gin.HandlerFunc, account int, method, path str
 	router.Use(func(c *gin.Context) {
 		// set default api version for tests to latest
 		c.Set(utils.KeyApiver, LatestAPIVersion)
+		c.Set(utils.KeyInventoryWorkspaces, WorkspacesTestCtx.Value)
 		for _, kv := range contextKVs {
 			c.Set(kv.Key, kv.Value)
 		}

base/database/testing.go

@@ -26,6 +26,16 @@ func TestWorkspacesGroup1() *inventory.Groups {
 	return &g
 }
 
+func TestWorkspace1IDPtr() *uuid.UUID {
+	id := uuid.MustParse(TestWorkspace1ID)
+	return &id
+}
+
+func TestWorkspace1NamePtr() *string {
+	name := "group1"
+	return &name
+}
+
 func DebugWithCachesCheck(part string, fun func()) {
 	fun()
 	validAfter, err := CheckCachesValidRet()

base/database/utils.go

@@ -27,16 +27,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)
 }
@@ -47,8 +47,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")
@@ -66,9 +66,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 uuid.UUID,
+func SystemAdvisoriesByInventoryID(tx *gorm.DB, accountID int, workspaceIDs []string, inventoryID uuid.UUID,
 	joins ...join) *gorm.DB {
-	tx = SystemAdvisories(tx, accountID, groups).Where("si.inventory_id = ?", inventoryID)
+	tx = SystemAdvisories(tx, accountID, workspaceIDs).Where("si.inventory_id = ?", inventoryID)
 	return (joinsT)(joins).apply(tx)
 }
 
@@ -241,21 +241,12 @@ 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
+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
 	}
-
-	db := DB.Where("si.workspaces @> ANY (?::jsonb[])", groups[utils.KeyGrouped])
-	if _, ok := groups[utils.KeyUngrouped]; ok {
-		db = db.Or("si.workspaces = '[]'")
-	}
-	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,35 @@ 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 nonExisting = "00000000-0000-0000-3333-000000000000"
 
-var testCases = []map[int64]map[string]string{
-	{nGroup1: {utils.KeyGrouped: `{"[{\"id\":\"aaaaaaaa-0000-0000-0000-000000000001\"}]"}`}},
-	{nGroup2: {utils.KeyGrouped: `{"[{\"id\":\"aaaaaaaa-0000-0000-0000-000000000002\"}]"}`}},
-	{nGroup1 + nGroup2: {utils.KeyGrouped: `{"[{\"id\":\"aaaaaaaa-0000-0000-0000-000000000001\"}]","[{\"id\":\"aaaaaaaa-0000-0000-0000-000000000002\"}]"}`}}, //nolint:lll
-	{nGroup1 + nUngrouped: {
-		utils.KeyGrouped:   `{"[{\"id\":\"aaaaaaaa-0000-0000-0000-000000000001\"}]"}`,
-		utils.KeyUngrouped: "[]",
-	}},
-	{nUngrouped: {
-		utils.KeyGrouped:   `{"[{\"id\":\"non-existing-group\"}]"}`,
-		utils.KeyUngrouped: "[]",
-	}},
-	{0: {utils.KeyGrouped: `{"[{\"id\":\"non-existing-group\"}]"}`}},
-	{nUngrouped: {utils.KeyUngrouped: "[]"}},
-	{nAll: {}},
+var testCases = []map[int64][]string{
+	{nGroup1: {"00000000-0000-0000-0000-000000000001"}},
+	{nGroup2: {"00000000-0000-0000-0000-000000000002"}},
+	{nGroup1 + nGroup2: {"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000002"}},
+	{nGroup1 + nUngrouped: {"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-999999999999"}},
+	{nUngrouped: {nonExisting, "00000000-0000-0000-0000-999999999999"}},
+	{0: {nonExisting}},
+	{nUngrouped: {"00000000-0000-0000-0000-999999999999"}},
+	{nAll: {"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000002",
+		"00000000-0000-0000-0000-999999999999"}},
 	{nAll: nil},
+	{nAll: {}},
 }
 
 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/models/models.go

@@ -74,6 +74,8 @@ type SystemInventory struct {
 	Tags                             []byte            `gorm:"column:tags"`
 	Created                          time.Time         // set by trigger system_platform_insert_trigger
 	Workspaces                       *inventory.Groups `gorm:"column:workspaces"`
+	WorkspaceID                      *uuid.UUID        `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/159_create_workspace_columns_indexes.down.sql

@@ -0,0 +1,26 @@
+DROP INDEX IF EXISTS system_inventory_workspace_id_index;
+
+CREATE OR REPLACE FUNCTION sync_system_inventory_workspace()
+    RETURNS TRIGGER AS
+$$
+BEGIN
+    IF NEW.workspaces IS NOT NULL
+        AND jsonb_typeof(NEW.workspaces) = 'array'
+        AND jsonb_array_length(NEW.workspaces) > 0
+    THEN
+        NEW.workspace_id := (NEW.workspaces->0->>'id')::UUID;
+        NEW.workspace_name := NEW.workspaces->0->>'name';
+        IF NEW.workspace_name IS NULL OR empty(NEW.workspace_name) THEN
+            RAISE EXCEPTION 'workspace_name must not be empty';
+        END IF;
+    ELSIF TG_OP = 'INSERT' THEN
+        RAISE EXCEPTION 'workspaces required';
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+SELECT create_table_partition_triggers('system_inventory_sync_workspace',
+                                       $$BEFORE INSERT OR UPDATE OF workspaces$$,
+                                       'system_inventory',
+                                       $$FOR EACH ROW EXECUTE PROCEDURE sync_system_inventory_workspace()$$);

database_admin/migrations/159_create_workspace_columns_indexes.up.sql

@@ -0,0 +1,8 @@
+SELECT drop_table_partition_triggers('system_inventory_sync_workspace',
+                                     $$BEFORE INSERT OR UPDATE OF workspaces$$,
+                                     'system_inventory',
+                                     $$FOR EACH ROW EXECUTE PROCEDURE sync_system_inventory_workspace()$$);
+
+DROP FUNCTION IF EXISTS sync_system_inventory_workspace();
+
+CREATE INDEX IF NOT EXISTS system_inventory_workspace_id_index ON system_inventory (workspace_id);

database_admin/schema/create_schema.sql

@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS schema_migrations
 
 
 INSERT INTO schema_migrations
-VALUES (158, false);
+VALUES (159, false);
 
 -- ---------------------------------------------------------------------------
 -- Functions
@@ -65,26 +65,6 @@ END;
 $check_unchanged$
     LANGUAGE 'plpgsql';
 
-CREATE OR REPLACE FUNCTION sync_system_inventory_workspace()
-    RETURNS TRIGGER AS
-$$
-BEGIN
-    IF NEW.workspaces IS NOT NULL
-        AND jsonb_typeof(NEW.workspaces) = 'array'
-        AND jsonb_array_length(NEW.workspaces) > 0
-    THEN
-        NEW.workspace_id := (NEW.workspaces->0->>'id')::UUID;
-        NEW.workspace_name := NEW.workspaces->0->>'name';
-        IF NEW.workspace_name IS NULL OR empty(NEW.workspace_name) THEN
-            RAISE EXCEPTION 'workspace_name must not be empty';
-        END IF;
-    ELSIF TG_OP = 'INSERT' THEN
-        RAISE EXCEPTION 'workspaces required';
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
 CREATE OR REPLACE FUNCTION on_system_update()
 -- this trigger updates advisory_account_data when server changes its stale flag
     RETURNS TRIGGER
@@ -706,15 +686,11 @@ SELECT create_table_partition_triggers('system_inventory_on_update',
                                        'system_inventory',
                                        $$FOR EACH ROW EXECUTE PROCEDURE on_system_update()$$);
 
-SELECT create_table_partition_triggers('system_inventory_sync_workspace',
-                                       $$BEFORE INSERT OR UPDATE OF workspaces$$,
-                                       'system_inventory',
-                                       $$FOR EACH ROW EXECUTE PROCEDURE sync_system_inventory_workspace()$$);
-
 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 TABLE IF NOT EXISTS deleted_system
 (