From 253c5ddf09b98cb86cf5ba7d772ebb47b16221be Mon Sep 17 00:00:00 2001
From: Can Demiralp <ecandemiralp@gmail.com>
Date: Fri, 14 Feb 2025 09:51:07 +0100
Subject: [PATCH] [EPC-9597] Generate a new builder and pass company
 information (#2889)

Co-authored-by: Can Demiralp <can.demiralp@adyen.com>
---
 Gateway/Request/CompanyDataBuilder.php        | 45 ++++++++++++++
 .../Request/CompanyDataBuilderTest.php        | 58 +++++++++++++++++++
 etc/di.xml                                    |  8 +++
 3 files changed, 111 insertions(+)
 create mode 100644 Gateway/Request/CompanyDataBuilder.php
 create mode 100644 Test/Unit/Gateway/Request/CompanyDataBuilderTest.php

diff --git a/Gateway/Request/CompanyDataBuilder.php b/Gateway/Request/CompanyDataBuilder.php
new file mode 100644
index 000000000..2425ca24c
--- /dev/null
+++ b/Gateway/Request/CompanyDataBuilder.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2025 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Gateway\Request;
+
+use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Payment\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Sales\Model\Order;
+
+class CompanyDataBuilder implements BuilderInterface
+{
+    public function build(array $buildSubject): array
+    {
+        /** @var PaymentDataObject $paymentDataObject */
+        $paymentDataObject = SubjectReader::readPayment($buildSubject);
+        $payment = $paymentDataObject->getPayment();
+        /** @var Order $order */
+        $order = $payment->getOrder();
+        $billingAddress = $order->getBillingAddress();
+        $company = [];
+
+        if (!empty($billingAddress->getVatId())) {
+            $company['taxId'] = $billingAddress->getVatId();
+        }
+
+        if (!empty($billingAddress->getCompany())) {
+            $company['name'] = $billingAddress->getCompany();
+        }
+
+        return [
+            'body' => [
+                'company' => $company
+            ]
+        ];
+    }
+}
diff --git a/Test/Unit/Gateway/Request/CompanyDataBuilderTest.php b/Test/Unit/Gateway/Request/CompanyDataBuilderTest.php
new file mode 100644
index 000000000..f6c3f6347
--- /dev/null
+++ b/Test/Unit/Gateway/Request/CompanyDataBuilderTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2025 Adyen N.V. (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Test\Gateway\Request;
+
+use Adyen\Payment\Gateway\Request\CompanyDataBuilder;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
+use Magento\Payment\Gateway\Data\PaymentDataObject;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+
+class CompanyDataBuilderTest extends AbstractAdyenTestCase
+{
+    /**
+     * @return void
+     */
+    function testBuild()
+    {
+        $companyName = 'Adyen';
+        $vatId = 'NL-123456789';
+
+        $billingAddressMock = $this->createMock(OrderAddressInterface::class);
+        $billingAddressMock->expects($this->exactly(2))
+            ->method('getCompany')
+            ->willReturn('Adyen');
+        $billingAddressMock->expects($this->exactly(2))
+            ->method('getVatId')
+            ->willReturn($vatId);
+
+        $orderMock = $this->createMock(Order::class);
+        $orderMock->expects($this->once())
+            ->method('getBillingAddress')
+            ->willReturn($billingAddressMock);
+
+        $paymentMock = $this->createMock(Payment::class);
+        $paymentMock->method('getOrder')->willReturn($orderMock);
+
+        $buildSubject = [
+            'payment' => $this->createConfiguredMock(PaymentDataObject::class, [
+                'getPayment' => $paymentMock
+            ])
+        ];
+
+        $builder = new CompanyDataBuilder();
+        $result = $builder->build($buildSubject);
+
+        $this->assertEquals(['body' => ['company' => ['name' => $companyName, 'taxId' => $vatId]]], $result);
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index e7fc019f4..e7369bb61 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1081,6 +1081,7 @@
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
                 <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1098,6 +1099,7 @@
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1114,6 +1116,7 @@
                 <item name="description" xsi:type="string">Adyen\Payment\Gateway\Request\DescriptionDataBuilder</item>
                 <item name="transaction" xsi:type="string">Adyen\Payment\Gateway\Request\CheckoutDataBuilder</item>
                 <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1135,6 +1138,7 @@
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1155,6 +1159,7 @@
                 <item name="shopperinteraction" xsi:type="string">Adyen\Payment\Gateway\Request\ShopperInteractionDataBuilder</item>
                 <item name="header" xsi:type="string">Adyen\Payment\Gateway\Request\Header\HeaderDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1206,6 +1211,7 @@
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1226,6 +1232,7 @@
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -1254,6 +1261,7 @@
                 <item name="channel" xsi:type="string">Adyen\Payment\Gateway\Request\ChannelDataBuilder</item>
                 <item name="origin" xsi:type="string">Adyen\Payment\Gateway\Request\OriginDataBuilder</item>
                 <item name="giftcard" xsi:type="string">Adyen\Payment\Gateway\Request\GiftcardDataBuilder</item>
+                <item name="company" xsi:type="string">Adyen\Payment\Gateway\Request\CompanyDataBuilder</item>
             </argument>
         </arguments>
     </virtualType>