try this

libgraviton · Mar 22, 2024 · d4e2316 · d4e2316
1 parent 859d8bc
commit d4e2316
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Graviton/RestBundle/Listener/RestrictionListener.php b/src/Graviton/RestBundle/Listener/RestrictionListener.php
@@ -223,7 +223,7 @@ public function onPreAggregate(PreAggregateEvent $event)
                 $matchConditions[] = [
                     '$or' => [
                         [$fieldName => null],
-                        [$fieldName => ['$lte' => (int) $fieldValue]], // always int
+                        [$fieldName => ['$lte' => (int) $fieldValue]], // always int in lte
                     ]
                 ];
             } else {
@@ -235,7 +235,12 @@ public function onPreAggregate(PreAggregateEvent $event)
         }
 
         $newPipeline = [];
-        if (!empty($matchConditions)) {
+        if (!empty($matchConditions) && count($matchConditions) == 1) {
+            $newPipeline[] = [
+                '$match' => $matchConditions
+            ];
+        }
+        if (!empty($matchConditions) && count($matchConditions) > 1) {
             $newPipeline[] = [
                 '$match' => [
                     '$and' => $matchConditions
@@ -257,7 +262,7 @@ public function onPreAggregate(PreAggregateEvent $event)
             [
                 'mode' => $this->securityUtils->getDataRestrictionMode(),
                 'values' => $dataRestrictions,
-                'pipeline' => $newPipeline
+                'pipeline' => \json_encode($newPipeline, JSON_UNESCAPED_SLASHES)
             ]
         );
 

diff --git a/src/Graviton/SecurityBundle/Service/SecurityUtils.php b/src/Graviton/SecurityBundle/Service/SecurityUtils.php
@@ -185,7 +185,7 @@ public function getRequestDataRestrictions()
             if (!is_null($headerValue) && $fieldSpec['type'] == 'int') {
                 $headerValue = (int) $headerValue;
             }
-            $restrictions[$fieldSpec['name']] = (string) $headerValue;
+            $restrictions[$fieldSpec['name']] = $headerValue;
         }
         return $restrictions;
     }