Make deleted value configurable for SoftDeleteableFilter.php

Author: bartholdbos

src/Mapping/Annotation/SoftDeleteable.php

@@ -35,10 +35,12 @@ final class SoftDeleteable implements GedmoAnnotation
 
     public bool $hardDelete = true;
 
+    public $deletedValue = null;
+
     /**
      * @param array<string, mixed> $data
      */
-    public function __construct(array $data = [], string $fieldName = 'deletedAt', bool $timeAware = false, bool $hardDelete = true)
+    public function __construct(array $data = [], string $fieldName = 'deletedAt', bool $timeAware = false, bool $hardDelete = true, $deletedValue = null)
     {
         if ([] !== $data) {
             Deprecation::trigger(
@@ -53,12 +55,14 @@ public function __construct(array $data = [], string $fieldName = 'deletedAt', b
             $this->fieldName = $this->getAttributeValue($data, 'fieldName', $args, 1, $fieldName);
             $this->timeAware = $this->getAttributeValue($data, 'timeAware', $args, 2, $timeAware);
             $this->hardDelete = $this->getAttributeValue($data, 'hardDelete', $args, 3, $hardDelete);
+            $this->deletedValue = $this->getAttributeValue($data, 'deletedValue', $args, 4, $deletedValue);
 
             return;
         }
 
         $this->fieldName = $fieldName;
         $this->timeAware = $timeAware;
         $this->hardDelete = $hardDelete;
+        $this->deletedValue = $deletedValue;
     }
 }

src/SoftDeleteable/Filter/SoftDeleteableFilter.php

@@ -70,7 +70,7 @@ public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAli
 
         $column = $quoteStrategy->getColumnName($config['fieldName'], $targetEntity, $platform);
 
-        $addCondSql = $targetTableAlias.'.'.$column.' IS NULL';
+        $addCondSql = $targetTableAlias.'.'.$column.' '.$config['deletedValue'] === null ? 'IS NULL' : '= ' . $config['deletedValue'];
         if (isset($config['timeAware']) && $config['timeAware']) {
             $addCondSql = "({$addCondSql} OR {$targetTableAlias}.{$column} > {$platform->getCurrentTimestampSQL()})";
         }