Fix: message format options

Author: tatevikg1

src/Messaging/Request/Message/MessageFormatRequest.php

@@ -10,7 +10,7 @@
 
 #[OA\Schema(
     schema: 'MessageFormatRequest',
-    required: ['html_formated', 'send_format', 'format_options'],
+    required: ['html_formated', 'send_format'],
     properties: [
         new OA\Property(property: 'html_formated', type: 'boolean', example: true),
         new OA\Property(
@@ -19,12 +19,6 @@
             enum: ['html', 'text', 'invite'],
             example: 'html'
         ),
-        new OA\Property(
-            property: 'format_options',
-            type: 'array',
-            items: new OA\Items(type: 'string', enum: ['text', 'html', 'pdf']),
-            example: ['html']
-        ),
     ],
     type: 'object'
 )]
@@ -36,18 +30,11 @@ class MessageFormatRequest implements RequestDtoInterface
     #[Assert\Choice(['html', 'text', 'invite'])]
     public string $sendFormat;
 
-    #[Assert\All([
-        new Assert\Type('string'),
-        new Assert\Choice(['text', 'html', 'pdf']),
-    ])]
-    public array $formatOptions;
-
     public function getDto(): MessageFormatDto
     {
         return new MessageFormatDto(
             htmlFormated: $this->htmlFormated,
             sendFormat: $this->sendFormat,
-            formatOptions: $this->formatOptions,
         );
     }
 }

src/Messaging/Request/Message/MessageScheduleRequest.php

@@ -34,12 +34,12 @@ class MessageScheduleRequest implements RequestDtoInterface
 {
     public ?int $repeatInterval = null;
 
-    #[Assert\DateTime]
+    #[Assert\DateTime(format: "Y-m-d\TH:i:s.uP")]
     public ?string $repeatUntil = null;
 
     public ?int $requeueInterval = null;
 
-    #[Assert\DateTime]
+    #[Assert\DateTime(format: "Y-m-d\TH:i:s.uP")]
     public ?string $requeueUntil = null;
 
     #[Assert\NotBlank]

src/Messaging/Serializer/MessageNormalizer.php

@@ -36,6 +36,9 @@
                 new OA\Property(property: 'send_format', type: 'string', example: 'text', nullable: true),
                 new OA\Property(property: 'as_text', type: 'integer', example: 12),
                 new OA\Property(property: 'as_html', type: 'integer', example: 12),
+                new OA\Property(property: 'as_text_and_html', type: 'integer', example: 12),
+                new OA\Property(property: 'as_pdf', type: 'integer', example: 12),
+                new OA\Property(property: 'as_text_and_pdf', type: 'integer', example: 12),
             ],
             type: 'object'
         ),
@@ -112,6 +115,9 @@ public function normalize($object, string $format = null, array $context = []):
                 'send_format' => $object->getFormat()->getSendFormat(),
                 'as_text' => $object->getFormat()->getAsText(),
                 'as_html' => $object->getFormat()->getAsHtml(),
+                'as_text_and_html' => $object->getFormat()->getAsTextAndHtml(),
+                'as_pdf' => $object->getFormat()->getAsPdf(),
+                'as_text_and_pdf' => $object->getFormat()->getAsTextAndHtml(),
             ],
             'message_metadata' => [
                 'status' => $object->getMetadata()->getStatus()->value,