fixed custom field name for archived_at

fastbolt · Dec 8, 2023 · 5c2ec12 · 5c2ec12
1 parent 285f324
commit 5c2ec12
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/src/ArchiveManager.php b/src/ArchiveManager.php
@@ -239,8 +239,11 @@ private function getTransaction(EntityArchivingConfiguration $configuration): Tr
         }
 
         // "archived_at" field may not exist in the original table, so we add it here
+        $archivingDateFieldName = $configuration->getArchivingDateFieldName();
         if ($configuration->isAddArchivedAtField()) {
-            $configuration->setArchivedFields(array_merge($configuration->getArchivedFields(), ['archived_at']));
+            $configuration->setArchivedFields(
+                array_merge($configuration->getArchivedFields(), [$archivingDateFieldName])
+            );
         }
 
         $this->applyFilters($configuration, $query);
@@ -253,7 +256,7 @@ private function getTransaction(EntityArchivingConfiguration $configuration): Tr
         if ($configuration->isAddArchivedAtField()) {
             $date = (new DateTime())->format('Y-m-d H:i:s');
             foreach ($result as &$item) {
-                $item['archived_at'] = $date;
+                $item[$archivingDateFieldName] = $date;
             }
         }
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -7,9 +7,9 @@
 
 class Configuration implements ConfigurationInterface
 {
-    private const ARCHIVE_TABLE_SUFFIX_DEFAULT = '_archive';
+    public const ARCHIVE_TABLE_SUFFIX_DEFAULT = '_archive';
 
-    private const ARCHIVING_DATE_FIELD_NAME_DEFAULT = 'archived_at';
+    public const ARCHIVING_DATE_FIELD_NAME_DEFAULT = 'archived_at';
 
     /**
      * @return TreeBuilder

diff --git a/src/Model/EntityArchivingConfiguration.php b/src/Model/EntityArchivingConfiguration.php
@@ -2,6 +2,7 @@
 
 namespace Fastbolt\EntityArchiverBundle\Model;
 
+use Fastbolt\EntityArchiverBundle\DependencyInjection\Configuration;
 use Fastbolt\EntityArchiverBundle\Strategy\EntityArchivingStrategy;
 
 class EntityArchivingConfiguration
@@ -26,7 +27,7 @@ class EntityArchivingConfiguration
 
     private bool $addArchivedAtField = false;
 
-    private string $archivingDateFieldName = 'archived_at';
+    private string $archivingDateFieldName = Configuration::ARCHIVING_DATE_FIELD_NAME_DEFAULT;
 
     /**
      * @return string

diff --git a/src/Model/Transaction.php b/src/Model/Transaction.php
@@ -58,6 +58,13 @@ class Transaction
      */
     private ClassMetadata $classMetaData;
 
+    /**
+     * Name of the field that holds the archiving date
+     *
+     * @var string
+     */
+    private string $archivedAtFieldName;
+
     /**
      * @return string
      */
@@ -215,4 +222,16 @@ public function setClassMetaData(ClassMetadata $classMetaData): Transaction
 
         return $this;
     }
+
+    public function getArchivedAtFieldName(): string
+    {
+        return $this->archivedAtFieldName;
+    }
+
+    public function setArchivedAtFieldName(string $archivedAtFieldName): Transaction
+    {
+        $this->archivedAtFieldName = $archivedAtFieldName;
+
+        return $this;
+    }
 }
diff --git a/src/Services/InsertInArchiveService.php b/src/Services/InsertInArchiveService.php
@@ -49,7 +49,7 @@ public function insertInArchive(array $changes, int $batchSize = 5000): void
 //                    $value = $this->escapeQuotationMarks($value);
 //                }
 
-                $change['archived_at'] = $date;
+                $change[$entityChange->getArchivedAtFieldName()] = $date;
                 $this->executeQuery($tableName, $columnNames, $change);
 
                 $counter++;

diff --git a/src/Services/MoveBetweenTablesService.php b/src/Services/MoveBetweenTablesService.php
@@ -57,7 +57,7 @@ public function moveToArchive(array $changes, int $batchSize = 1000): void
                     $value = $this->escapeQuotationMarks($value);
                 }
 
-                $change['archived_at'] = $date;
+                $change[$entityChange->getArchivedAtFieldName()] = $date;
             }
 
             $this->executeQuery($tableName, $archiveName, $columnNames, $changes, $batchSize);