update db queries

Signed-off-by: MUzairS15 <[email protected]>

models/meshmodel/registry/v1alpha3/relationship_filter.go

@@ -51,7 +51,6 @@ func (relationshipFilter *RelationshipFilter) Get(db *database.Handler) ([]entit
 		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
 	status := "enabled"
 
 	if relationshipFilter.Status != "" {

models/meshmodel/registry/v1beta1/model_filter.go

@@ -146,6 +146,14 @@ func (mf *ModelFilter) Get(db *database.Handler) ([]entity.Entity, int64, int, e
 		finder = finder.Order("display_name")
 	}
 
+	status := "enabled"
+
+	if mf.Status != "" {
+		status = mf.Status
+	}
+
+	finder = finder.Where("model_dbs.status = ?", status)
+
 	finder.Count(&count)
 
 	if mf.Limit != 0 {
@@ -155,14 +163,6 @@ func (mf *ModelFilter) Get(db *database.Handler) ([]entity.Entity, int64, int, e
 		finder = finder.Offset(mf.Offset)
 	}
 
-	status := "enabled"
-
-	if mf.Status != "" {
-		status = mf.Status
-	}
-
-	finder = finder.Where("model_dbs.status = ?", status)
-
 	includeComponents = mf.Components
 	includeRelationships = mf.Relationships