Merge pull request #1834 from akto-api-security/hotfix/test_config_fi…

…lters fix: fixed a filter for test config
akto-api-security · Dec 17, 2024 · e37db62 · e37db62
2 parents 11a254f + 8c03425
commit e37db62
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/libs/dao/src/main/java/com/akto/dao/test_editor/YamlTemplateDao.java b/libs/dao/src/main/java/com/akto/dao/test_editor/YamlTemplateDao.java
@@ -24,9 +24,11 @@ public Map<String, TestConfig> fetchTestConfigMap(boolean includeYamlContent, bo
         Map<String, TestConfig> testConfigMap = new HashMap<>();
         List<Bson> filters = new ArrayList<>();
         filters.add(customFilter);
-        if (fetchOnlyActive) {
-            filters.add(Filters.exists(YamlTemplate.INACTIVE, false));
-            filters.add(Filters.eq(YamlTemplate.INACTIVE, false));
+        if (fetchOnlyActive) {Bson filter = Filters.or(
+                Filters.exists(YamlTemplate.INACTIVE, false),
+                Filters.eq(YamlTemplate.INACTIVE, false)
+        );
+            filters.add(filter);
         } else {
             filters.add(new BasicDBObject());
         }
@@ -38,7 +40,7 @@ public Map<String, TestConfig> fetchTestConfigMap(boolean includeYamlContent, bo
         int localLimit = Math.min(100, limit);
 
         while (localCounter < limit) {
-            yamlTemplates = YamlTemplateDao.instance.findAll(Filters.or(filters), localSkip, localLimit, Sorts.ascending("_id"), proj);
+            yamlTemplates = YamlTemplateDao.instance.findAll(Filters.and(filters), localSkip, localLimit, Sorts.ascending("_id"), proj);
             for (YamlTemplate yamlTemplate: yamlTemplates) {
                 try {
                     TestConfig testConfig = TestConfigYamlParser.parseTemplate(yamlTemplate.getContent());