fix(get-entities): Only include entities that meet all the conditions

zachowj · Nov 7, 2023 · 1c69dd3 · 1c69dd3
1 parent 1d81fe8
commit 1c69dd3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/nodes/get-entities/GetEntitiesController.ts b/src/nodes/get-entities/GetEntitiesController.ts
@@ -51,6 +51,7 @@ export default class GetEntitiesController extends InputOutputController<
             entity.timeSinceChangedMs =
                 Date.now() - new Date(entity.last_changed).getTime();
 
+            let entityMatched = true;
             for (const rule of rules) {
                 const value = selectn(rule.property, entity);
                 const result =
@@ -68,9 +69,12 @@ export default class GetEntitiesController extends InputOutputController<
                     (rule.logic !== 'jsonata' && value === undefined) ||
                     !result
                 ) {
-                    continue;
+                    entityMatched = false;
+                    break;
                 }
+            }
 
+            if (entityMatched) {
                 entities.push(entity);
             }
         }