From b911314b1e5312e2783ced002152f73a66d7c805 Mon Sep 17 00:00:00 2001 From: abdullah1308 Date: Tue, 11 Jul 2023 20:47:39 +0530 Subject: [PATCH] Update composite key Signed-off-by: abdullah1308 --- models/meshmodel/core/v1alpha1/component.go | 2 +- models/meshmodel/registry.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/meshmodel/core/v1alpha1/component.go b/models/meshmodel/core/v1alpha1/component.go index dfe120f3..23b68b2a 100644 --- 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 index 12672597..6266a181 100644 --- 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)