From 78742e6231e3a4154fa9740d9c7c61afe7e42379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 4 Oct 2023 00:06:52 +0200
Subject: [PATCH 1/3] action module removal

---
 .../Presenters/ActionBasePresenter.php             | 14 --------------
 .../Presenters/BankPresenter.php                   |  5 +++--
 .../Presenters/MailingPresenter.php                |  5 +++--
 .../Presenters/MaturityPresenter.php               |  5 +++--
 app/Router/RouterFactory.php                       |  7 -------
 5 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 app/ActionModule/Presenters/ActionBasePresenter.php
 rename app/{ActionModule => ApiModule}/Presenters/BankPresenter.php (87%)
 rename app/{ActionModule => ApiModule}/Presenters/MailingPresenter.php (92%)
 rename app/{ActionModule => ApiModule}/Presenters/MaturityPresenter.php (97%)

diff --git a/app/ActionModule/Presenters/ActionBasePresenter.php b/app/ActionModule/Presenters/ActionBasePresenter.php
deleted file mode 100644
index b52d48501..000000000
--- a/app/ActionModule/Presenters/ActionBasePresenter.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\ActionModule\Presenters;
-
-use App\Presenters\BasePresenter;
-
-/**
- * BasePresenter pro ActionModule.
- */
-abstract class ActionBasePresenter extends BasePresenter
-{
-}
diff --git a/app/ActionModule/Presenters/BankPresenter.php b/app/ApiModule/Presenters/BankPresenter.php
similarity index 87%
rename from app/ActionModule/Presenters/BankPresenter.php
rename to app/ApiModule/Presenters/BankPresenter.php
index 3cb11a00b..30f5773f2 100644
--- a/app/ActionModule/Presenters/BankPresenter.php
+++ b/app/ApiModule/Presenters/BankPresenter.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\ActionModule\Presenters;
+namespace App\ApiModule\Presenters;
 
+use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Settings\Exceptions\SettingsItemNotFoundException;
 use App\Model\Settings\Queries\SettingDateValueQuery;
 use App\Model\Settings\Settings;
@@ -16,7 +17,7 @@
 /**
  * Presenter obsluhující načítání plateb z API banky.
  */
-class BankPresenter extends ActionBasePresenter
+class BankPresenter extends ApiBasePresenter
 {
     #[Inject]
     public QueryBus $queryBus;
diff --git a/app/ActionModule/Presenters/MailingPresenter.php b/app/ApiModule/Presenters/MailingPresenter.php
similarity index 92%
rename from app/ActionModule/Presenters/MailingPresenter.php
rename to app/ApiModule/Presenters/MailingPresenter.php
index b91673a2c..ef1e0c23b 100644
--- a/app/ActionModule/Presenters/MailingPresenter.php
+++ b/app/ApiModule/Presenters/MailingPresenter.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\ActionModule\Presenters;
+namespace App\ApiModule\Presenters;
 
+use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Acl\Permission;
 use App\Model\Acl\SrsResource;
 use App\Model\Settings\Commands\SetSettingStringValue;
@@ -18,7 +19,7 @@
 /**
  * Presenter obsluhující potvrzení změny e-mailu.
  */
-class MailingPresenter extends ActionBasePresenter
+class MailingPresenter extends ApiBasePresenter
 {
     #[Inject]
     public CommandBus $commandBus;
diff --git a/app/ActionModule/Presenters/MaturityPresenter.php b/app/ApiModule/Presenters/MaturityPresenter.php
similarity index 97%
rename from app/ActionModule/Presenters/MaturityPresenter.php
rename to app/ApiModule/Presenters/MaturityPresenter.php
index bd432220b..2845d2fd0 100644
--- a/app/ActionModule/Presenters/MaturityPresenter.php
+++ b/app/ApiModule/Presenters/MaturityPresenter.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\ActionModule\Presenters;
+namespace App\ApiModule\Presenters;
 
+use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Acl\Repositories\RoleRepository;
 use App\Model\Acl\Role;
 use App\Model\Enums\ApplicationState;
@@ -27,7 +28,7 @@
 /**
  * Presenter obsluhující kontrolu splatnosti přihlášek.
  */
-class MaturityPresenter extends ActionBasePresenter
+class MaturityPresenter extends ApiBasePresenter
 {
     #[Inject]
     public QueryBus $queryBus;
diff --git a/app/Router/RouterFactory.php b/app/Router/RouterFactory.php
index a55ddd2c0..931c2e617 100644
--- a/app/Router/RouterFactory.php
+++ b/app/Router/RouterFactory.php
@@ -36,13 +36,6 @@ public function createRouter(): RouteList
             'id' => null,
         ]);
 
-        $router->addRoute('action/<presenter>/<action>[/<id>]', [
-            'module' => 'Action',
-            'presenter' => null,
-            'action' => null,
-            'id' => null,
-        ]);
-
         $router->addRoute('admin/cms/<presenter>/<action>[/<id>][/<area>]', [
             'module' => 'Admin:Cms',
             'presenter' => 'Page',

From 9849a86b40a5cbdf56b67573925d40f9991b038c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 4 Oct 2023 20:25:18 +0200
Subject: [PATCH 2/3] fixes

---
 .../ConfigurationModule/Forms/MailingFormFactory.php            | 2 +-
 app/ApiModule/Presenters/BankPresenter.php                      | 1 -
 app/ApiModule/Presenters/MailingPresenter.php                   | 1 -
 app/ApiModule/Presenters/MaturityPresenter.php                  | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
index 1fef0e519..fb914b969 100644
--- a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
@@ -105,7 +105,7 @@ public function processForm(Form $form, stdClass $values): void
             $verificationCode = substr(md5(uniqid((string) mt_rand(), true)), 0, 8);
             $this->commandBus->handle(new SetSettingStringValue(Settings::SEMINAR_EMAIL_VERIFICATION_CODE, $verificationCode));
 
-            $link = $this->linkGenerator->link('Action:Mailing:verify', ['code' => $verificationCode]);
+            $link = $this->linkGenerator->link('Api:Mailing:verify', ['code' => $verificationCode]);
 
             $this->mailService->sendMailFromTemplate(
                 null,
diff --git a/app/ApiModule/Presenters/BankPresenter.php b/app/ApiModule/Presenters/BankPresenter.php
index 30f5773f2..361856ad8 100644
--- a/app/ApiModule/Presenters/BankPresenter.php
+++ b/app/ApiModule/Presenters/BankPresenter.php
@@ -4,7 +4,6 @@
 
 namespace App\ApiModule\Presenters;
 
-use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Settings\Exceptions\SettingsItemNotFoundException;
 use App\Model\Settings\Queries\SettingDateValueQuery;
 use App\Model\Settings\Settings;
diff --git a/app/ApiModule/Presenters/MailingPresenter.php b/app/ApiModule/Presenters/MailingPresenter.php
index ef1e0c23b..29297146f 100644
--- a/app/ApiModule/Presenters/MailingPresenter.php
+++ b/app/ApiModule/Presenters/MailingPresenter.php
@@ -4,7 +4,6 @@
 
 namespace App\ApiModule\Presenters;
 
-use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Acl\Permission;
 use App\Model\Acl\SrsResource;
 use App\Model\Settings\Commands\SetSettingStringValue;
diff --git a/app/ApiModule/Presenters/MaturityPresenter.php b/app/ApiModule/Presenters/MaturityPresenter.php
index 2845d2fd0..31968c465 100644
--- a/app/ApiModule/Presenters/MaturityPresenter.php
+++ b/app/ApiModule/Presenters/MaturityPresenter.php
@@ -4,7 +4,6 @@
 
 namespace App\ApiModule\Presenters;
 
-use App\ActionModule\Presenters\ActionBasePresenter;
 use App\Model\Acl\Repositories\RoleRepository;
 use App\Model\Acl\Role;
 use App\Model\Enums\ApplicationState;

From bf0b3bdc039c07e6b8b08ad548340c8fc514c69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 4 Oct 2023 20:38:31 +0200
Subject: [PATCH 3/3] rename

---
 .../ConfigurationModule/Forms/MailingFormFactory.php            | 2 +-
 .../Presenters/{MailingPresenter.php => MailPresenter.php}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/ApiModule/Presenters/{MailingPresenter.php => MailPresenter.php} (97%)

diff --git a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
index fb914b969..976d41e59 100644
--- a/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
+++ b/app/AdminModule/ConfigurationModule/Forms/MailingFormFactory.php
@@ -105,7 +105,7 @@ public function processForm(Form $form, stdClass $values): void
             $verificationCode = substr(md5(uniqid((string) mt_rand(), true)), 0, 8);
             $this->commandBus->handle(new SetSettingStringValue(Settings::SEMINAR_EMAIL_VERIFICATION_CODE, $verificationCode));
 
-            $link = $this->linkGenerator->link('Api:Mailing:verify', ['code' => $verificationCode]);
+            $link = $this->linkGenerator->link('Api:Mail:verify', ['code' => $verificationCode]);
 
             $this->mailService->sendMailFromTemplate(
                 null,
diff --git a/app/ApiModule/Presenters/MailingPresenter.php b/app/ApiModule/Presenters/MailPresenter.php
similarity index 97%
rename from app/ApiModule/Presenters/MailingPresenter.php
rename to app/ApiModule/Presenters/MailPresenter.php
index 29297146f..7e47bf148 100644
--- a/app/ApiModule/Presenters/MailingPresenter.php
+++ b/app/ApiModule/Presenters/MailPresenter.php
@@ -18,7 +18,7 @@
 /**
  * Presenter obsluhující potvrzení změny e-mailu.
  */
-class MailingPresenter extends ApiBasePresenter
+class MailPresenter extends ApiBasePresenter
 {
     #[Inject]
     public CommandBus $commandBus;