Bounce regex update

Author: tatevikg1

README.md

@@ -222,3 +222,9 @@ command to extract translation strings
 ```bash
 php bin/console translation:extract --force en --format=xlf
 ```
+
+```bash
+vendor/bin/phpstan analyse -c phpstan.neon;
+vendor/bin/phpmd src/ text config/PHPMD/rules.xml;
+vendor/bin/phpcs --standard=config/PhpCodeSniffer/ --ignore=*/Migrations/* bin/ src/ tests/ public/;
+```

src/Domain/Messaging/Service/Manager/BounceRegexManager.php

@@ -5,10 +5,12 @@
 namespace PhpList\Core\Domain\Messaging\Service\Manager;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\BounceRegex;
 use PhpList\Core\Domain\Messaging\Model\BounceRegexBounce;
 use PhpList\Core\Domain\Messaging\Repository\BounceRegexRepository;
+use Symfony\Component\Validator\Exception\ValidatorException;
 
 class BounceRegexManager
 {
@@ -25,36 +27,28 @@ public function __construct(
 
     /**
      * Creates or updates (if exists) a BounceRegex from a raw regex pattern.
+     * @throws ValidatorException
      */
-    public function createOrUpdateFromPattern(
+    public function create(
         string $regex,
+        Administrator $admin,
         ?string $action = null,
         ?int $listOrder = 0,
-        ?int $adminId = null,
         ?string $comment = null,
         ?string $status = null
     ): BounceRegex {
         $regexHash = md5($regex);
-
         $existing = $this->bounceRegexRepository->findOneByRegexHash($regexHash);
-
         if ($existing !== null) {
-            $existing->setRegex($regex)
-                ->setAction($action ?? $existing->getAction())
-                ->setListOrder($listOrder ?? $existing->getListOrder())
-                ->setAdminId($adminId ?? $existing->getAdminId())
-                ->setComment($comment ?? $existing->getComment())
-                ->setStatus($status ?? $existing->getStatus());
-
-            return $existing;
+            throw new ValidatorException('Bounce Regex already exists.');
         }
 
         $bounceRegex = new BounceRegex(
             regex: $regex,
             regexHash: $regexHash,
             action: $action,
             listOrder: $listOrder,
-            adminId: $adminId,
+            adminId: $admin->getId(),
             comment: $comment,
             status: $status,
             count: 0
@@ -65,6 +59,30 @@ public function createOrUpdateFromPattern(
         return $bounceRegex;
     }
 
+    public function update(
+        BounceRegex $bounceRegex,
+        string $regex,
+        ?string $action = null,
+        ?int $listOrder = 0,
+        ?string $comment = null,
+        ?string $status = null
+    ): BounceRegex {
+        $regexHash = md5($regex);
+        $existing = $this->bounceRegexRepository->findOneByRegexHash($regexHash);
+        if ($existing !== null && $existing->getId() !== $bounceRegex->getId()) {
+            throw new ValidatorException('Bounce Regex already exists.');
+        }
+
+        $bounceRegex->setRegex($regex)
+            ->setAction($action ?? $existing->getAction())
+            ->setListOrder($listOrder ?? $existing->getListOrder())
+            ->setRegexHash($regexHash)
+            ->setComment($comment ?? $existing->getComment())
+            ->setStatus($status ?? $existing->getStatus());
+
+        return $bounceRegex;
+    }
+
     /** @return BounceRegex[] */
     public function getAll(): array
     {

tests/Unit/Domain/Messaging/Service/Manager/BounceRegexManagerTest.php

@@ -5,6 +5,7 @@
 namespace PhpList\Core\Tests\Unit\Domain\Messaging\Service\Manager;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 use PhpList\Core\Domain\Messaging\Model\Bounce;
 use PhpList\Core\Domain\Messaging\Model\BounceRegex;
 use PhpList\Core\Domain\Messaging\Model\BounceRegexBounce;
@@ -35,6 +36,8 @@ public function testCreateNewRegex(): void
     {
         $pattern = 'user unknown';
         $expectedHash = md5($pattern);
+        $admin = $this->createMock(Administrator::class);
+        $admin->method('getId')->willReturn(5);
 
         $this->regexRepository->expects($this->once())
             ->method('findOneByRegexHash')
@@ -45,11 +48,11 @@ public function testCreateNewRegex(): void
             ->method('persist')
             ->with($this->isInstanceOf(BounceRegex::class));
 
-        $regex = $this->manager->createOrUpdateFromPattern(
+        $regex = $this->manager->create(
             regex: $pattern,
+            admin: $admin,
             action: 'delete',
             listOrder: 5,
-            adminId: 1,
             comment: 'test',
             status: 'active'
         );
@@ -59,7 +62,6 @@ public function testCreateNewRegex(): void
         $this->assertSame($expectedHash, $regex->getRegexHash());
         $this->assertSame('delete', $regex->getAction());
         $this->assertSame(5, $regex->getListOrder());
-        $this->assertSame(1, $regex->getAdminId());
         $this->assertSame('test', $regex->getComment());
         $this->assertSame('active', $regex->getStatus());
     }
@@ -74,7 +76,7 @@ public function testUpdateExistingRegex(): void
             regexHash: $hash,
             action: 'keep',
             listOrder: 0,
-            adminId: null,
+            adminId: 2,
             comment: null,
             status: 'inactive',
             count: 3
@@ -85,11 +87,11 @@ public function testUpdateExistingRegex(): void
             ->with($hash)
             ->willReturn($existing);
 
-        $updated = $this->manager->createOrUpdateFromPattern(
+        $updated = $this->manager->update(
+            bounceRegex: $existing,
             regex: $pattern,
             action: 'delete',
             listOrder: 10,
-            adminId: 2,
             comment: 'upd',
             status: 'active'
         );