ISSUE-345

composer.json

@@ -31,7 +31,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "v5.0.0-alpha6",
+        "phplist/core": "v5.0.0-alpha7",
         "friendsofsymfony/rest-bundle": "*",
         "symfony/test-pack": "^1.0",
         "symfony/process": "^6.4",
@@ -97,8 +97,18 @@
                 "PhpList\\RestBundle\\PhpListRestBundle"
             ],
             "routes": {
-                "rest-api": {
-                    "resource": "@PhpListRestBundle/Controller/",
+                "rest-api-identity": {
+                    "resource": "@PhpListRestBundle/Identity/Controller/",
+                    "type": "attribute",
+                    "prefix": "/api/v2"
+                },
+                "rest-api-subscription": {
+                    "resource": "@PhpListRestBundle/Subscription/Controller/",
+                    "type": "attribute",
+                    "prefix": "/api/v2"
+                },
+                "rest-api-messaging": {
+                    "resource": "@PhpListRestBundle/Messaging/Controller/",
                     "type": "attribute",
                     "prefix": "/api/v2"
                 }

config/services.yml

@@ -4,12 +4,6 @@ services:
     Psr\Container\ContainerInterface:
         alias: 'service_container'
 
-    PhpList\RestBundle\Controller\:
-        resource: '../src/Controller'
-        public: true
-        autowire: true
-        tags: ['controller.service_arguments']
-
     my.secure_handler:
         class: PhpList\RestBundle\ViewHandler\SecuredViewHandler
 

config/services/builders.yml

@@ -4,22 +4,22 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Service\Builder\MessageBuilder:
+  PhpList\Core\Domain\Messaging\Service\Builder\MessageBuilder:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Builder\MessageFormatBuilder:
+  PhpList\Core\Domain\Messaging\Service\Builder\MessageFormatBuilder:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Builder\MessageScheduleBuilder:
+  PhpList\Core\Domain\Messaging\Service\Builder\MessageScheduleBuilder:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Builder\MessageContentBuilder:
+  PhpList\Core\Domain\Messaging\Service\Builder\MessageContentBuilder:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Builder\MessageOptionsBuilder:
+  PhpList\Core\Domain\Messaging\Service\Builder\MessageOptionsBuilder:
     autowire: true
     autoconfigure: true

config/services/controllers.yml

@@ -0,0 +1,26 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  PhpList\RestBundle\Identity\Controller\:
+    resource: '../src/Identity/Controller'
+    tags: [ 'controller.service_arguments' ]
+    autowire: true
+    autoconfigure: true
+    public: true
+
+  PhpList\RestBundle\Messaging\Controller\:
+    resource: '../src/Messaging/Controller'
+    tags: [ 'controller.service_arguments' ]
+    autowire: true
+    autoconfigure: true
+    public: true
+
+  PhpList\RestBundle\Subscription\Controller\:
+    resource: '../src/Subscription/Controller'
+    tags: [ 'controller.service_arguments' ]
+    autowire: true
+    autoconfigure: true
+    public: true

config/services/factories.yml

@@ -4,6 +4,6 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Service\Factory\PaginationCursorRequestFactory:
+  PhpList\RestBundle\Common\Service\Factory\PaginationCursorRequestFactory:
     autowire: true
     autoconfigure: true

config/services/listeners.yml

@@ -4,10 +4,10 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\EventListener\ExceptionListener:
+  PhpList\RestBundle\Common\EventListener\ExceptionListener:
     tags:
       - { name: kernel.event_listener, event: kernel.exception }
 
-  PhpList\RestBundle\EventListener\ResponseListener:
+  PhpList\RestBundle\Common\EventListener\ResponseListener:
     tags:
       - { name: kernel.event_listener, event: kernel.response }

config/services/managers.yml

@@ -4,34 +4,38 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Service\Manager\SubscriberManager:
+  PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\SessionManager:
+  PhpList\Core\Domain\Identity\Service\SessionManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\SubscriberListManager:
+  PhpList\Core\Domain\Subscription\Service\Manager\SubscriberListManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\SubscriptionManager:
+  PhpList\Core\Domain\Subscription\Service\Manager\SubscriptionManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\MessageManager:
+  PhpList\Core\Domain\Messaging\Service\MessageManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\TemplateManager:
+  PhpList\Core\Domain\Messaging\Service\TemplateManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\TemplateImageManager:
+  PhpList\Core\Domain\Messaging\Service\TemplateImageManager:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Service\Manager\AdministratorManager:
+  PhpList\Core\Domain\Identity\Service\AdministratorManager:
+    autowire: true
+    autoconfigure: true
+
+  PhpList\Core\Domain\Subscription\Service\SubscriberCsvExporter:
     autowire: true
     autoconfigure: true

config/services/normalizers.yml

@@ -11,37 +11,61 @@ services:
       $classMetadataFactory: '@?serializer.mapping.class_metadata_factory'
       $nameConverter: '@Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter'
 
-  PhpList\RestBundle\Serializer\SubscriberNormalizer:
+  PhpList\RestBundle\Subscription\Serializer\SubscriberNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\AdministratorTokenNormalizer:
+  PhpList\RestBundle\Subscription\Serializer\SubscriberOnlyNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\SubscriberListNormalizer:
+  PhpList\RestBundle\Identity\Serializer\AdministratorTokenNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\SubscriptionNormalizer:
+  PhpList\RestBundle\Subscription\Serializer\SubscriberListNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\MessageNormalizer:
+  PhpList\RestBundle\Subscription\Serializer\SubscriptionNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\TemplateImageNormalizer:
+  PhpList\RestBundle\Messaging\Serializer\MessageNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\TemplateNormalizer:
+  PhpList\RestBundle\Messaging\Serializer\TemplateImageNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\AdministratorNormalizer:
+  PhpList\RestBundle\Messaging\Serializer\TemplateNormalizer:
     tags: [ 'serializer.normalizer' ]
     autowire: true
 
-  PhpList\RestBundle\Serializer\CursorPaginationNormalizer:
+  PhpList\RestBundle\Identity\Serializer\AdministratorNormalizer:
+    tags: [ 'serializer.normalizer' ]
+    autowire: true
+
+  PhpList\RestBundle\Identity\Serializer\AdminAttributeDefinitionNormalizer:
+    tags: [ 'serializer.normalizer' ]
+    autowire: true
+
+  PhpList\RestBundle\Identity\Serializer\AdminAttributeValueNormalizer:
+    tags: [ 'serializer.normalizer' ]
+    autowire: true
+
+  PhpList\RestBundle\Subscription\Serializer\AttributeDefinitionNormalizer:
+    tags: [ 'serializer.normalizer' ]
+    autowire: true
+
+  PhpList\RestBundle\Subscription\Serializer\SubscriberAttributeValueNormalizer:
+    tags: [ 'serializer.normalizer' ]
+    autowire: true
+
+  PhpList\RestBundle\Common\Serializer\CursorPaginationNormalizer:
+    autowire: true
+
+  PhpList\RestBundle\Subscription\Serializer\SubscribersExportRequestNormalizer:
+    tags: [ 'serializer.normalizer' ]
     autowire: true

config/services/providers.yml

@@ -4,6 +4,6 @@ services:
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Service\Provider\PaginatedDataProvider:
+  PhpList\RestBundle\Common\Service\Provider\PaginatedDataProvider:
     autowire: true
     autoconfigure: true

config/services/validators.yml

@@ -1,36 +1,38 @@
 services:
-  PhpList\RestBundle\Validator\RequestValidator:
+  PhpList\RestBundle\Common\Validator\RequestValidator:
     autowire: true
     autoconfigure: true
     public: false
 
-  PhpList\RestBundle\Validator\Constraint\UniqueEmailValidator:
+  PhpList\RestBundle\Identity\Validator\Constraint\UniqueEmailValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\Constraint\EmailExistsValidator:
+  PhpList\RestBundle\Subscription\Validator\Constraint\UniqueEmailValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\Constraint\TemplateExistsValidator:
+  PhpList\RestBundle\Subscription\Validator\Constraint\EmailExistsValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\TemplateLinkValidator:
+  PhpList\RestBundle\Messaging\Validator\Constraint\TemplateExistsValidator:
     autowire: true
     autoconfigure: true
+    tags: [ 'validator.constraint_validator' ]
+
+  PhpList\RestBundle\Messaging\Validator\Constraint\ContainsPlaceholderValidator:
+    tags: ['validator.constraint_validator']
 
-  PhpList\RestBundle\Validator\TemplateImageValidator:
+  PhpList\RestBundle\Identity\Validator\Constraint\UniqueLoginNameValidator:
     autowire: true
     autoconfigure: true
+    tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\Constraint\ContainsPlaceholderValidator:
-    tags: ['validator.constraint_validator']
-
-  PhpList\RestBundle\Validator\Constraint\UniqueLoginNameValidator:
+  PhpList\RestBundle\Subscription\Validator\Constraint\ListExistsValidator:
     autowire: true
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]

src/Controller/BaseController.php → src/Common/Controller/BaseController.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Controller;
+namespace PhpList\RestBundle\Common\Controller;
 
-use PhpList\Core\Domain\Model\Identity\Administrator;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Security\Authentication;
-use PhpList\RestBundle\Validator\RequestValidator;
+use PhpList\RestBundle\Common\Validator\RequestValidator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

src/Entity/Dto/CursorPaginationResult.php → src/Common/Dto/CursorPaginationResult.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Entity\Dto;
+namespace PhpList\RestBundle\Common\Dto;
 
 class CursorPaginationResult
 {

src/Entity/Dto/ValidationContext.php → src/Common/Dto/ValidationContext.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Entity\Dto;
+namespace PhpList\RestBundle\Common\Dto;
 
 class ValidationContext
 {

src/EventListener/ExceptionListener.php → src/Common/EventListener/ExceptionListener.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\EventListener;
+namespace PhpList\RestBundle\Common\EventListener;
 
 use Exception;
-use PhpList\RestBundle\Exception\SubscriptionCreationException;
+use PhpList\Core\Domain\Subscription\Exception\SubscriptionCreationException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

src/EventListener/ResponseListener.php → src/Common/EventListener/ResponseListener.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\EventListener;
+namespace PhpList\RestBundle\Common\EventListener;
 
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;

src/Entity/Request/PaginationCursorRequest.php → src/Common/Request/PaginationCursorRequest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Entity\Request;
+namespace PhpList\RestBundle\Common\Request;
 
 use Symfony\Component\HttpFoundation\Request;
 

src/Common/Request/RequestInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\RestBundle\Common\Request;
+
+interface RequestInterface
+{
+    public function getDto(): mixed;
+}

src/Serializer/CursorPaginationNormalizer.php → src/Common/Serializer/CursorPaginationNormalizer.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Serializer;
+namespace PhpList\RestBundle\Common\Serializer;
 
-use PhpList\RestBundle\Entity\Dto\CursorPaginationResult;
+use PhpList\RestBundle\Common\Dto\CursorPaginationResult;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class CursorPaginationNormalizer implements NormalizerInterface

src/Service/Factory/PaginationCursorRequestFactory.php → src/Common/Service/Factory/PaginationCursorRequestFactory.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace PhpList\RestBundle\Service\Factory;
+namespace PhpList\RestBundle\Common\Service\Factory;
 
-use PhpList\RestBundle\Entity\Request\PaginationCursorRequest;
+use PhpList\RestBundle\Common\Request\PaginationCursorRequest;
 use Symfony\Component\HttpFoundation\Request;
 
 class PaginationCursorRequestFactory