Move training emails related services to Mails directory and rename s…

…ervices to how they're used

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();

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,

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,
 	) {

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,
 	) {

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

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;

site/app/Training/MailMessageAdmin.php → site/app/Training/Mails/MailMessageAdmin.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace MichalSpacekCz\Training;
+namespace MichalSpacekCz\Training\Mails;
 
 class MailMessageAdmin
 {
@@ -21,7 +21,7 @@ public function getBasename(): string
 
 	public function getFilename(): string
 	{
-		return sprintf('%s/mails/admin/%s.latte', __DIR__, $this->getBasename());
+		return sprintf('%s/templates/admin/%s.latte', __DIR__, $this->getBasename());
 	}
 
 

site/app/Training/TrainingMailMessageFactory.php → site/app/Training/Mails/TrainingMailMessageFactory.php

@@ -1,11 +1,12 @@
 <?php
 declare(strict_types = 1);
 
-namespace MichalSpacekCz\Training;
+namespace MichalSpacekCz\Training\Mails;
 
 use MichalSpacekCz\DateTime\DateTimeFormatter;
 use MichalSpacekCz\ShouldNotHappenException;
 use MichalSpacekCz\Training\Applications\TrainingApplication;
+use MichalSpacekCz\Training\Statuses;
 
 class TrainingMailMessageFactory
 {

site/app/Training/Mails.php → site/app/Training/Mails/TrainingMails.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace MichalSpacekCz\Training;
+namespace MichalSpacekCz\Training\Mails;
 
 use DateTime;
 use MichalSpacekCz\ShouldNotHappenException;
@@ -11,6 +11,7 @@
 use MichalSpacekCz\Training\Dates\TrainingDateStatus;
 use MichalSpacekCz\Training\Exceptions\TrainingDateDoesNotExistException;
 use MichalSpacekCz\Training\Preliminary\PreliminaryTrainings;
+use MichalSpacekCz\Training\Statuses;
 use MichalSpacekCz\Training\Venues\TrainingVenues;
 use Nette\Bridges\ApplicationLatte\DefaultTemplate;
 use Nette\Http\FileUpload;
@@ -21,7 +22,7 @@
 use SodiumException;
 use Tracy\Debugger;
 
-class Mails
+class TrainingMails
 {
 
 	private const REMINDER_DAYS = 5;
@@ -73,7 +74,7 @@ public function sendSignUpMail(
 	): void {
 		Debugger::log("Sending sign-up email to application id: {$applicationId}, training: {$training}");
 
-		$template->setFile(__DIR__ . '/mails/trainingSignUp.latte');
+		$template->setFile(__DIR__ . '/templates/trainingSignUp.latte');
 
 		$template->training = $training;
 		$template->trainingName = $trainingName;

site/config/services.neon

@@ -115,15 +115,15 @@ services:
 	- MichalSpacekCz\Training\FormDataLogger
 	- MichalSpacekCz\Training\FormSpam
 	- MichalSpacekCz\Training\FreeSeats
-	- MichalSpacekCz\Training\Mails(emailFrom: 'Michal Špaček <mail@michalspacek.cz>', phoneNumber: %contact.phoneNumber%)
+	- MichalSpacekCz\Training\Mails\TrainingMailMessageFactory
+	- MichalSpacekCz\Training\Mails\TrainingMails(emailFrom: 'Michal Špaček <mail@michalspacek.cz>', phoneNumber: %contact.phoneNumber%)
 	- MichalSpacekCz\Training\Preliminary\PreliminaryTrainings
 	- MichalSpacekCz\Training\Prices(vatRate: %vatRate%)
 	- MichalSpacekCz\Training\Resolver\Vrana
 	- MichalSpacekCz\Training\Reviews\TrainingReviewInputsFactory
 	- 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

site/tests/Training/TrainingMailMessageFactoryTest.phpt → site/tests/Training/Mails/TrainingMailMessageFactoryTest.phpt

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace MichalSpacekCz\Training;
+namespace MichalSpacekCz\Training\Mails;
 
 use DateTime;
 use MichalSpacekCz\DateTime\DateTimeFormatter;
@@ -10,11 +10,12 @@ use MichalSpacekCz\ShouldNotHappenException;
 use MichalSpacekCz\Test\Database\Database;
 use MichalSpacekCz\Training\Applications\TrainingApplication;
 use MichalSpacekCz\Training\Files\TrainingFiles;
+use MichalSpacekCz\Training\Statuses;
 use Nette\Utils\Html;
 use Tester\Assert;
 use Tester\TestCase;
 
-$runner = require __DIR__ . '/../bootstrap.php';
+$runner = require __DIR__ . '/../../bootstrap.php';
 
 /** @testCase */
 class TrainingMailMessageFactoryTest extends TestCase