Prop name update admin -> adminId

Author: tatevikg1

src/Domain/Messaging/Model/BounceRegex.php

@@ -31,8 +31,8 @@ class BounceRegex implements DomainModel, Identity
     #[ORM\Column(name: 'listorder', type: 'integer', nullable: true, options: ['default' => 0])]
     private ?int $listOrder = 0;
 
-    #[ORM\Column(type: 'integer', nullable: true)]
-    private ?int $admin;
+    #[ORM\Column(name: 'admin', type: 'integer', nullable: true)]
+    private ?int $adminId;
 
     #[ORM\Column(type: 'text', nullable: true)]
     private ?string $comment;
@@ -48,7 +48,7 @@ public function __construct(
         ?string $regexHash = null,
         ?string $action = null,
         ?int $listOrder = 0,
-        ?int $admin = null,
+        ?int $adminId = null,
         ?string $comment = null,
         ?string $status = null,
         ?int $count = 0
@@ -57,7 +57,7 @@ public function __construct(
         $this->regexHash = $regexHash;
         $this->action = $action;
         $this->listOrder = $listOrder;
-        $this->admin = $admin;
+        $this->adminId = $adminId;
         $this->comment = $comment;
         $this->status = $status;
         $this->count = $count;
@@ -112,14 +112,14 @@ public function setListOrder(?int $listOrder): self
         return $this;
     }
 
-    public function getAdmin(): ?int
+    public function getAdminId(): ?int
     {
-        return $this->admin;
+        return $this->adminId;
     }
 
-    public function setAdmin(?int $admin): self
+    public function setAdminId(?int $adminId): self
     {
-        $this->admin = $admin;
+        $this->adminId = $adminId;
         return $this;
     }
 

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

@@ -30,7 +30,7 @@ public function createOrUpdateFromPattern(
         string $regex,
         ?string $action = null,
         ?int $listOrder = 0,
-        ?int $admin = null,
+        ?int $adminId = null,
         ?string $comment = null,
         ?string $status = null
     ): BounceRegex {
@@ -42,7 +42,7 @@ public function createOrUpdateFromPattern(
             $existing->setRegex($regex)
                 ->setAction($action ?? $existing->getAction())
                 ->setListOrder($listOrder ?? $existing->getListOrder())
-                ->setAdmin($admin ?? $existing->getAdmin())
+                ->setAdminId($adminId ?? $existing->getAdminId())
                 ->setComment($comment ?? $existing->getComment())
                 ->setStatus($status ?? $existing->getStatus());
 
@@ -56,7 +56,7 @@ public function createOrUpdateFromPattern(
             regexHash: $regexHash,
             action: $action,
             listOrder: $listOrder,
-            admin: $admin,
+            adminId: $adminId,
             comment: $comment,
             status: $status,
             count: 0

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

@@ -49,7 +49,7 @@ public function testCreateNewRegex(): void
             regex: $pattern,
             action: 'delete',
             listOrder: 5,
-            admin: 1,
+            adminId: 1,
             comment: 'test',
             status: 'active'
         );
@@ -59,7 +59,7 @@ public function testCreateNewRegex(): void
         $this->assertSame($expectedHash, $regex->getRegexHash());
         $this->assertSame('delete', $regex->getAction());
         $this->assertSame(5, $regex->getListOrder());
-        $this->assertSame(1, $regex->getAdmin());
+        $this->assertSame(1, $regex->getAdminId());
         $this->assertSame('test', $regex->getComment());
         $this->assertSame('active', $regex->getStatus());
     }
@@ -74,7 +74,7 @@ public function testUpdateExistingRegex(): void
             regexHash: $hash,
             action: 'keep',
             listOrder: 0,
-            admin: null,
+            adminId: null,
             comment: null,
             status: 'inactive',
             count: 3
@@ -93,14 +93,14 @@ public function testUpdateExistingRegex(): void
             regex: $pattern,
             action: 'delete',
             listOrder: 10,
-            admin: 2,
+            adminId: 2,
             comment: 'upd',
             status: 'active'
         );
 
         $this->assertSame('delete', $updated->getAction());
         $this->assertSame(10, $updated->getListOrder());
-        $this->assertSame(2, $updated->getAdmin());
+        $this->assertSame(2, $updated->getAdminId());
         $this->assertSame('upd', $updated->getComment());
         $this->assertSame('active', $updated->getStatus());
         $this->assertSame($hash, $updated->getRegexHash());