ISSUE-345: move logic to core

Author: tatevikg1

composer.json

@@ -31,7 +31,7 @@
     },
     "require": {
         "php": "^8.1",
-        "phplist/core": "v5.0.0-alpha6",
+        "phplist/core": "dev-ISSUE-345",
         "friendsofsymfony/rest-bundle": "*",
         "symfony/test-pack": "^1.0",
         "symfony/process": "^6.4",

config/services/builders.yml

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

config/services/managers.yml

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

config/services/validators.yml

@@ -19,11 +19,11 @@ services:
     autoconfigure: true
     tags: [ 'validator.constraint_validator' ]
 
-  PhpList\RestBundle\Validator\TemplateLinkValidator:
+  PhpList\Core\Domain\Service\Validator\TemplateLinkValidator:
     autowire: true
     autoconfigure: true
 
-  PhpList\RestBundle\Validator\TemplateImageValidator:
+  PhpList\Core\Domain\Service\Validator\TemplateImageValidator:
     autowire: true
     autoconfigure: true
 

src/Controller/AdministratorController.php

@@ -6,11 +6,11 @@
 
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Model\Identity\Administrator;
+use PhpList\Core\Domain\Service\Manager\AdministratorManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateAdministratorRequest;
 use PhpList\RestBundle\Entity\Request\UpdateAdministratorRequest;
 use PhpList\RestBundle\Serializer\AdministratorNormalizer;
-use PhpList\RestBundle\Service\Manager\AdministratorManager;
 use PhpList\RestBundle\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -135,9 +135,10 @@ public function createAdministrator(
     ): JsonResponse {
         $this->requireAuthentication($request);
 
-        /** @var CreateAdministratorRequest $dto */
-        $dto = $validator->validate($request, CreateAdministratorRequest::class);
-        $administrator = $this->administratorManager->createAdministrator($dto);
+        /** @var CreateAdministratorRequest $createAdministratorRequest */
+        $createAdministratorRequest = $validator->validate($request, CreateAdministratorRequest::class);
+
+        $administrator = $this->administratorManager->createAdministrator($createAdministratorRequest->getDto());
         $json = $normalizer->normalize($administrator, 'json');
 
         return $this->json($json, Response::HTTP_CREATED);
@@ -224,9 +225,9 @@ public function updateAdministrator(
         if (!$administrator) {
             throw $this->createNotFoundException('Administrator not found.');
         }
-        /** @var UpdateAdministratorRequest $dto */
-        $dto = $this->validator->validate($request, UpdateAdministratorRequest::class);
-        $this->administratorManager->updateAdministrator($administrator, $dto);
+        /** @var UpdateAdministratorRequest $updateAdministratorRequest */
+        $updateAdministratorRequest = $this->validator->validate($request, UpdateAdministratorRequest::class);
+        $this->administratorManager->updateAdministrator($administrator, $updateAdministratorRequest->getDto());
 
         return $this->json(null, Response::HTTP_OK);
     }

src/Controller/CampaignController.php

@@ -5,13 +5,13 @@
 namespace PhpList\RestBundle\Controller;
 
 use OpenApi\Attributes as OA;
-use PhpList\Core\Domain\Filter\MessageFilter;
+use PhpList\Core\Domain\Model\Dto\Filter\MessageFilter;
 use PhpList\Core\Domain\Model\Messaging\Message;
+use PhpList\Core\Domain\Service\Manager\MessageManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateMessageRequest;
 use PhpList\RestBundle\Entity\Request\UpdateMessageRequest;
 use PhpList\RestBundle\Serializer\MessageNormalizer;
-use PhpList\RestBundle\Service\Manager\MessageManager;
 use PhpList\RestBundle\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -218,7 +218,7 @@ public function createMessage(Request $request, MessageNormalizer $normalizer):
 
         /** @var CreateMessageRequest $createMessageRequest */
         $createMessageRequest = $this->validator->validate($request, CreateMessageRequest::class);
-        $data = $this->messageManager->createMessage($createMessageRequest, $authUser);
+        $data = $this->messageManager->createMessage($createMessageRequest->getDto(), $authUser);
 
         return $this->json($normalizer->normalize($data), Response::HTTP_CREATED);
     }
@@ -291,7 +291,7 @@ public function updateMessage(
         }
         /** @var UpdateMessageRequest $updateMessageRequest */
         $updateMessageRequest = $this->validator->validate($request, UpdateMessageRequest::class);
-        $data = $this->messageManager->updateMessage($updateMessageRequest, $message, $authUser);
+        $data = $this->messageManager->updateMessage($updateMessageRequest->getDto(), $message, $authUser);
 
         return $this->json($this->normalizer->normalize($data), Response::HTTP_OK);
     }

src/Controller/ListController.php

@@ -6,10 +6,10 @@
 
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Model\Subscription\SubscriberList;
+use PhpList\Core\Domain\Service\Manager\SubscriberListManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateSubscriberListRequest;
 use PhpList\RestBundle\Serializer\SubscriberListNormalizer;
-use PhpList\RestBundle\Service\Manager\SubscriberListManager;
 use PhpList\RestBundle\Service\Provider\PaginatedDataProvider;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -279,7 +279,7 @@ public function createList(Request $request, SubscriberListNormalizer $normalize
 
         /** @var CreateSubscriberListRequest $subscriberListRequest */
         $subscriberListRequest = $this->validator->validate($request, CreateSubscriberListRequest::class);
-        $data = $this->subscriberListManager->createSubscriberList($subscriberListRequest, $authUser);
+        $data = $this->subscriberListManager->createSubscriberList($subscriberListRequest->getDto(), $authUser);
 
         return $this->json($normalizer->normalize($data), Response::HTTP_CREATED);
     }

src/Controller/ListMembersController.php

@@ -5,7 +5,7 @@
 namespace PhpList\RestBundle\Controller;
 
 use OpenApi\Attributes as OA;
-use PhpList\Core\Domain\Filter\SubscriberFilter;
+use PhpList\Core\Domain\Model\Dto\Filter\SubscriberFilter;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
 use PhpList\Core\Domain\Model\Subscription\SubscriberList;
 use PhpList\Core\Security\Authentication;

src/Controller/SessionController.php

@@ -6,10 +6,10 @@
 
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Model\Identity\AdministratorToken;
+use PhpList\Core\Domain\Service\Manager\SessionManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateSessionRequest;
 use PhpList\RestBundle\Serializer\AdministratorTokenNormalizer;
-use PhpList\RestBundle\Service\Manager\SessionManager;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -90,7 +90,10 @@ public function createSession(
     ): JsonResponse {
         /** @var CreateSessionRequest $createSessionRequest */
         $createSessionRequest = $this->validator->validate($request, CreateSessionRequest::class);
-        $token = $this->sessionManager->createSession($createSessionRequest);
+        $token = $this->sessionManager->createSession(
+            $createSessionRequest->loginName,
+            $createSessionRequest->password
+        );
 
         $json = $normalizer->normalize($token, 'json');
 

src/Controller/SubscriberController.php

@@ -6,11 +6,11 @@
 
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
+use PhpList\Core\Domain\Service\Manager\SubscriberManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateSubscriberRequest;
 use PhpList\RestBundle\Entity\Request\UpdateSubscriberRequest;
 use PhpList\RestBundle\Serializer\SubscriberNormalizer;
-use PhpList\RestBundle\Service\Manager\SubscriberManager;
 use PhpList\RestBundle\Validator\RequestValidator;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -98,7 +98,7 @@ public function createSubscriber(Request $request): JsonResponse
 
         /** @var CreateSubscriberRequest $subscriberRequest */
         $subscriberRequest = $this->validator->validate($request, CreateSubscriberRequest::class);
-        $subscriber = $this->subscriberManager->createSubscriber($subscriberRequest);
+        $subscriber = $this->subscriberManager->createSubscriber($subscriberRequest->getDto());
 
         return $this->json(
             $this->subscriberNormalizer->normalize($subscriber, 'json'),
@@ -175,9 +175,9 @@ public function updateSubscriber(
         if (!$subscriber) {
             throw $this->createNotFoundException('Subscriber not found.');
         }
-        /** @var UpdateSubscriberRequest $dto */
-        $dto = $this->validator->validate($request, UpdateSubscriberRequest::class);
-        $subscriber = $this->subscriberManager->updateSubscriber($dto);
+        /** @var UpdateSubscriberRequest $updateSubscriberRequest */
+        $updateSubscriberRequest = $this->validator->validate($request, UpdateSubscriberRequest::class);
+        $subscriber = $this->subscriberManager->updateSubscriber($updateSubscriberRequest->getDto());
 
         return $this->json($this->subscriberNormalizer->normalize($subscriber, 'json'), Response::HTTP_OK);
     }