LaravelRuleModel $model

Author: Tinywan

src/Adapter/DatabaseAdapter.php

@@ -230,7 +230,7 @@ public function _removeFilteredPolicy(string $sec, string $ptype, int $fieldInde
             $item = $model->hidden(['id', 'ptype'])->toArray();
             $item = $this->filterRule($item);
             $removedRules[] = $item;
-            if ($model->cache('tauthz')->delete()) {
+            if ($model->delete()) {
                 ++$count;
             }
         }

src/Adapter/LaravelDatabaseAdapter.php

@@ -19,8 +19,8 @@
 use Casbin\Persist\Adapters\Filter;
 use Casbin\Exceptions\InvalidFilterTypeException;
 use Casbin\WebmanPermission\Model\LaravelRuleModel;
-use Casbin\WebmanPermission\Model\RuleModel;
 use Illuminate\Support\Facades\DB;
+use Throwable;
 
 /**
  * DatabaseAdapter.
@@ -41,18 +41,37 @@ class LaravelDatabaseAdapter implements Adapter, UpdatableAdapter, BatchAdapter,
      *
      * @var LaravelRuleModel
      */
-    protected $model;
+    protected LaravelRuleModel $model;
 
     /**
-     * the DatabaseAdapter constructor.
-     *
-     * @param RuleModel $model
+     * LaravelDatabaseAdapter constructor.
+     * @param LaravelRuleModel $model
      */
-    public function __construct(RuleModel $model)
+    public function __construct(LaravelRuleModel $model)
     {
         $this->model = $model;
     }
 
+    /**
+     * Filter the rule.
+     *
+     * @param array $rule
+     * @return array
+     */
+    public function filterRule(array $rule): array
+    {
+        $rule = array_values($rule);
+
+        $i = count($rule) - 1;
+        for (; $i >= 0; $i--) {
+            if ($rule[$i] != '' && !is_null($rule[$i])) {
+                break;
+            }
+        }
+
+        return array_slice($rule, 0, $i + 1);
+    }
+
     /**
      * savePolicyLine function.
      *
@@ -163,6 +182,40 @@ public function removePolicy(string $sec, string $ptype, array $rule): void
         LaravelRuleModel::fireModelEvent('deleted');
     }
 
+    /**
+     * @param string      $sec
+     * @param string      $ptype
+     * @param int         $fieldIndex
+     * @param string|null ...$fieldValues
+     * @return array
+     * @throws Throwable
+     */
+    public function _removeFilteredPolicy(string $sec, string $ptype, int $fieldIndex, ?string ...$fieldValues): array
+    {
+        $count = 0;
+        $removedRules = [];
+
+        $instance = $this->model->where('ptype', $ptype);
+        foreach (range(0, 5) as $value) {
+            if ($fieldIndex <= $value && $value < $fieldIndex + count($fieldValues)) {
+                if ('' != $fieldValues[$value - $fieldIndex]) {
+                    $instance->where('v' . strval($value), $fieldValues[$value - $fieldIndex]);
+                }
+            }
+        }
+
+        foreach ($instance->select() as $model) {
+            $item = $model->hidden(['id', 'ptype'])->toArray();
+            $item = $this->filterRule($item);
+            $removedRules[] = $item;
+            if ($model->cache('tauthz')->delete()) {
+                ++$count;
+            }
+        }
+
+        return $removedRules;
+    }
+
     /**
      * Removes policy rules from the storage.
      * This is part of the Auto-Save feature.
@@ -315,12 +368,14 @@ public function loadFilteredPolicy(Model $model, $filter): void
             throw new InvalidFilterTypeException('invalid filter type');
         }
         $rows = $instance->get()->makeHidden(['created_at','updated_at', 'id'])->toArray();
-        foreach ($rows as $row) {
-            $row = array_filter($row, function($value) { return !is_null($value) && $value !== ''; });
-            $line = implode(', ', array_filter($row, function ($val) {
-                return '' != $val && !is_null($val);
-            }));
-            $this->loadPolicyLine(trim($line), $model);
+        if ($rows) {
+            foreach ($rows as $row) {
+                $row = array_filter($row, function($value) { return !is_null($value) && $value !== ''; });
+                $line = implode(', ', array_filter($row, function ($val) {
+                    return '' != $val && !is_null($val);
+                }));
+                $this->loadPolicyLine(trim($line), $model);
+            }
         }
         $this->setFiltered(true);
     }