fix: Message document link

dvsa · Feb 23, 2024 · be12fe9 · be12fe9
1 parent 4ee0e3f
commit be12fe9
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 8 deletions.
diff --git a/src/Command/Document/UpdateDocumentLinks.php b/src/Command/Document/UpdateDocumentLinks.php
@@ -11,10 +11,10 @@
 use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\BusRegOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\CasesOptional;
-use Dvsa\Olcs\Transfer\FieldType\Traits\ConversationOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpApplicationOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\LicenceOptional;
-use Dvsa\Olcs\Transfer\FieldType\Traits\MessageOptional;
+use Dvsa\Olcs\Transfer\FieldType\Traits\MessagingConversationOptional;
+use Dvsa\Olcs\Transfer\FieldType\Traits\MessagingMessageOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\TransportManagerOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\SurrenderOptional;
 use Dvsa\Olcs\Transfer\Util\Annotation as Transfer;
@@ -35,8 +35,8 @@ final class UpdateDocumentLinks extends AbstractCommand
     use LicenceOptional;
     use IrhpApplicationOptional;
     use SurrenderOptional;
-    use ConversationOptional;
-    use MessageOptional;
+    use MessagingConversationOptional;
+    use MessagingMessageOptional;
 
     /**
      * @var int

diff --git a/src/Command/Document/Upload.php b/src/Command/Document/Upload.php
@@ -12,9 +12,9 @@
 use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\BusRegOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\CasesOptional;
-use Dvsa\Olcs\Transfer\FieldType\Traits\ConversationOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\LicenceOptional;
-use Dvsa\Olcs\Transfer\FieldType\Traits\MessageOptional;
+use Dvsa\Olcs\Transfer\FieldType\Traits\MessagingConversationOptional;
+use Dvsa\Olcs\Transfer\FieldType\Traits\MessagingMessageOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\SurrenderOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\TransportManagerOptional;
 use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpApplicationOptional;
@@ -34,8 +34,8 @@ final class Upload extends AbstractCommand implements LoggerOmitContentInterface
     use LicenceOptional;
     use SurrenderOptional;
     use IrhpApplicationOptional;
-    use ConversationOptional;
-    use MessageOptional;
+    use MessagingConversationOptional;
+    use MessagingMessageOptional;
 
     /**
      * @Transfer\Filter("Laminas\Filter\PregReplace", options={"pattern": "/[^a-zA-Z0-9\-\_\.]+/", "replacement": ""})

diff --git a/src/FieldType/Traits/MessagingConversationOptional.php b/src/FieldType/Traits/MessagingConversationOptional.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Dvsa\Olcs\Transfer\FieldType\Traits;
+
+trait MessagingConversationOptional
+{
+    /**
+     * @var int
+     * @Transfer\Optional
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
+     */
+    protected $messagingConversation = null;
+
+    public function getMessagingConversation(): ?int
+    {
+        return $this->messagingConversation ? (int)$this->messagingConversation : null;
+    }
+
+    /** @param int $conversationId */
+    public function setMessagingConversation($conversationId)
+    {
+        $this->messagingConversation = $conversationId ? (int)$conversationId : null;
+    }
+}
diff --git a/src/FieldType/Traits/MessagingMessageOptional.php b/src/FieldType/Traits/MessagingMessageOptional.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Dvsa\Olcs\Transfer\FieldType\Traits;
+
+trait MessagingMessageOptional
+{
+    /**
+     * @var int
+     * @Transfer\Optional
+     * @Transfer\Filter("Laminas\Filter\Digits")
+     * @Transfer\Validator("Laminas\Validator\Digits")
+     * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0})
+     */
+    protected $messagingMessage = null;
+
+    public function getMessagingMessage(): ?int
+    {
+        return $this->messagingMessage ? (int)$this->messagingMessage : null;
+    }
+
+    /** @param int $messageId */
+    public function setMessagingMessage($messageId)
+    {
+        $this->messagingMessage = $messageId ? (int)$messageId : null;
+    }
+}