From def3f0040c7496bbc17d32117fb1489f3232533e Mon Sep 17 00:00:00 2001 From: Nithish Karthik Date: Tue, 6 Aug 2024 15:30:07 +0530 Subject: [PATCH] refactor: Query only models with enabled status Signed-off-by: Nithish Karthik --- models/meshmodel/registry/v1alpha2/relationship_filter.go | 4 ++++ models/meshmodel/registry/v1beta1/component_filter.go | 3 +++ 2 files changed, 7 insertions(+) diff --git a/models/meshmodel/registry/v1alpha2/relationship_filter.go b/models/meshmodel/registry/v1alpha2/relationship_filter.go index 64f148fa..eed6b171 100644 --- a/models/meshmodel/registry/v1alpha2/relationship_filter.go +++ b/models/meshmodel/registry/v1alpha2/relationship_filter.go @@ -48,6 +48,10 @@ func (relationshipFilter *RelationshipFilter) Get(db *database.Handler) ([]entit finder := db.Model(&v1alpha2.RelationshipDefinition{}).Preload("Model").Preload("Model.Category"). Joins("JOIN model_dbs ON relationship_definition_dbs.model_id = model_dbs.id"). Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id") + + // TODO(@MUzairS15): Refactor this once Status is made a first class field in RelationshipFilter + finder = finder.Where("model_dbs.status = enabled") + if relationshipFilter.Kind != "" { if relationshipFilter.Greedy { finder = finder.Where("relationship_definition_dbs.kind LIKE ?", "%"+relationshipFilter.Kind+"%") diff --git a/models/meshmodel/registry/v1beta1/component_filter.go b/models/meshmodel/registry/v1beta1/component_filter.go index 72f0f9c5..24ddb555 100644 --- a/models/meshmodel/registry/v1beta1/component_filter.go +++ b/models/meshmodel/registry/v1beta1/component_filter.go @@ -69,6 +69,9 @@ func (componentFilter *ComponentFilter) Get(db *database.Handler) ([]entity.Enti Joins("JOIN hosts ON hosts.id = model_dbs.host_id") // + // TODO(@MUzairS15): Refactor this once Status is made a first class field in ComponentFilter + finder = finder.Where("model_dbs.status = enabled") + if componentFilter.Greedy { if componentFilter.Name != "" && componentFilter.DisplayName != "" { finder = finder.Where("component_definition_dbs.component->>'kind' LIKE ? OR display_name LIKE ?", "%"+componentFilter.Name+"%", componentFilter.DisplayName+"%")