Merge pull request #32 from Garagist/feature/save_multiple_sent

Save multiple sent dates
Garagist · Sep 27, 2022 · 44b450f · 44b450f
2 parents 1f4c24d + 8e81e6b
commit 44b450f
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 38 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -502,6 +502,7 @@ public function createAction(
         }
 
         $properties = [
+            "sent" => [],
             "subject" => $subject,
             "previewText" => $this->mauticService->cleanPreviewText($previewText),
             "segments" => $convertedSegments,

diff --git a/Classes/Domain/Model/MauticEmail.php b/Classes/Domain/Model/MauticEmail.php
@@ -94,12 +94,6 @@ class MauticEmail
     protected $dateModified;
 
 
-    /**
-     * @var DateTime
-     * @ORM\Column(nullable=true)
-     */
-    protected $dateSent;
-
     /**
      * @var string
      */
@@ -226,22 +220,6 @@ public function setDateCreated(DateTime $dateCreated): void
         $this->dateCreated = $dateCreated;
     }
 
-    /**
-     * @return DateTime|null
-     */
-    public function getDateSent(): ?DateTime
-    {
-        return $this->dateSent ?? null;
-    }
-
-    /**
-     * @param DateTime $dateSent
-     */
-    public function setDateSent(DateTime $dateSent): void
-    {
-        $this->dateSent = $dateSent;
-    }
-
     /**
      * @return string
      */

diff --git a/Classes/Service/MauticService.php b/Classes/Service/MauticService.php
@@ -294,7 +294,11 @@ public function sendEmail(MauticEmail $email, $mauticIdentifier): void
             $sentCount = (int) $stats['sentCount'];
             $failedRecipients = (int) $stats['failedRecipients'];
 
-            $email->setDateSent(new DateTime());
+            // Add sent date to email
+            $sent = $email->getProperty('sent') || [];
+            $sent[] = time();
+            $email->setProperty('sent', $sent);
+
             $this->mauticEmailRepository->update($email);
 
             $eventSuccess = new MauticEmailSent($emailIdentifier, $mauticIdentifier, $success, $sentCount, $failedRecipients);

diff --git a/Migrations/Mysql/Version20220926153231.php b/Migrations/Mysql/Version20220926153231.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Flow\Persistence\Doctrine\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+
+final class Version20220926153231 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->abortIf(
+            !$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDb1027Platform,
+            "Migration can only be executed safely on '\Doctrine\DBAL\Platforms\MariaDb1027Platform'."
+        );
+
+        $this->addSql('ALTER TABLE garagist_mautic_domain_model_mauticemail DROP datesent');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->abortIf(
+            !$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MariaDb1027Platform,
+            "Migration can only be executed safely on '\Doctrine\DBAL\Platforms\MariaDb1027Platform'."
+        );
+
+        $this->addSql('ALTER TABLE garagist_mautic_domain_model_mauticemail ADD datesent DATETIME DEFAULT NULL');
+    }
+}
diff --git a/Resources/Private/Modules/Component/EmailData.fusion b/Resources/Private/Modules/Component/EmailData.fusion
@@ -9,11 +9,12 @@ prototype(Garagist.Mautic:Component.EmailData) < prototype(Neos.Fusion:Component
         name = ${props.email.name}
         dateCreated = ${Date.format(props.email.dateCreated, 'd.m.Y H:m:s')}
         emailIdentifier = ${props.email.emailIdentifier}
+
         properties = ${props.email.properties}
-        subject = ${this.properties ? this.properties.subject : null}
-        previewText = ${this.properties ? this.properties.previewText : null}
-        segments = ${this.properties ? this.properties.segments : null}
-        dateSent = ${props.email.dateSent ? Date.format(props.email.dateSent, 'd.m.Y H:m:s') : '–'}
+        subject = ${this.properties.subject}
+        previewText = ${this.properties.previewText}
+        segments = ${this.properties.segments}
+        sent = ${Array.sort(props.email.properties.sent)}
         hrefArguments = Neos.Fusion:DataStructure {
             node = ${props.node}
             email = ${props.email}
@@ -22,17 +23,17 @@ prototype(Garagist.Mautic:Component.EmailData) < prototype(Neos.Fusion:Component
         task = ${props.email.task}
 
         isIdle = ${props.email.task == 'idle'}
-        isSended = ${props.email.dateSent}
-        canPublish = ${this.isIdle && (props.email.dateModified != null && props.email.dateSend == null && !props.email.published)}
-        canUnpublish = ${this.isIdle && (props.email.dateSent == null && props.email.published)}
+        isSended = ${Carbon.Array.check(props.email.properties.sent)}
+        canPublish = ${this.isIdle && (props.email.dateModified != null && !this.isSended && !props.email.published)}
+        canUnpublish = ${this.isIdle && (!this.isSended && props.email.published)}
         canTest = ${this.canPublish || this.canUnpublish}
         canEdit = ${this.canPublish}
-        canSend = ${this.isIdle && (props.email.dateSent == null && props.email.published)}
-        canUpdate = ${this.isIdle && this.properties && (props.email.dateSent == null && !props.email.published)}
+        canSend = ${this.isIdle && (!this.isSended && props.email.published)}
+        canUpdate = ${this.isIdle && this.properties && (!this.isSended && !props.email.published)}
         canResend = ${this.isIdle && this.isSended}
         canDelete= ${this.isIdle}
-        canPublishAndSend = ${this.isIdle && (props.email.dateModified != null && props.email.dateSend == null)}
-        canUnpublishAndUpdate = ${this.isIdle && (props.email.dateSent == null)}
+        canPublishAndSend = ${this.isIdle && (props.email.dateModified != null && !this.isSended)}
+        canUnpublishAndUpdate = ${this.isIdle && !this.isSended}
 
         isRunning = ${props.email.task != 'idle' && props.email.task != 'failed'}
         isFailed = ${props.email.task == 'failed'}

diff --git a/Resources/Private/Modules/Views/Detail.fusion b/Resources/Private/Modules/Views/Detail.fusion
@@ -48,7 +48,12 @@ Garagist.Mautic.BackendController.detail = Neos.Fusion:Component {
                             </tr>
                             <tr @if={props.emailData.isSended}>
                                 <td>{props._i18n.id('sentOn').translate()}</td>
-                                <td>{props.emailData.dateSent}</td>
+                                <td>
+                                    <Neos.Fusion:Loop items={props.emailData.sent}>
+                                        {props._i18n.id('dateAndTime').arguments([Date.format(item, 'd.m.Y'), Date.format(item, 'H:m:s')]).translate()}
+                                        <br @if={!iterator.isLast} />
+                                    </Neos.Fusion:Loop>
+                                </td>
                             </tr>
                             <tr>
                                 <td>{props._i18n.id('subject').translate()}</td>

diff --git a/Resources/Private/Modules/Views/Node.fusion b/Resources/Private/Modules/Views/Node.fusion
@@ -83,11 +83,18 @@ Garagist.Mautic.BackendController.node = Neos.Fusion:Component {
                                         {props.title}
                                     </td>
                                     <td>{item.dateCreated}</td>
-                                    <td>{item.dateSent}</td>
-                                    <td>{item.properties ? item.properties.recipients : ''}</td>
+                                    <td>
+                                        <Neos.Fusion:Loop items={item.sent}>
+                                            <span aria-label={props._i18n.id('dateAndTime').arguments([Date.format(item, 'd.m.Y'), Date.format(item, 'H:m:s')]).translate()}>
+                                                {Date.format(item, 'd.m.Y')}
+                                            </span>
+                                            {iterator.isLast ? '' : ', '}
+                                        </Neos.Fusion:Loop>
+                                    </td>
+                                    <td>{item.properties.recipients}</td>
                                     <td class="neos-action">
                                         <div
-                                            x-data={"actions(" + (item.properties ? "2" : "1") + ")"}
+                                            x-data="actions(2)"
                                             class="neos-pull-right"
                                         >
                                             <Garagist.Mautic:Component.EmailActionButtons {...item} />

diff --git a/Resources/Private/Translations/de/Module.xlf b/Resources/Private/Translations/de/Module.xlf
@@ -45,6 +45,10 @@
                 <source>Show pages without emails</source>
                 <target>Zeige Seiten ohne E-Mails</target>
             </trans-unit>
+            <trans-unit id="dateAndTime" xml:space="preserve">
+                <source>{0} at {1}</source>
+                <target>{0} um {1} Uhr</target>
+            </trans-unit>
             <trans-unit id="email.publish" xml:space="preserve">
                 <source>Publish email</source>
                 <target>E-Mail veröffentlichen</target>

diff --git a/Resources/Private/Translations/en/Module.xlf b/Resources/Private/Translations/en/Module.xlf
@@ -35,6 +35,9 @@
             <trans-unit id="showPagesWithoutEmails" xml:space="preserve">
                 <source>Show pages without emails</source>
             </trans-unit>
+            <trans-unit id="dateAndTime" xml:space="preserve">
+                <source>{0} at {1}</source>
+            </trans-unit>
             <trans-unit id="email.publish" xml:space="preserve">
                 <source>Publish email</source>
             </trans-unit>