Allow to resend e-mails when transport fails

src/Content/MailArchive/MailArchiveDefinition.php

@@ -4,6 +4,7 @@
 
 use Shopware\Core\Checkout\Customer\CustomerDefinition;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityDefinition;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\BoolField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\FkField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\AllowHtml;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\Flag\CascadeDelete;
@@ -46,6 +47,7 @@ protected function defineFields(): FieldCollection
             (new LongTextField('htmlText', 'htmlText'))->addFlags(new AllowHtml(), new SearchRanking(SearchRanking::LOW_SEARCH_RANKING)),
             (new LongTextField('eml', 'eml'))->addFlags(new AllowHtml()),
             (new StringField('eml_path', 'emlPath', 2048)),
+            (new BoolField('transport_failed', 'transportFailed'))->addFlags(new Required()),
 
             (new OneToManyAssociationField('attachments', MailArchiveAttachmentDefinition::class, 'mail_archive_id', 'id'))->addFlags(new CascadeDelete()),
 
@@ -54,6 +56,9 @@ protected function defineFields(): FieldCollection
 
             new FkField('customerId', 'customerId', CustomerDefinition::class),
             new ManyToOneAssociationField('customer', 'customerId', CustomerDefinition::class, 'id', true),
+
+            new FkField('source_mail_id', 'sourceMailId', self::class),
+            new ManyToOneAssociationField('sourceMail', 'source_mail_id', self::class, 'id', false),
         ]);
     }
 }

src/Content/MailArchive/MailArchiveEntity.php

@@ -22,6 +22,8 @@ class MailArchiveEntity extends Entity
 
     protected ?string $htmlText;
 
+    protected bool $transportFailed = false;
+
     /**
      * @deprecated will not be filled anyone. Use emlPath instead
      */
@@ -40,6 +42,10 @@ class MailArchiveEntity extends Entity
     /** @var EntityCollection<MailArchiveAttachmentEntity>|null $attachments */
     protected ?EntityCollection $attachments = null;
 
+    protected ?string $sourceMailId;
+
+    protected ?MailArchiveEntity $sourceMail;
+
     public function getSender(): array
     {
         return $this->sender;
@@ -171,4 +177,35 @@ public function setAttachments(EntityCollection $attachments): void
     {
         $this->attachments = $attachments;
     }
+
+    public function isTransportFailed(): bool
+    {
+        return $this->transportFailed;
+    }
+
+    public function setTransportFailed(bool $transportFailed): void
+    {
+        $this->transportFailed = $transportFailed;
+    }
+
+    public function getSourceMailId(): ?string
+    {
+        return $this->sourceMailId;
+    }
+
+    public function setSourceMailId(?string $sourceMailId): void
+    {
+        $this->sourceMailId = $sourceMailId;
+    }
+
+    public function getSourceMail(): ?MailArchiveEntity
+    {
+        return $this->sourceMail;
+    }
+
+    public function setSourceMail(?MailArchiveEntity $sourceMail): void
+    {
+        $this->sourceMail = $sourceMail;
+    }
+
 }

src/Controller/Api/MailArchiveController.php

@@ -6,13 +6,14 @@
 use Frosh\MailArchive\Content\MailArchive\MailArchiveEntity;
 use Frosh\MailArchive\Content\MailArchive\MailArchiveException;
 use Frosh\MailArchive\Services\EmlFileManager;
-use Frosh\MailArchive\Services\MailSender;
+use Shopware\Core\Content\Mail\Service\AbstractMailSender;
+use Shopware\Core\Content\Mail\Service\MailSender;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\PlatformRequest;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -30,13 +31,14 @@ class MailArchiveController extends AbstractController
     public function __construct(
         private readonly EntityRepository $froshMailArchiveRepository,
         private readonly EntityRepository $froshMailArchiveAttachmentRepository,
-        private readonly MailSender $mailSender,
+        #[Autowire(service: MailSender::class)]
+        private readonly AbstractMailSender $mailSender,
         private readonly RequestStack $requestStack,
         private readonly EmlFileManager $emlFileManager
     ) {
     }
 
-    #[Route(path: '/api/_action/frosh-mail-archive/resend-mail')]
+    #[Route(path: '/api/_action/frosh-mail-archive/resend-mail', name: 'api.action.frosh-mail-archive.resend-mail')]
     public function resend(Request $request): JsonResponse
     {
         $mailId = $request->request->get('mailId');

src/Migration/Migration1694519020TransportFailed.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Frosh\MailArchive\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Migration\MigrationStep;
+
+class Migration1694519020TransportFailed extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1694519020;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $connection->executeStatement('ALTER TABLE `frosh_mail_archive` ADD `transport_failed` TINYINT(1) NOT NULL DEFAULT 0;');
+    }
+
+    public function updateDestructive(Connection $connection): void
+    {
+    }
+}

src/Migration/Migration1694604822AddSourceMailId.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Frosh\MailArchive\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Framework\Migration\MigrationStep;
+
+class Migration1694604822AddSourceMailId extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1694604822;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $connection->executeStatement("ALTER TABLE `frosh_mail_archive` ADD `source_mail_id` BINARY(16) NULL;");
+    }
+
+    public function updateDestructive(Connection $connection): void
+    {
+    }
+}

src/Resources/app/administration/src/main.js

@@ -1,3 +1,4 @@
 import './init/api.init';
 import './module/frosh-mail-archive';
 import './component/notification-sw-admin';
+

src/Resources/app/administration/src/module/frosh-mail-archive/component/frosh-mail-resend-history/frosh-mail-resend-history.html.twig

@@ -0,0 +1,42 @@
+<sw-card :title="$tc('frosh-mail-archive.detail.resend-grid.title')">
+    <template #grid>
+        <sw-data-grid
+            :isLoading="isLoading"
+            :data-source="resentMails"
+            :columns="columns"
+            :allowInlineEdit="false"
+            :allowColumnEdit="false"
+            :showSettings="false"
+            :showSelection="false"
+        >
+            <template #column-createdAt="{item}">
+                <router-link :to="{ name: 'frosh.mail.archive.detail', params: { id: item.id } }">
+                    {{ item.createdAt|date }} <span v-if="currentMailId === item.id">({{ $tc('frosh-mail-archive.detail.resend-grid.currently-selected') }})</span>
+                </router-link>
+            </template>
+            <template #column-success="{item}">
+                <div v-if="!item.transportFailed">
+                    <sw-color-badge
+                        color="#37d046"
+                        rounded
+                    />
+                    {{ $tc('frosh-mail-archive.detail.resend-grid.success-label') }}
+                </div>
+                <div v-else>
+                    <sw-color-badge
+                        color="#de294c"
+                        rounded
+                    />
+                    {{ $tc('frosh-mail-archive.detail.resend-grid.failed-label') }}
+                </div>
+            </template>
+            <template #actions="{ item }">
+                <sw-context-menu-item
+                    @click="navigateToDetailPage(item.id)"
+                >
+                    {{ $tc('frosh-mail-archive.detail.resend-grid.navigate') }}
+                </sw-context-menu-item>
+            </template>
+        </sw-data-grid>
+    </template>
+</sw-card>

src/Resources/app/administration/src/module/frosh-mail-archive/component/frosh-mail-resend-history/index.js

@@ -0,0 +1,57 @@
+const { Criteria } = Shopware.Data;
+import template from './frosh-mail-resend-history.html.twig';
+
+Shopware.Component.register('frosh-mail-resend-history', {
+    props: {
+        sourceMailId: {
+            required: true,
+            type: String
+        },
+        currentMailId: {
+            required: true,
+            type: String
+        }
+    },
+    template,
+    data() {
+        return {
+            resentMails: [],
+            isLoading: false,
+            columns: [{
+                property: 'createdAt',
+                label: this.$tc('frosh-mail-archive.detail.resend-grid.column-created-at'),
+                primary: true,
+            }, {
+                property: 'success',
+                label: this.$tc('frosh-mail-archive.detail.resend-grid.column-state'),
+                sortable: false,
+            }]
+        }
+    },
+    inject: ['repositoryFactory'],
+    computed: {
+        mailArchiveRepository() {
+            return this.repositoryFactory.create('frosh_mail_archive');
+        }
+    },
+    async created(){
+        this.isLoading = true;
+        await this.loadMails();
+        this.isLoading = false;
+    },
+    methods: {
+        async loadMails(){
+            const criteria = new Criteria();
+            criteria.addFilter(Criteria.multi('OR', [
+                Criteria.equals('id', this.sourceMailId),
+                Criteria.equals('sourceMailId', this.sourceMailId)
+            ]));
+            criteria.addSorting(Criteria.sort('createdAt', 'DESC'));
+
+            this.resentMails = await this.mailArchiveRepository.search(criteria, Shopware.Context.api);
+        },
+        navigateToDetailPage(id){
+            this.$router.push({ name: 'frosh.mail.archive.detail', params: { id } })
+        }
+    }
+});

src/Resources/app/administration/src/module/frosh-mail-archive/index.js

@@ -1,5 +1,6 @@
 import './page/frosh-mail-archive-index/index';
 import './page/frosh-mail-archive-detail/index';
+import './component/frosh-mail-resend-history'
 
 Shopware.Module.register('frosh-mail-archive', {
     type: 'plugin',
@@ -20,7 +21,12 @@ Shopware.Module.register('frosh-mail-archive', {
             path: 'detail/:id',
             meta: {
                 parentPath: 'frosh.mail.archive.list'
-            }
+            },
+            props: {
+                default: ($route) => {
+                    return { archiveId: $route.params.id };
+                },
+            },
         }
     },
 

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-detail/frosh-mail-archive-detail.scss

@@ -9,3 +9,7 @@
         white-space: pre-line;
     }
 }
+
+.frosh-mail-archive__detail-alert {
+    max-width: 960px;
+}

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-detail/frosh-mail-archive-detail.twig

@@ -8,17 +8,24 @@
             {{ $tc('frosh-mail-archive.detail.toolbar.customer') }}
         </sw-button>
 
-        <sw-button-process :isLoading="downloadIsLoading" :processSuccess="downloadIsSuccessful" @click="downloadMail">
+        <sw-button-process :isLoading="downloadIsLoading" :processSuccess="downloadIsSuccessful" @click="downloadMail" @process-finish="downloadFinish">
             {{ $tc('frosh-mail-archive.detail.toolbar.downloadEml') }}
         </sw-button-process>
 
-        <sw-button-process :isLoading="resendIsLoading" :processSuccess="resendIsSuccessful" @click="resendMail">
+        <sw-button-process :isLoading="resendIsLoading" :processSuccess="resendIsSuccessful" @click="resendMail" @process-finish="resendFinish">
             {{ $tc('frosh-mail-archive.detail.toolbar.resend') }}
         </sw-button-process>
     </template>
 
     <template slot="content">
         <sw-card-view v-if="archive">
+            <sw-alert
+                v-if="archive.transportFailed"
+                variant="warning"
+                class="frosh-mail-archive__detail-alert"
+            >
+                {{ $tc('frosh-mail-archive.detail.alert.transportFailed') }}
+            </sw-alert>
             <sw-card
                     :title="$tc('frosh-mail-archive.detail.metadata.title')"
                     position-identifier="frosh-mail-archive-metadata"
@@ -29,6 +36,7 @@
                 <sw-text-field :label="$tc('frosh-mail-archive.detail.metadata.subject')" :disabled="true" v-model="archive.subject"></sw-text-field>
                 <sw-text-field :label="$tc('frosh-mail-archive.detail.metadata.salesChannel')" v-if="archive.salesChannel" :disabled="true" v-model="archive.salesChannel.name"></sw-text-field>
             </sw-card>
+            <frosh-mail-resend-history :key="resendKey" :currentMailId="archive.id" :sourceMailId="archive.sourceMailId ?? archive.id"/>
             <sw-card
                     :title="$tc('frosh-mail-archive.detail.content.title')"
                     position-identifier="frosh-mail-archive-content"