Proper message handling for SMS generation

Author: Franck Allimant

Config/module.xml

@@ -7,7 +7,7 @@
     <descriptive locale="fr_FR">
         <title>Retrait sur place</title>
     </descriptive>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <author>
         <name>Thelia</name>
         <email>info@thelia.net</email>

EventListeners/NotificationListener.php

@@ -17,49 +17,40 @@
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use LocalPickup\LocalPickup;
-use OpenApi\Events\DeliveryModuleOptionEvent;
-use OpenApi\Events\OpenApiEvents;
-use OpenApi\Model\Api\DeliveryModuleOption;
-use OpenApi\Model\Api\ModelFactory;
 use Propel\Runtime\Exception\PropelException;
 use SmartyException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Notifier\Exception\TransportExceptionInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\TexterInterface;
 use Thelia\Core\Event\Order\OrderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Template\ParserInterface;
-use Thelia\Core\Template\TemplateHelperInterface;
 use Thelia\Exception\TheliaProcessException;
 use Thelia\Log\Tlog;
 use Thelia\Mailer\MailerFactory;
 use Thelia\Model\CountryQuery;
 use Thelia\Model\MessageQuery;
-use Thelia\Model\ModuleQuery;
 use Thelia\Model\Order;
 use Thelia\Model\OrderStatus;
 
-class NotificationListener implements EventSubscriberInterface
+readonly class NotificationListener implements EventSubscriberInterface
 {
     /**
      * APIListener constructor.
      */
     public function __construct(
-        private MailerFactory           $mailer,
-        private ?TexterInterface        $texter,
-        private ParserInterface         $parser,
-        private TemplateHelperInterface $templateHelper
-    )
-    {
-        $this->mailer = $mailer;
+        private MailerFactory    $mailer,
+        private ?TexterInterface $texter,
+        private ParserInterface  $parser,
+    ) {
     }
 
     /**
+     * @param OrderEvent $orderEvent
+     * @return void
      * @throws PropelException
      * @throws TransportExceptionInterface
-     * @throws SmartyException
      */
     public function orderStatusChange(OrderEvent $orderEvent): void
     {
@@ -79,12 +70,22 @@ public function orderStatusChange(OrderEvent $orderEvent): void
         }
     }
 
+    /**
+     * @param Order $order
+     * @return bool
+     * @throws PropelException
+     */
     private function isEligibleForLocalPickupNotification(Order $order): bool
     {
         return $order->getDeliveryModuleId() === LocalPickup::getModuleId()
             && $order->getOrderStatus()->getCode() === OrderStatus::CODE_SENT;
     }
 
+    /**
+     * @param Order $order
+     * @return void
+     * @throws PropelException
+     */
     private function sendLocalPickupEmail(Order $order): void
     {
         $this->mailer->sendEmailToCustomer(
@@ -103,8 +104,12 @@ private function sendLocalPickupEmail(Order $order): void
     }
 
     /**
-     * @throws PropelException|TransportExceptionInterface
+     * @param Order $order
+     * @return void
+     * @throws NumberParseException
+     * @throws PropelException
      * @throws SmartyException
+     * @throws TransportExceptionInterface
      */
     private function sendSmsIfNeeded(Order $order): void
     {
@@ -118,20 +123,24 @@ private function sendSmsIfNeeded(Order $order): void
 
         $langCode = $this->getOrderLangCode($order);
         $internationalNumber = $this->internationalizePhoneNumber($numberToUse, $langCode);
+
         $message = MessageQuery::create()
             ->filterByName(LocalPickup::SMS_CUSTOM_LOCAL_PICKUP)
             ->findOne();
+
         if (!$message) {
             throw new TheliaProcessException('Message ' . LocalPickup::SMS_CUSTOM_LOCAL_PICKUP . ' not found.');
         }
-        $this->parser->setTemplateDefinition(
-            $this->templateHelper->getActiveMailTemplate(),
-            true
-        );
+
+        $message->setLocale($order->getLang()->getLocale());
+
+        $this->parser->assign('order_id', $order->getId());
+
         $sms = new SmsMessage(
             $internationalNumber,
-            $this->parser->render($message->getHtmlTemplateFileName(), ['order_id' => $order->getId()])
+            $message->getTextMessageBody($this->parser)
         );
+
         $this->texter->send($sms);
     }
 
@@ -175,7 +184,7 @@ private function getOrderLangCode(Order $order): string
         return $country ? $country->getIsoalpha2() : 'FR';
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             TheliaEvents::ORDER_UPDATE_STATUS => ['orderStatusChange', 99]