Merge pull request #323 from abdullah1308/meshmodel-category-count

Added counts to meshmodel categories
meshery · Jun 24, 2023 · 437d6c8 · 437d6c8
2 parents 403bdf4 + e755055
commit 437d6c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/models/meshmodel/core/v1alpha1/relationship.go b/models/meshmodel/core/v1alpha1/relationship.go
@@ -73,7 +73,7 @@ func GetMeshModelRelationship(db *database.Handler, f RelationshipFilter) (r []R
 		if f.Greedy {
 			finder = finder.Where("relationship_definition_dbs.kind LIKE ?", "%"+f.Kind+"%")
 		} else {
-			finder = finder.Where("relationship_definition_dbs.kind = ?", "%"+f.Kind+"%")
+			finder = finder.Where("relationship_definition_dbs.kind = ?", f.Kind)
 		}
 	}
 	if f.SubType != "" {

diff --git a/models/meshmodel/registry.go b/models/meshmodel/registry.go
@@ -250,10 +250,14 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) ([]v1
 	}
 	return m, count
 }
-func (rm *RegistryManager) GetCategories(db *database.Handler, f types.Filter) []v1alpha1.Category {
+func (rm *RegistryManager) GetCategories(db *database.Handler, f types.Filter) ([]v1alpha1.Category, int64) {
 	var catdb []v1alpha1.CategoryDB
 	var cat []v1alpha1.Category
 	finder := rm.db.Model(&catdb)
+
+	// total count before pagination
+	var count int64
+
 	if mf, ok := f.(*v1alpha1.CategoryFilter); ok {
 		if mf.Name != "" {
 			if mf.Greedy {
@@ -269,18 +273,27 @@ func (rm *RegistryManager) GetCategories(db *database.Handler, f types.Filter) [
 				finder = finder.Order(mf.OrderOn)
 			}
 		}
+
+		finder.Count(&count)
+
 		if mf.Limit != 0 {
 			finder = finder.Limit(mf.Limit)
 		}
 		if mf.Offset != 0 {
 			finder = finder.Offset(mf.Offset)
 		}
 	}
+
+	if count == 0 {
+		finder.Count(&count)
+	}
+
 	_ = finder.Find(&catdb).Error
 	for _, c := range catdb {
 		cat = append(cat, c.GetCategory(db))
 	}
-	return cat
+
+	return cat, count
 }
 func (rm *RegistryManager) GetRegistrant(e Entity) Host {
 	eID := e.GetID()