Fix #8366 - V8 API Filtering W/ OR Operator Chained Conditions

salesagility · Mar 1, 2022 · e9414a1 · e9414a1
1 parent e88f094
commit e9414a1
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/Api/V8/JsonApi/Repository/Filter.php b/Api/V8/JsonApi/Repository/Filter.php
@@ -44,7 +44,14 @@ public function parseWhere(\SugarBean $bean, array $params)
             unset($params['operator']);
         }
 
-        $params = $this->addDeletedParameter($params);
+        $deleted = false;
+        if (isset($params['deleted'])) {
+            if (isset($params['deleted']['eq'])) {
+                $deleted = ($params['deleted']['eq'] == 1);
+            }
+
+            unset($params['deleted']);
+        }
 
         $where = [];
         foreach ($params as $field => $expr) {
@@ -75,12 +82,25 @@ public function parseWhere(\SugarBean $bean, array $params)
             }
         }
 
-        return implode(sprintf(' %s ', $operator), $where);
+        if (empty($where)) {
+            return sprintf(
+                "%s.deleted = '%d'",
+                $bean->getTableName(),
+                $deleted
+            );
+        }
+
+        return sprintf(
+            "(%s) AND %s.deleted = '%d'",
+            implode(sprintf(' %s ', $operator), $where),
+            $bean->getTableName(),
+            $deleted
+        );
     }
 
     /**
      * Only return deleted records if they were explicitly requested
-     *
+     * @deprecated
      * @param array $params
      * @return array
      */