Add: fields to export

Author: tatevikg1

src/Domain/Subscription/Model/Subscriber.php

@@ -45,7 +45,7 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     protected ?DateTime $createdAt = null;
 
     #[ORM\Column(name: 'modified', type: 'datetime', nullable: false)]
-    private DateTime $updatedAt;
+    private ?DateTime $updatedAt = null;
 
     #[ORM\Column(unique: true)]
     private string $email = '';
@@ -134,7 +134,7 @@ public function getCreatedAt(): ?DateTime
         return $this->createdAt;
     }
 
-    public function getUpdatedAt(): DateTime
+    public function getUpdatedAt(): ?DateTime
     {
         return $this->updatedAt;
     }

src/Domain/Subscription/Service/SubscriberCsvExporter.php

@@ -50,7 +50,12 @@ public function exportToCsv(?SubscriberFilter $filter = null, int $batchSize = 1
         $tempFilePath = tempnam(sys_get_temp_dir(), 'subscribers_export_');
         $this->logger->debug('Created temporary file for export', ['path' => $tempFilePath]);
 
-        $this->generateCsvContent($filter, $batchSize, $tempFilePath, $filter->getColumns());
+        $this->generateCsvContent(
+            filter: $filter,
+            batchSize: $batchSize,
+            filePath: $tempFilePath,
+            columns: $filter->getColumns(),
+        );
 
         $response = new BinaryFileResponse($tempFilePath);
         $response = $this->configureResponse($response);
@@ -80,10 +85,16 @@ private function generateCsvContent(
         /** @var SubscriberAttributeDefinition[] $attributeDefinitions */
         $attributeDefinitions = $this->definitionRepository->findAll();
 
-        $headers = $this->getExportHeaders($attributeDefinitions, $columns);
+        $headers = $this->getExportHeaders(attributeDefinitions: $attributeDefinitions, columns: $columns);
         fputcsv($handle, $headers);
 
-        $this->exportSubscribers($handle, $filter, $batchSize, $attributeDefinitions, $headers);
+        $this->exportSubscribers(
+            handle: $handle,
+            filter: $filter,
+            batchSize: $batchSize,
+            attributeDefinitions: $attributeDefinitions,
+            headers: $headers,
+        );
 
         fclose($handle);
     }
@@ -97,12 +108,20 @@ private function generateCsvContent(
     private function getExportHeaders(array $attributeDefinitions, array $columns): array
     {
         $headers = [
+            'id',
             'email',
             'confirmed',
             'blacklisted',
+//        'manualConfirm',
+            'bounceCount',
+            'createdAt',
+            'updatedAt',
+            'uniqueId',
             'htmlEmail',
+            'rssFrequency',
             'disabled',
             'extraData',
+            'foreignKey',
         ];
 
         foreach ($attributeDefinitions as $definition) {
@@ -158,7 +177,11 @@ private function exportSubscribers(
             ]);
 
             foreach ($subscribers as $subscriber) {
-                $row = $this->getSubscriberRow($subscriber, $attributeDefinitions, $headers);
+                $row = $this->getSubscriberRow(
+                    subscriber: $subscriber,
+                    attributeDefinitions: $attributeDefinitions,
+                    headers: $headers,
+                );
                 fputcsv($handle, $row);
                 $lastId = $subscriber->getId();
             }
@@ -193,9 +216,16 @@ private function getSubscriberRow(Subscriber $subscriber, array $attributeDefini
             'email' => $subscriber->getEmail(),
             'confirmed' => $subscriber->isConfirmed() ? '1' : '0',
             'blacklisted' => $subscriber->isBlacklisted() ? '1' : '0',
+//            'manualConfirm' => $subscriber,
+            'bounceCount' => $subscriber->getBounceCount(),
+            'createdAt' => $subscriber->getCreatedAt()?->format('Y-m-d H:i:s') ?? '',
+            'updatedAt' => $subscriber->getUpdatedAt()?->format('Y-m-d H:i:s') ?? '',
+            'uniqueId' => $subscriber->getUniqueId(),
             'htmlEmail' => $subscriber->hasHtmlEmail() ? '1' : '0',
+            'rssFrequency' => $subscriber->getRssFrequency(),
             'disabled' => $subscriber->isDisabled() ? '1' : '0',
-            'extraData' => $subscriber->getExtraData(),
+            'extraData' => $subscriber->getExtraData() ?? '',
+            'foreignKey' => $subscriber->getForeignKey() ?? '',
         ];
 
         foreach ($attributeDefinitions as $definition) {