Improve work with phone numbers (#4514)

Author: chlebektomas

src/Model/Complaint/ComplaintDataApiFactory.php

@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Model\Country\CountryFacade;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser;
 use Shopsys\FrameworkBundle\Model\Order\Order;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 
 class ComplaintDataApiFactory
 {
@@ -53,7 +54,8 @@ public function createFromComplaintInputArgument(
         $complaintData->deliveryFirstName = $delivery['firstName'];
         $complaintData->deliveryLastName = $delivery['lastName'];
         $complaintData->deliveryCompanyName = $delivery['companyName'];
-        $complaintData->deliveryTelephone = $delivery['telephone'];
+        $telephoneInput = $delivery['telephone'] ?? null;
+        $complaintData->deliveryTelephone = $telephoneInput ? PhoneData::fromArray($telephoneInput) : null;
         $complaintData->deliveryStreet = $delivery['street'];
         $complaintData->deliveryCity = $delivery['city'];
         $complaintData->deliveryPostcode = $delivery['postcode'];

src/Model/Customer/User/CustomerUserDataFactory.php

@@ -11,6 +11,7 @@
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserData;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserDataFactory as BaseCustomerUserDataFactory;
 use Shopsys\FrameworkBundle\Model\Customer\User\Role\CustomerUserRoleGroupRepository;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 
 class CustomerUserDataFactory
 {
@@ -50,6 +51,8 @@ protected function mapInputDataToCustomerUserData(
             }
         }
 
+        $customerUserData->telephone = PhoneData::fromArray($input['telephone']);
+
         $this->setRoleGroup($customerUserData, $input['roleGroupUuid']);
 
         return $customerUserData;

src/Model/Customer/User/CustomerUserUpdateDataFactory.php

@@ -11,6 +11,7 @@
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserDataFactory as FrameworkCustomerUserDataFactory;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserUpdateData;
 use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserUpdateDataFactory as FrameworkCustomerUserUpdateDataFactory;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 
 class CustomerUserUpdateDataFactory
 {
@@ -37,6 +38,8 @@ public function createFromCustomerUserWithArgument(
             }
         }
 
+        $customerUserData->telephone = PhoneData::fromArray($input['telephone']);
+
         return $customerUserUpdateData;
     }
 

src/Model/Customer/User/RegistrationData.php

@@ -77,7 +77,7 @@ class RegistrationData
     public $createdAt;
 
     /**
-     * @var string|null
+     * @var \Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData|null
      */
     public $telephone;
 

src/Model/Customer/User/RegistrationDataFactory.php

@@ -9,6 +9,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Component\String\TransformStringHelper;
 use Shopsys\FrameworkBundle\Model\Country\CountryFacade;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 
 class RegistrationDataFactory
 {
@@ -31,6 +32,7 @@ public function createWithArgument(Argument $argument): RegistrationData
             }
         }
 
+        $registrationData->telephone = PhoneData::fromArray($input['telephone']);
         $registrationData->country = $this->countryFacade->findByCode($input['country']);
 
         return $registrationData;

src/Model/Mutation/Customer/DeliveryAddress/DeliveryAddressDataApiFactory.php

@@ -11,6 +11,7 @@
 use Shopsys\FrameworkBundle\Model\Customer\DeliveryAddressData;
 use Shopsys\FrameworkBundle\Model\Customer\DeliveryAddressDataFactory;
 use Shopsys\FrameworkBundle\Model\Customer\DeliveryAddressFacade;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 
 class DeliveryAddressDataApiFactory
 {
@@ -64,7 +65,9 @@ public function createFromDeliveryInputArgumentAndCustomer(
         $deliveryAddressData->street = $input['street'];
         $deliveryAddressData->city = $input['city'];
         $deliveryAddressData->postcode = $input['postcode'];
-        $deliveryAddressData->telephone = $input['telephone'];
+        $telephoneInput = $input['telephone'] ?? null;
+
+        $deliveryAddressData->telephone = $telephoneInput !== null ? PhoneData::fromArray($telephoneInput) : null;
         $deliveryAddressData->country = $country;
         $deliveryAddressData->customer = $customer;
 

src/Model/Mutation/Inquiry/CreateInquiryMutation.php

@@ -12,6 +12,7 @@
 use Shopsys\FrameworkBundle\Model\Inquiry\InquiryDataFactory;
 use Shopsys\FrameworkBundle\Model\Inquiry\InquiryFacade;
 use Shopsys\FrameworkBundle\Model\Inquiry\Mail\InquiryMailFacade;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 use Shopsys\FrameworkBundle\Model\Product\Exception\ProductNotFoundException;
 use Shopsys\FrameworkBundle\Model\Product\ProductFacade;
 use Shopsys\FrontendApiBundle\Model\Mutation\AbstractMutation;
@@ -54,7 +55,7 @@ protected function createInquiryDataFromArgument(Argument $argument): InquiryDat
         $inquiryData->firstName = $input['firstName'];
         $inquiryData->lastName = $input['lastName'];
         $inquiryData->email = $input['email'];
-        $inquiryData->telephone = $input['telephone'];
+        $inquiryData->telephone = PhoneData::fromArray($input['telephone']);
         $inquiryData->companyName = $input['companyName'] ?? null;
         $inquiryData->companyNumber = $input['companyNumber'] ?? null;
         $inquiryData->companyTaxNumber = $input['companyTaxNumber'] ?? null;

src/Model/Order/OrderDataFactory.php

@@ -10,6 +10,7 @@
 use Shopsys\FrameworkBundle\Model\Order\OrderData;
 use Shopsys\FrameworkBundle\Model\Order\OrderDataFactory as FrameworkOrderDataFactory;
 use Shopsys\FrameworkBundle\Model\Payment\PaymentFacade;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\PhoneData;
 use Shopsys\FrameworkBundle\Model\Pricing\Currency\CurrencyFacade;
 use Shopsys\FrameworkBundle\Model\Product\ProductFacade;
 use Shopsys\FrameworkBundle\Model\Store\StoreFacade;
@@ -60,7 +61,15 @@ protected function withResolvedFields(array $input, OrderData $orderData): Order
             $cloneOrderData->deliveryCountry = $this->countryFacade->findByCode($input['deliveryCountry']);
         }
 
-        unset($input['currency'], $input['country'], $input['deliveryCountry']);
+        $cloneOrderData->telephone = PhoneData::fromArray($input['telephone']);
+
+        $deliveryTelephoneInput = $input['deliveryTelephone'] ?? null;
+
+        if ($deliveryTelephoneInput !== null) {
+            $cloneOrderData->deliveryTelephone = PhoneData::fromArray($deliveryTelephoneInput);
+        }
+
+        unset($input['currency'], $input['country'], $input['deliveryCountry'], $input['telephone'], $input['deliveryTelephone']);
 
         foreach ($input as $key => $value) {
             if (property_exists(get_class($orderData), $key)) {

src/Model/Resolver/Settings/PhonePrefixesQuery.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopsys\FrontendApiBundle\Model\Resolver\Settings;
+
+use Shopsys\FrameworkBundle\Component\Country\CountryFlag;
+use Shopsys\FrameworkBundle\Component\Domain\Domain;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\CountryDialCode;
+use Shopsys\FrameworkBundle\Model\PhonePrefix\CountryDialCodeProvider;
+use Shopsys\FrontendApiBundle\Model\Resolver\AbstractQuery;
+use Symfony\Component\Intl\Countries;
+
+class PhonePrefixesQuery extends AbstractQuery
+{
+    public function __construct(
+        protected readonly Domain $domain,
+        protected readonly CountryDialCodeProvider $countryDialCodeProvider,
+    ) {
+    }
+
+    /**
+     * @return array<int, array{code: string, dialCode: string, countryName: string, flagEmoji: string}>
+     */
+    public function phonePrefixesQuery(): array
+    {
+        $locale = $this->domain->getLocale();
+
+        $countryDialCodes = $this->countryDialCodeProvider->getAllEnabledOnDomainWithDefaultFirst($this->domain->getId());
+
+        return array_map(
+            static fn (CountryDialCode $countryDialCode): array => [
+                'code' => $countryDialCode->code,
+                'dialCode' => $countryDialCode->dialCode,
+                'countryName' => Countries::getName($countryDialCode->code, $locale),
+                'flagEmoji' => CountryFlag::getFlagEmoji($countryDialCode->code),
+            ],
+            $countryDialCodes,
+        );
+    }
+}

src/Resources/config/graphql-types/ModelType/Complaint/ComplaintDecorator.types.yaml

@@ -24,6 +24,9 @@ ComplaintDecorator:
             deliveryTelephone:
                 type: "String!"
                 description: "Contact telephone number for delivery"
+            deliveryTelephoneData:
+                type: "PhoneData!"
+                description: "Structured delivery telephone data with prefix and number"
             deliveryStreet:
                 type: "String!"
                 description: "Street name for delivery"