Update composite key

Signed-off-by: abdullah1308 <abdullahrafi.1308@gmail.com>
meshery · Jul 11, 2023 · b911314 · b911314
1 parent 5299ea5
commit b911314
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/models/meshmodel/core/v1alpha1/component.go b/models/meshmodel/core/v1alpha1/component.go
@@ -90,7 +90,7 @@ func GetMeshModelComponents(db *database.Handler, f ComponentFilter) (c []Compon
 	countUniqueComponents := func(components []componentDefinitionWithModel) int {
 		set := make(map[string]struct{})
 		for _, model := range components {
-			key := model.ComponentDefinitionDB.Kind + "@" + model.ModelDB.Name
+			key := model.ComponentDefinitionDB.Kind + "@" + model.APIVersion + "@" + model.ModelDB.Name + "@" + model.ModelDB.Version
 			if _, ok := set[key]; !ok {
 				set[key] = struct{}{}
 			}

diff --git a/models/meshmodel/registry.go b/models/meshmodel/registry.go
@@ -194,8 +194,9 @@ func (rm *RegistryManager) GetModels(db *database.Handler, f types.Filter) ([]v1
 	countUniqueModels := func(models []modelWithCategories) int {
 		set := make(map[string]struct{})
 		for _, model := range models {
-			if _, ok := set[model.ModelDB.Name]; !ok {
-				set[model.ModelDB.Name] = struct{}{}
+			key := model.ModelDB.Name + "@" + model.ModelDB.Version
+			if _, ok := set[key]; !ok {
+				set[key] = struct{}{}
 			}
 		}
 		return len(set)