ESSNTL-4817: fix ungrouped hosts

RedHatInsights · Jul 21, 2023 · 84871b2 · 84871b2
1 parent 37ccc5d
commit 84871b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/base/database/utils.go b/base/database/utils.go
@@ -222,6 +222,10 @@ func ReadReplicaConfigured() bool {
 func InventoryHostsJoin(tx *gorm.DB, groups map[string]string) *gorm.DB {
 	tx = tx.Joins("JOIN inventory.hosts ih ON ih.id = sp.inventory_id")
 	if _, ok := groups[rbac.KeyGrouped]; !ok {
+		if _, ok := groups[rbac.KeyUngrouped]; ok {
+			// show only systems with '[]' group
+			return tx.Where("ih.groups = '[]'")
+		}
 		// return query without WHERE if there are no groups
 		return tx
 	}

diff --git a/base/database/utils_test.go b/base/database/utils_test.go
@@ -30,6 +30,7 @@ var testCases = []map[int64]map[string]string{
 		rbac.KeyUngrouped: "[]",
 	}},
 	{0: {rbac.KeyGrouped: `{"[{\"id\":\"non-existing-group\"}]"}`}},
+	{nUngrouped: {rbac.KeyUngrouped: "[]"}},
 	{nAll: {}},
 }