From c50eb54ad832a2b7191c89e6d65807349a5a99aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=A0pa=C4=8Dek?= Date: Fri, 21 Jul 2023 22:24:57 +0200 Subject: [PATCH] Move training emails related services to Mails directory and rename services to how they're used --- site/app/Admin/Presenters/EmailsPresenter.php | 4 ++-- site/app/Admin/Presenters/HomepagePresenter.php | 4 ++-- site/app/Form/TrainingApplicationFormFactory.php | 4 ++-- site/app/Form/TrainingMailsOutboxFormFactory.php | 4 ++-- site/app/Training/Applications/TrainingApplication.php | 4 ++-- .../Training/Applications/TrainingApplicationFactory.php | 2 +- site/app/Training/{ => Mails}/MailMessageAdmin.php | 4 ++-- .../Training/{ => Mails}/TrainingMailMessageFactory.php | 3 ++- site/app/Training/{Mails.php => Mails/TrainingMails.php} | 7 ++++--- .../{mails => Mails/templates}/admin/invitation.latte | 0 .../{mails => Mails/templates}/admin/invoice.latte | 0 .../{mails => Mails/templates}/admin/invoiceAfter.latte | 0 .../templates}/admin/invoiceAfterProforma.latte | 0 .../{mails => Mails/templates}/admin/materials.latte | 0 .../templates}/admin/materialsFamiliar.latte | 0 .../{mails => Mails/templates}/admin/reminder.latte | 0 .../{mails => Mails/templates}/admin/reminderRemote.latte | 0 .../Training/{mails => Mails/templates}/signature.latte | 0 .../{mails => Mails/templates}/trainingSignUp.latte | 0 site/config/services.neon | 4 ++-- .../{ => Mails}/TrainingMailMessageFactoryTest.phpt | 5 +++-- 21 files changed, 24 insertions(+), 21 deletions(-) rename site/app/Training/{ => Mails}/MailMessageAdmin.php (75%) rename site/app/Training/{ => Mails}/TrainingMailMessageFactory.php (96%) rename site/app/Training/{Mails.php => Mails/TrainingMails.php} (98%) rename site/app/Training/{mails => Mails/templates}/admin/invitation.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/invoice.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/invoiceAfter.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/invoiceAfterProforma.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/materials.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/materialsFamiliar.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/reminder.latte (100%) rename site/app/Training/{mails => Mails/templates}/admin/reminderRemote.latte (100%) rename site/app/Training/{mails => Mails/templates}/signature.latte (100%) rename site/app/Training/{mails => Mails/templates}/trainingSignUp.latte (100%) rename site/tests/Training/{ => Mails}/TrainingMailMessageFactoryTest.phpt (97%) diff --git a/site/app/Admin/Presenters/EmailsPresenter.php b/site/app/Admin/Presenters/EmailsPresenter.php index 4ef82e51a..4138b6ee1 100644 --- a/site/app/Admin/Presenters/EmailsPresenter.php +++ b/site/app/Admin/Presenters/EmailsPresenter.php @@ -5,7 +5,7 @@ use MichalSpacekCz\Form\TrainingMailsOutboxFormFactory; use MichalSpacekCz\Training\Applications\TrainingApplication; -use MichalSpacekCz\Training\Mails; +use MichalSpacekCz\Training\Mails\TrainingMails; use Nette\Application\UI\Form; class EmailsPresenter extends BasePresenter @@ -16,7 +16,7 @@ class EmailsPresenter extends BasePresenter public function __construct( - private readonly Mails $trainingMails, + private readonly TrainingMails $trainingMails, private readonly TrainingMailsOutboxFormFactory $trainingMailsOutboxFactory, ) { parent::__construct(); diff --git a/site/app/Admin/Presenters/HomepagePresenter.php b/site/app/Admin/Presenters/HomepagePresenter.php index 57857d751..93ab991f8 100644 --- a/site/app/Admin/Presenters/HomepagePresenter.php +++ b/site/app/Admin/Presenters/HomepagePresenter.php @@ -11,7 +11,7 @@ use MichalSpacekCz\Training\DateList\TrainingApplicationsListFactory; use MichalSpacekCz\Training\Dates\TrainingDates; use MichalSpacekCz\Training\Dates\UpcomingTrainingDates; -use MichalSpacekCz\Training\Mails; +use MichalSpacekCz\Training\Mails\TrainingMails; use MichalSpacekCz\Training\Preliminary\PreliminaryTrainings; class HomepagePresenter extends BasePresenter @@ -23,7 +23,7 @@ class HomepagePresenter extends BasePresenter public function __construct( private readonly TrainingApplications $trainingApplications, private readonly PreliminaryTrainings $trainingPreliminaryApplications, - private readonly Mails $trainingMails, + private readonly TrainingMails $trainingMails, private readonly TrainingDates $trainingDates, private readonly UpcomingTrainingDates $upcomingTrainingDates, private readonly Certificates $certificates, diff --git a/site/app/Form/TrainingApplicationFormFactory.php b/site/app/Form/TrainingApplicationFormFactory.php index 67e312fe3..9a72f2d41 100644 --- a/site/app/Form/TrainingApplicationFormFactory.php +++ b/site/app/Form/TrainingApplicationFormFactory.php @@ -15,7 +15,7 @@ use MichalSpacekCz\Training\Exceptions\TrainingDateNotUpcomingException; use MichalSpacekCz\Training\FormDataLogger; use MichalSpacekCz\Training\FormSpam; -use MichalSpacekCz\Training\Mails; +use MichalSpacekCz\Training\Mails\TrainingMails; use Nette\Application\Application as NetteApplication; use Nette\Application\UI\Form; use Nette\Application\UI\Presenter; @@ -37,7 +37,7 @@ public function __construct( private readonly FormDataLogger $formDataLogger, private readonly FormSpam $formSpam, private readonly TrainingApplicationStorage $trainingApplicationStorage, - private readonly Mails $trainingMails, + private readonly TrainingMails $trainingMails, private readonly TemplateFactory $templateFactory, private readonly NetteApplication $netteApplication, ) { diff --git a/site/app/Form/TrainingMailsOutboxFormFactory.php b/site/app/Form/TrainingMailsOutboxFormFactory.php index 0a53f854d..57ba7d002 100644 --- a/site/app/Form/TrainingMailsOutboxFormFactory.php +++ b/site/app/Form/TrainingMailsOutboxFormFactory.php @@ -7,7 +7,7 @@ use MichalSpacekCz\Templating\TemplateFactory; use MichalSpacekCz\Training\Applications\TrainingApplication; use MichalSpacekCz\Training\Applications\TrainingApplicationStorage; -use MichalSpacekCz\Training\Mails; +use MichalSpacekCz\Training\Mails\TrainingMails; use MichalSpacekCz\Training\Statuses; use Nette\Application\Application as NetteApplication; use Nette\Application\UI\Form; @@ -21,7 +21,7 @@ public function __construct( private readonly FormFactory $factory, private readonly TrainingApplicationStorage $trainingApplicationStorage, private readonly Statuses $trainingStatuses, - private readonly Mails $trainingMails, + private readonly TrainingMails $trainingMails, private readonly TemplateFactory $templateFactory, private readonly NetteApplication $netteApplication, ) { diff --git a/site/app/Training/Applications/TrainingApplication.php b/site/app/Training/Applications/TrainingApplication.php index 562d5a6db..4310879d5 100644 --- a/site/app/Training/Applications/TrainingApplication.php +++ b/site/app/Training/Applications/TrainingApplication.php @@ -7,9 +7,9 @@ use MichalSpacekCz\Training\Files\TrainingFile; use MichalSpacekCz\Training\Files\TrainingFiles; use MichalSpacekCz\Training\Files\TrainingFilesCollection; -use MichalSpacekCz\Training\MailMessageAdmin; +use MichalSpacekCz\Training\Mails\MailMessageAdmin; +use MichalSpacekCz\Training\Mails\TrainingMailMessageFactory; use MichalSpacekCz\Training\Statuses; -use MichalSpacekCz\Training\TrainingMailMessageFactory; use Nette\Utils\Html; class TrainingApplication diff --git a/site/app/Training/Applications/TrainingApplicationFactory.php b/site/app/Training/Applications/TrainingApplicationFactory.php index a629a982e..2e81aa6c5 100644 --- a/site/app/Training/Applications/TrainingApplicationFactory.php +++ b/site/app/Training/Applications/TrainingApplicationFactory.php @@ -5,9 +5,9 @@ use MichalSpacekCz\Formatter\TexyFormatter; use MichalSpacekCz\Training\Files\TrainingFiles; +use MichalSpacekCz\Training\Mails\TrainingMailMessageFactory; use MichalSpacekCz\Training\Price; use MichalSpacekCz\Training\Statuses; -use MichalSpacekCz\Training\TrainingMailMessageFactory; use Nette\Database\Row; use ParagonIE\Halite\Alerts\HaliteAlert; use SodiumException; diff --git a/site/app/Training/MailMessageAdmin.php b/site/app/Training/Mails/MailMessageAdmin.php similarity index 75% rename from site/app/Training/MailMessageAdmin.php rename to site/app/Training/Mails/MailMessageAdmin.php index 25d07f084..cdd9ca4ee 100644 --- a/site/app/Training/MailMessageAdmin.php +++ b/site/app/Training/Mails/MailMessageAdmin.php @@ -1,7 +1,7 @@ getBasename()); + return sprintf('%s/templates/admin/%s.latte', __DIR__, $this->getBasename()); } diff --git a/site/app/Training/TrainingMailMessageFactory.php b/site/app/Training/Mails/TrainingMailMessageFactory.php similarity index 96% rename from site/app/Training/TrainingMailMessageFactory.php rename to site/app/Training/Mails/TrainingMailMessageFactory.php index cd34fc4c5..570cad1bc 100644 --- a/site/app/Training/TrainingMailMessageFactory.php +++ b/site/app/Training/Mails/TrainingMailMessageFactory.php @@ -1,11 +1,12 @@ setFile(__DIR__ . '/mails/trainingSignUp.latte'); + $template->setFile(__DIR__ . '/templates/trainingSignUp.latte'); $template->training = $training; $template->trainingName = $trainingName; diff --git a/site/app/Training/mails/admin/invitation.latte b/site/app/Training/Mails/templates/admin/invitation.latte similarity index 100% rename from site/app/Training/mails/admin/invitation.latte rename to site/app/Training/Mails/templates/admin/invitation.latte diff --git a/site/app/Training/mails/admin/invoice.latte b/site/app/Training/Mails/templates/admin/invoice.latte similarity index 100% rename from site/app/Training/mails/admin/invoice.latte rename to site/app/Training/Mails/templates/admin/invoice.latte diff --git a/site/app/Training/mails/admin/invoiceAfter.latte b/site/app/Training/Mails/templates/admin/invoiceAfter.latte similarity index 100% rename from site/app/Training/mails/admin/invoiceAfter.latte rename to site/app/Training/Mails/templates/admin/invoiceAfter.latte diff --git a/site/app/Training/mails/admin/invoiceAfterProforma.latte b/site/app/Training/Mails/templates/admin/invoiceAfterProforma.latte similarity index 100% rename from site/app/Training/mails/admin/invoiceAfterProforma.latte rename to site/app/Training/Mails/templates/admin/invoiceAfterProforma.latte diff --git a/site/app/Training/mails/admin/materials.latte b/site/app/Training/Mails/templates/admin/materials.latte similarity index 100% rename from site/app/Training/mails/admin/materials.latte rename to site/app/Training/Mails/templates/admin/materials.latte diff --git a/site/app/Training/mails/admin/materialsFamiliar.latte b/site/app/Training/Mails/templates/admin/materialsFamiliar.latte similarity index 100% rename from site/app/Training/mails/admin/materialsFamiliar.latte rename to site/app/Training/Mails/templates/admin/materialsFamiliar.latte diff --git a/site/app/Training/mails/admin/reminder.latte b/site/app/Training/Mails/templates/admin/reminder.latte similarity index 100% rename from site/app/Training/mails/admin/reminder.latte rename to site/app/Training/Mails/templates/admin/reminder.latte diff --git a/site/app/Training/mails/admin/reminderRemote.latte b/site/app/Training/Mails/templates/admin/reminderRemote.latte similarity index 100% rename from site/app/Training/mails/admin/reminderRemote.latte rename to site/app/Training/Mails/templates/admin/reminderRemote.latte diff --git a/site/app/Training/mails/signature.latte b/site/app/Training/Mails/templates/signature.latte similarity index 100% rename from site/app/Training/mails/signature.latte rename to site/app/Training/Mails/templates/signature.latte diff --git a/site/app/Training/mails/trainingSignUp.latte b/site/app/Training/Mails/templates/trainingSignUp.latte similarity index 100% rename from site/app/Training/mails/trainingSignUp.latte rename to site/app/Training/Mails/templates/trainingSignUp.latte diff --git a/site/config/services.neon b/site/config/services.neon index 6ac100225..7e1dd4068 100644 --- a/site/config/services.neon +++ b/site/config/services.neon @@ -115,7 +115,8 @@ services: - MichalSpacekCz\Training\FormDataLogger - MichalSpacekCz\Training\FormSpam - MichalSpacekCz\Training\FreeSeats - - MichalSpacekCz\Training\Mails(emailFrom: 'Michal Špaček ', phoneNumber: %contact.phoneNumber%) + - MichalSpacekCz\Training\Mails\TrainingMailMessageFactory + - MichalSpacekCz\Training\Mails\TrainingMails(emailFrom: 'Michal Špaček ', phoneNumber: %contact.phoneNumber%) - MichalSpacekCz\Training\Preliminary\PreliminaryTrainings - MichalSpacekCz\Training\Prices(vatRate: %vatRate%) - MichalSpacekCz\Training\Resolver\Vrana @@ -123,7 +124,6 @@ services: - MichalSpacekCz\Training\Reviews\TrainingReviews - MichalSpacekCz\Training\Statuses - MichalSpacekCz\Training\TrainingLocales - - MichalSpacekCz\Training\TrainingMailMessageFactory - MichalSpacekCz\Training\Trainings\TrainingFactory - MichalSpacekCz\Training\Trainings\Trainings - MichalSpacekCz\Training\Venues\TrainingVenues diff --git a/site/tests/Training/TrainingMailMessageFactoryTest.phpt b/site/tests/Training/Mails/TrainingMailMessageFactoryTest.phpt similarity index 97% rename from site/tests/Training/TrainingMailMessageFactoryTest.phpt rename to site/tests/Training/Mails/TrainingMailMessageFactoryTest.phpt index 75b4c5ddf..235db749c 100644 --- a/site/tests/Training/TrainingMailMessageFactoryTest.phpt +++ b/site/tests/Training/Mails/TrainingMailMessageFactoryTest.phpt @@ -1,7 +1,7 @@