From 35ea71ee1b6a90a7a89ff9cbab2a0b0c49e8ba35 Mon Sep 17 00:00:00 2001 From: Yash Sharma Date: Sun, 13 Oct 2024 11:58:27 +0530 Subject: [PATCH] Added missing condition for id filter for entities Signed-off-by: Yash Sharma --- models/meshmodel/registry/v1alpha3/relationship_filter.go | 3 +++ models/meshmodel/registry/v1beta1/category_filter.go | 3 +++ models/meshmodel/registry/v1beta1/component_filter.go | 4 +++- models/meshmodel/registry/v1beta1/model_filter.go | 3 +++ models/meshmodel/registry/v1beta1/policy_filter.go | 4 +++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/models/meshmodel/registry/v1alpha3/relationship_filter.go b/models/meshmodel/registry/v1alpha3/relationship_filter.go index 624c683a..de31351e 100644 --- a/models/meshmodel/registry/v1alpha3/relationship_filter.go +++ b/models/meshmodel/registry/v1alpha3/relationship_filter.go @@ -74,6 +74,9 @@ func (relationshipFilter *RelationshipFilter) Get(db *database.Handler) ([]entit if relationshipFilter.SubType != "" { finder = finder.Where("relationship_definition_dbs.sub_type = ?", relationshipFilter.SubType) } + if relationshipFilter.Id != "" { + finder = finder.Where("relationship_definition_dbs.id = ?", relationshipFilter.Id) + } if relationshipFilter.ModelName != "" { finder = finder.Where("model_dbs.name = ?", relationshipFilter.ModelName) } diff --git a/models/meshmodel/registry/v1beta1/category_filter.go b/models/meshmodel/registry/v1beta1/category_filter.go index 399385a1..520614ae 100644 --- a/models/meshmodel/registry/v1beta1/category_filter.go +++ b/models/meshmodel/registry/v1beta1/category_filter.go @@ -50,6 +50,9 @@ func (cf *CategoryFilter) Get(db *database.Handler) ([]entity.Entity, int64, int finder = finder.Where("name = ?", cf.Name) } } + if cf.Id != "" { + finder = finder.Where("id = ?", cf.Id) + } if cf.OrderOn != "" { if cf.Sort == "desc" { finder = finder.Order(clause.OrderByColumn{Column: clause.Column{Name: cf.OrderOn}, Desc: true}) diff --git a/models/meshmodel/registry/v1beta1/component_filter.go b/models/meshmodel/registry/v1beta1/component_filter.go index 76a6fb57..47aefe58 100644 --- a/models/meshmodel/registry/v1beta1/component_filter.go +++ b/models/meshmodel/registry/v1beta1/component_filter.go @@ -116,7 +116,9 @@ func (componentFilter *ComponentFilter) Get(db *database.Handler) ([]entity.Enti if componentFilter.Version != "" { finder = finder.Where("model_dbs.model->>'version' = ?", componentFilter.Version) } - + if componentFilter.Id != "" { + finder = finder.Where("component_definition_dbs.id = ?", componentFilter.Id) + } if componentFilter.OrderOn != "" { if componentFilter.Sort == "desc" { finder = finder.Order(clause.OrderByColumn{Column: clause.Column{Name: componentFilter.OrderOn}, Desc: true}) diff --git a/models/meshmodel/registry/v1beta1/model_filter.go b/models/meshmodel/registry/v1beta1/model_filter.go index 6a512f79..c52e3d27 100644 --- a/models/meshmodel/registry/v1beta1/model_filter.go +++ b/models/meshmodel/registry/v1beta1/model_filter.go @@ -138,6 +138,9 @@ func (mf *ModelFilter) Get(db *database.Handler) ([]entity.Entity, int64, int, e } else if mf.Annotations == "false" { finder = finder.Where("model_dbs.metadata->>'isAnnotation' = false") } + if mf.Id != "" { + finder = finder.Where("model_dbs.id = ?", mf.Id) + } if mf.OrderOn != "" { if mf.Sort == "desc" { finder = finder.Order(clause.OrderByColumn{Column: clause.Column{Name: mf.OrderOn}, Desc: true}) diff --git a/models/meshmodel/registry/v1beta1/policy_filter.go b/models/meshmodel/registry/v1beta1/policy_filter.go index d15d970c..3108d68c 100644 --- a/models/meshmodel/registry/v1beta1/policy_filter.go +++ b/models/meshmodel/registry/v1beta1/policy_filter.go @@ -49,7 +49,9 @@ func (pf *PolicyFilter) Get(db *database.Handler) ([]entity.Entity, int64, int, if pf.ModelName != "" { finder = finder.Where("model_dbs.name = ?", pf.ModelName) } - + if pf.Id != "" { + finder = finder.Where("policy_definition_dbs.id = ?", pf.Id) + } var count int64 finder.Count(&count)