Add flush after delete

tatevikg1 · tatevikg1 · commit 6532db03fb37 · 2025-10-14T15:19:38.000+04:00
diff --git a/src/Identity/Controller/AdminAttributeDefinitionController.php b/src/Identity/Controller/AdminAttributeDefinitionController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Identity\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition;
 use PhpList\Core\Domain\Identity\Service\AdminAttributeDefinitionManager;
@@ -32,7 +33,8 @@ public function __construct(
         RequestValidator $validator,
         AdminAttributeDefinitionManager $definitionManager,
         AdminAttributeDefinitionNormalizer $normalizer,
-        PaginatedDataProvider $paginatedDataProvider
+        PaginatedDataProvider $paginatedDataProvider,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->definitionManager = $definitionManager;
@@ -211,6 +213,7 @@ public function delete(
         }
 
         $this->definitionManager->delete($attributeDefinition);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Identity/Controller/AdminAttributeValueController.php b/src/Identity/Controller/AdminAttributeValueController.php
@@ -198,6 +198,7 @@ public function delete(
             throw $this->createNotFoundException('Administrator attribute not found.');
         }
         $this->attributeManager->delete($attribute);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
@@ -355,6 +356,7 @@ public function getAttributeDefinition(
             attributeDefinitionId: $definition->getId()
         );
         $this->attributeManager->delete($attribute);
+        $this->entityManager->flush();
 
         return $this->json(
             $this->normalizer->normalize($attribute),
diff --git a/src/Identity/Controller/SessionController.php b/src/Identity/Controller/SessionController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Identity\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Identity\Model\AdministratorToken;
 use PhpList\Core\Domain\Identity\Service\SessionManager;
@@ -34,6 +35,7 @@ public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
         SessionManager $sessionManager,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
 
@@ -96,6 +98,7 @@ public function createSession(
             loginName:$createSessionRequest->loginName,
             password: $createSessionRequest->password
         );
+        $this->entityManager->flush();
 
         $json = $normalizer->normalize($token, 'json');
 
@@ -163,6 +166,7 @@ public function deleteSession(
         }
 
         $this->sessionManager->deleteSession($token);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Messaging/Controller/BounceRegexController.php b/src/Messaging/Controller/BounceRegexController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Messaging\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Messaging\Service\Manager\BounceRegexManager;
 use PhpList\Core\Security\Authentication;
@@ -27,6 +28,7 @@ public function __construct(
         RequestValidator $validator,
         private readonly BounceRegexManager $manager,
         private readonly BounceRegexNormalizer $normalizer,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
     }
@@ -240,6 +242,7 @@ public function delete(Request $request, string $regexHash): JsonResponse
             throw $this->createNotFoundException('Bounce regex not found.');
         }
         $this->manager->delete($entity);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Messaging/Controller/CampaignController.php b/src/Messaging/Controller/CampaignController.php
@@ -4,7 +4,9 @@
 
 namespace PhpList\RestBundle\Messaging\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
+use PhpList\Core\Domain\Messaging\Message\CampaignProcessorMessage;
 use PhpList\Core\Domain\Messaging\Model\Message;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Common\Controller\BaseController;
@@ -36,6 +38,7 @@ public function __construct(
         RequestValidator $validator,
         CampaignService $campaignService,
         MessageBusInterface $messageBus,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->campaignService = $campaignService;
@@ -340,6 +343,7 @@ public function deleteMessage(
         $authUser = $this->requireAuthentication($request);
 
         $this->campaignService->deleteMessage($authUser, $message);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Messaging/Controller/TemplateController.php b/src/Messaging/Controller/TemplateController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Messaging\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Messaging\Model\Template;
 use PhpList\Core\Domain\Messaging\Service\Manager\TemplateManager;
@@ -37,6 +38,7 @@ public function __construct(
         TemplateNormalizer $normalizer,
         TemplateManager $templateManager,
         PaginatedDataProvider $paginatedDataProvider,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->normalizer = $normalizer;
@@ -318,6 +320,7 @@ public function delete(
         }
 
         $this->templateManager->delete($template);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Messaging/Service/CampaignService.php b/src/Messaging/Service/CampaignService.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Messaging\Service;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Identity\Model\PrivilegeFlag;
 use PhpList\Core\Domain\Messaging\Model\Filter\MessageFilter;
@@ -23,6 +24,7 @@ public function __construct(
         private readonly MessageManager $messageManager,
         private readonly PaginatedDataProvider $paginatedProvider,
         private readonly MessageNormalizer $normalizer,
+        private readonly EntityManagerInterface $entityManager,
     ) {
     }
 
@@ -86,5 +88,6 @@ public function deleteMessage(Administrator $administrator, Message $message = n
         }
 
         $this->messageManager->delete($message);
+        $this->entityManager->flush();
     }
 }
diff --git a/src/Subscription/Controller/SubscribePageController.php b/src/Subscription/Controller/SubscribePageController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Identity\Model\PrivilegeFlag;
 use PhpList\Core\Domain\Subscription\Model\SubscribePage;
@@ -28,6 +29,7 @@ public function __construct(
         RequestValidator $validator,
         private readonly SubscribePageManager $subscribePageManager,
         private readonly SubscribePageNormalizer $normalizer,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
     }
@@ -141,6 +143,7 @@ public function createPage(Request $request): JsonResponse
         $createRequest = $this->validator->validate($request, SubscribePageRequest::class);
 
         $page = $this->subscribePageManager->createPage($createRequest->title, $createRequest->active, $admin);
+        $this->entityManager->flush();
 
         return $this->json($this->normalizer->normalize($page), Response::HTTP_CREATED);
     }
diff --git a/src/Subscription/Controller/SubscriberAttributeDefinitionController.php b/src/Subscription/Controller/SubscriberAttributeDefinitionController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition;
 use PhpList\Core\Domain\Subscription\Service\Manager\AttributeDefinitionManager;
@@ -32,7 +33,8 @@ public function __construct(
         RequestValidator $validator,
         AttributeDefinitionManager $definitionManager,
         AttributeDefinitionNormalizer $normalizer,
-        PaginatedDataProvider $paginatedDataProvider
+        PaginatedDataProvider $paginatedDataProvider,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->definitionManager = $definitionManager;
@@ -209,6 +211,7 @@ public function delete(
         }
 
         $this->definitionManager->delete($attributeDefinition);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Subscription/Controller/SubscriberAttributeValueController.php b/src/Subscription/Controller/SubscriberAttributeValueController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Subscription\Model\Filter\SubscriberAttributeValueFilter;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
@@ -33,7 +34,8 @@ public function __construct(
         RequestValidator $validator,
         SubscriberAttributeManager $attributeManager,
         SubscriberAttributeValueNormalizer $normalizer,
-        PaginatedDataProvider $paginatedDataProvider
+        PaginatedDataProvider $paginatedDataProvider,
+        private readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->attributeManager = $attributeManager;
@@ -193,6 +195,7 @@ public function delete(
             throw $this->createNotFoundException('Subscriber attribute not found.');
         }
         $this->attributeManager->delete($attribute);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
@@ -349,6 +352,7 @@ public function getAttributeDefinition(
         }
         $attribute = $this->attributeManager->getSubscriberAttribute($subscriber->getId(), $definition->getId());
         $this->attributeManager->delete($attribute);
+        $this->entityManager->flush();
 
         return $this->json(
             $this->normalizer->normalize($attribute),
diff --git a/src/Subscription/Controller/SubscriberController.php b/src/Subscription/Controller/SubscriberController.php
@@ -163,7 +163,7 @@ public function updateSubscriber(
         }
         /** @var UpdateSubscriberRequest $updateSubscriberRequest */
         $updateSubscriberRequest = $this->validator->validate($request, UpdateSubscriberRequest::class);
-        $subscriberData = $this->subscriberService->updateSubscriber($updateSubscriberRequest);
+        $subscriberData = $this->subscriberService->updateSubscriber($updateSubscriberRequest, $admin);
 
         return $this->json($subscriberData, Response::HTTP_OK);
     }
diff --git a/src/Subscription/Controller/SubscriberListController.php b/src/Subscription/Controller/SubscriberListController.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
 use PhpList\Core\Domain\Subscription\Model\SubscriberList;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberListManager;
@@ -32,18 +33,21 @@ class SubscriberListController extends BaseController
     private SubscriberListNormalizer $normalizer;
     private SubscriberListManager $subscriberListManager;
     private PaginatedDataProvider $paginatedDataProvider;
+    private EntityManagerInterface $entityManager;
 
     public function __construct(
         Authentication $authentication,
         RequestValidator $validator,
         SubscriberListNormalizer $normalizer,
         SubscriberListManager $subscriberListManager,
         PaginatedDataProvider $paginatedDataProvider,
+        EntityManagerInterface $entityManager,
     ) {
         parent::__construct($authentication, $validator);
         $this->normalizer = $normalizer;
         $this->subscriberListManager = $subscriberListManager;
         $this->paginatedDataProvider = $paginatedDataProvider;
+        $this->entityManager = $entityManager;
     }
 
     #[Route('', name: 'get_list', methods: ['GET'])]
@@ -223,6 +227,7 @@ public function deleteList(
         }
 
         $this->subscriberListManager->delete($list);
+        $this->entityManager->flush();
 
         return $this->json(null, Response::HTTP_NO_CONTENT);
     }
@@ -273,6 +278,7 @@ public function createList(Request $request, SubscriberListNormalizer $normalize
         /** @var CreateSubscriberListRequest $subscriberListRequest */
         $subscriberListRequest = $this->validator->validate($request, CreateSubscriberListRequest::class);
         $data = $this->subscriberListManager->createSubscriberList($subscriberListRequest->getDto(), $authUser);
+        $this->entityManager->flush();
 
         return $this->json($normalizer->normalize($data), Response::HTTP_CREATED);
     }
diff --git a/src/Subscription/Service/SubscriberService.php b/src/Subscription/Service/SubscriberService.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Service;
 
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberManager;
 use PhpList\RestBundle\Subscription\Request\CreateSubscriberRequest;
@@ -32,9 +33,9 @@ public function createSubscriber(CreateSubscriberRequest $subscriberRequest): ar
         return $this->subscriberNormalizer->normalize($subscriber, 'json');
     }
 
-    public function updateSubscriber(UpdateSubscriberRequest $updateSubscriberRequest): array
+    public function updateSubscriber(UpdateSubscriberRequest $updateSubscriberRequest, Administrator $admin): array
     {
-        $subscriber = $this->subscriberManager->updateSubscriber($updateSubscriberRequest->getDto());
+        $subscriber = $this->subscriberManager->updateSubscriber($updateSubscriberRequest->getDto(), $admin);
         return $this->subscriberNormalizer->normalize($subscriber, 'json');
     }
 
diff --git a/tests/Unit/Subscription/Service/SubscriberServiceTest.php b/tests/Unit/Subscription/Service/SubscriberServiceTest.php
@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Tests\Unit\Subscription\Service;
 
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Subscription\Model\Dto\CreateSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Dto\UpdateSubscriberDto;
 use PhpList\Core\Domain\Subscription\Model\Subscriber;
@@ -70,6 +71,7 @@ public function testUpdateSubscriberReturnsNormalizedSubscriber(): void
         $updateSubscriberRequest = $this->createMock(UpdateSubscriberRequest::class);
         $subscriber = $this->createMock(Subscriber::class);
         $expectedResult = ['id' => 1, 'email' => 'updated@example.com'];
+        $admin = $this->createMock(Administrator::class);
 
         $updateSubscriberRequest->expects($this->once())
             ->method('getDto')
@@ -85,7 +87,7 @@ public function testUpdateSubscriberReturnsNormalizedSubscriber(): void
             ->with($this->identicalTo($subscriber), 'json')
             ->willReturn($expectedResult);
 
-        $result = $this->subscriberService->updateSubscriber($updateSubscriberRequest);
+        $result = $this->subscriberService->updateSubscriber($updateSubscriberRequest, $admin);
 
         $this->assertSame($expectedResult, $result);
     }

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ public function delete(`
`198`	`198`	`throw $this->createNotFoundException('Administrator attribute not found.');`
`199`	`199`	`}`
`200`	`200`	`$this->attributeManager->delete($attribute);`
	`201`	`+ $this->entityManager->flush();`
`201`	`202`
`202`	`203`	`return $this->json(null, Response::HTTP_NO_CONTENT);`
`203`	`204`	`}`
`@@ -355,6 +356,7 @@ public function getAttributeDefinition(`
`355`	`356`	`attributeDefinitionId: $definition->getId()`
`356`	`357`	`);`
`357`	`358`	`$this->attributeManager->delete($attribute);`
	`359`	`+ $this->entityManager->flush();`
`358`	`360`
`359`	`361`	`return $this->json(`
`360`	`362`	`$this->normalizer->normalize($attribute),`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace PhpList\RestBundle\Messaging\Controller;`
`6`	`6`
	`7`	`+use Doctrine\ORM\EntityManagerInterface;`
`7`	`8`	`use OpenApi\Attributes as OA;`
`8`	`9`	`use PhpList\Core\Domain\Messaging\Service\Manager\BounceRegexManager;`
`9`	`10`	`use PhpList\Core\Security\Authentication;`
`@@ -27,6 +28,7 @@ public function __construct(`
`27`	`28`	`RequestValidator $validator,`
`28`	`29`	`private readonly BounceRegexManager $manager,`
`29`	`30`	`private readonly BounceRegexNormalizer $normalizer,`
	`31`	`+ private readonly EntityManagerInterface $entityManager,`
`30`	`32`	`) {`
`31`	`33`	`parent::__construct($authentication, $validator);`
`32`	`34`	`}`
`@@ -240,6 +242,7 @@ public function delete(Request $request, string $regexHash): JsonResponse`
`240`	`242`	`throw $this->createNotFoundException('Bounce regex not found.');`
`241`	`243`	`}`
`242`	`244`	`$this->manager->delete($entity);`
	`245`	`+ $this->entityManager->flush();`
`243`	`246`
`244`	`247`	`return $this->json(null, Response::HTTP_NO_CONTENT);`
`245`	`248`	`}`