ISSUE-344: refactor

Author: tatevikg1

config/services.yml

@@ -1,3 +1,6 @@
+imports:
+    - { resource: services/*.xml }
+
 services:
     Psr\Container\ContainerInterface:
       alias: 'service_container'
@@ -6,14 +9,19 @@ services:
         resource: '../src/Controller'
         public: true
         autowire: true
-        tags: ['controller.service_arguments']
+        autoconfigure: true
 
-#    Symfony\Component\Serializer\SerializerInterface:
-#      autowire: true
-#      autoconfigure: true
+    PhpList\RestBundle\:
+        resource: '../src/'
+        exclude:
+            - '../src/Controller/'
+            - '../src/DependencyInjection/'
+            - '../src/Kernel.php'
+        autowire: true
+        autoconfigure: true
 
     my.secure_handler:
-        class: \PhpList\RestBundle\ViewHandler\SecuredViewHandler
+        class: PhpList\RestBundle\ViewHandler\SecuredViewHandler
 
     my.secure_view_handler:
         parent: fos_rest.view_handler.default
@@ -24,14 +32,3 @@ services:
         autowire: true
         autoconfigure: true
 
-    PhpList\Core\Domain\Repository\Messaging\SubscriberListRepository:
-        autowire: true
-        autoconfigure: true
-
-    PhpList\RestBundle\EventListener\ExceptionListener:
-        tags:
-            - { name: kernel.event_listener, event: kernel.exception }
-
-    PhpList\RestBundle\EventListener\ResponseListener:
-        tags:
-            - { name: kernel.event_listener, event: kernel.response }

config/services/controllers.yml

@@ -0,0 +1,7 @@
+services:
+  PhpList\RestBundle\Controller\SubscriberController:
+    autowire: true
+    arguments:
+      $authentication: '@PhpList\Core\Security\Authentication'
+      $repository: '@PhpList\Core\Domain\Repository\Subscription\SubscriberRepository'
+      $subscriberNormalizer: '@PhpList\RestBundle\Serializer\SubscriberNormalizer'

config/services/listeners.yml

@@ -0,0 +1,8 @@
+services:
+  PhpList\RestBundle\EventListener\ExceptionListener:
+    tags:
+      - { name: kernel.event_listener, event: kernel.exception }
+
+  PhpList\RestBundle\EventListener\ResponseListener:
+    tags:
+      - { name: kernel.event_listener, event: kernel.response }

config/services/serializer.yml

@@ -0,0 +1,5 @@
+services:
+  PhpList\RestBundle\Serializer\SubscriberNormalizer:
+    tags: ['serializer.normalizer']
+    autowire: true
+

src/Controller/SubscriberController.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Controller;
 
+use PhpList\RestBundle\Serializer\SubscriberNormalizer;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use PhpList\Core\Domain\Model\Subscription\Subscriber;
@@ -16,7 +17,6 @@
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 use OpenApi\Attributes as OA;
 
@@ -30,13 +30,16 @@ class SubscriberController extends AbstractController
     use AuthenticationTrait;
 
     private SubscriberRepository $subscriberRepository;
+    private SubscriberNormalizer $subscriberNormalizer;
 
     public function __construct(
         Authentication $authentication,
-        SubscriberRepository $repository
+        SubscriberRepository $repository,
+        SubscriberNormalizer $subscriberNormalizer
     ) {
         $this->authentication = $authentication;
         $this->subscriberRepository = $repository;
+        $this->subscriberNormalizer = $subscriberNormalizer;
     }
 
     #[Route('/subscribers', name: 'create_subscriber', methods: ['POST'])]
@@ -229,15 +232,18 @@ public function postAction(Request $request, SerializerInterface $serializer): J
     public function getAction(
         Request $request,
         #[MapEntity(mapping: ['subscriberId' => 'id'])] Subscriber $subscriber,
-        SerializerInterface $serializer
     ): JsonResponse {
         $this->requireAuthentication($request);
 
-        $json = $serializer->serialize($subscriber, 'json', [
-            AbstractNormalizer::GROUPS => 'SubscriberListMembers',
-        ]);
+        $subscriber = $this->subscriberRepository->findSubscriberWithSubscriptions($subscriber->getId());
 
-        return new JsonResponse($json, Response::HTTP_OK, [], true);
+        if (!$subscriber) {
+            return new JsonResponse(['error' => 'Subscriber not found'], Response::HTTP_NOT_FOUND);
+        }
+
+        $data = $this->subscriberNormalizer->normalize($subscriber);
+
+        return new JsonResponse($data, Response::HTTP_OK, []);
     }
 
     /**

src/Serializer/SubscriberNormalizer.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\RestBundle\Serializer;
+
+use PhpList\Core\Domain\Model\Subscription\Subscriber;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class SubscriberNormalizer implements NormalizerInterface
+{
+    public function normalize($object, string $format = null, array $context = []): array
+    {
+        if (!$object instanceof Subscriber) {
+            return [];
+        }
+
+        return [
+            'id' => $object->getId(),
+            'email' => $object->getEmail(),
+            'subscribedLists' => array_map(function ($subscription) {
+
+                return [
+                    'id' => $subscription->getSubscriberList()->getId(),
+                    'name' => $subscription->getSubscriberList()->getName(),
+                ];
+            }, $object->getSubscriptions()->toArray()),
+        ];
+    }
+
+    public function supportsNormalization($data, string $format = null): bool
+    {
+        return $data instanceof Subscriber;
+    }
+}
+