Fix customer generation

Author: marcortola

composer.json

@@ -39,15 +39,19 @@
         }
     },
     "scripts": {
-        "test": [
+        "cs": [
             "composer normalize --dry-run --no-interaction",
             "vendor/bin/ecs check src --no-interaction",
             "vendor/bin/phpstan analyse --no-interaction",
             "vendor/bin/phpunit"
         ],
-        "test-fix": [
+        "cs-fix": [
             "composer normalize --no-interaction",
             "vendor/bin/ecs check src --fix --no-interaction"
+        ],
+        "test": [
+            "vendor/bin/phpstan analyse --no-interaction",
+            "vendor/bin/phpunit"
         ]
     }
 }

src/Model/Customer/Company.php

@@ -13,10 +13,11 @@ public function __construct(
         string $postalCode,
         string $cif,
         string $region,
+        string $countryCode,
         string $businessName,
         string $tradeName
     ) {
-        parent::__construct($address, $town, $postalCode, $cif, $region);
+        parent::__construct($address, $town, $postalCode, $cif, $region, $countryCode);
 
         $this->businessType = 'company';
         $this->businessName = $businessName;
@@ -47,6 +48,7 @@ public static function createFromArray(array $data): Company
             $customer->getPostalCode(),
             $customer->getCif(),
             $customer->getRegion(),
+            $customer->getCountryCode(),
             $data['business_name'],
             $data['tradename']
         );

src/Model/Customer/Customer.php

@@ -79,7 +79,15 @@ public function getDefaultPaymentMethod(): ?string
 
     public function setDefaultPaymentMethod(?string $defaultPaymentMethod): void
     {
-        Assert::oneOf($defaultPaymentMethod, ['cash', 'receipt', 'wire_transfer', 'card', 'promissory_note', 'other']);
+        Assert::oneOf($defaultPaymentMethod, [
+            null,
+            'cash',
+            'receipt',
+            'wire_transfer',
+            'card',
+            'promissory_note',
+            'other',
+        ]);
         $this->defaultPaymentMethod = $defaultPaymentMethod;
     }
 
@@ -153,7 +161,7 @@ public function setRegion(string $region): void
         $this->region = $region;
     }
 
-    public function getCountryCode(): ?string
+    public function getCountryCode(): string
     {
         return $this->countryCode;
     }
@@ -230,7 +238,7 @@ public function getDefaultInvoiceLanguage(): ?string
 
     public function setDefaultInvoiceLanguage(?string $defaultInvoiceLanguage): void
     {
-        Assert::oneOf($defaultInvoiceLanguage, ['default', 'es', 'eu', 'ca', 'en']);
+        Assert::oneOf($defaultInvoiceLanguage, [null, 'default', 'es', 'eu', 'ca', 'en']);
         $this->defaultInvoiceLanguage = $defaultInvoiceLanguage;
     }
 

src/Model/Customer/Individual.php

@@ -10,10 +10,11 @@ public function __construct(
         string $postalCode,
         string $cif,
         string $region,
+        string $countryCode,
         string $name,
         string $firstSurname
     ) {
-        parent::__construct($address, $town, $postalCode, $cif, $region);
+        parent::__construct($address, $town, $postalCode, $cif, $region, $countryCode);
 
         $this->businessType = 'individual';
         $this->setName($name);
@@ -34,6 +35,7 @@ public static function createFromArray(array $data): Individual
             $customer->getPostalCode(),
             $customer->getCif(),
             $customer->getRegion(),
+            $customer->getCountryCode(),
             $data['name'],
             $data['surname_1']
         );

tests/Model/Customer/CustomerTest.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MarcOrtola\Cuentica\Tests\Model\Customer;
+
+use MarcOrtola\Cuentica\Model\Customer\Company;
+use MarcOrtola\Cuentica\Model\Customer\CustomerFactory;
+use MarcOrtola\Cuentica\Model\Customer\Individual;
+use PHPStan\Testing\TestCase;
+
+final class CustomerTest extends TestCase
+{
+    /** @test */
+    public function validApiArrayCustomerResponseShouldBeValidIndividualCustomer(): void
+    {
+        $input = [
+            'address' => 'Street 1',
+            'town' => 'Madrid',
+            'postal_code' => '9100',
+            'cif' => '',
+            'region' => 'Texas',
+            'country_code' => 'AR',
+            'business_type' => 'individual',
+            'id' => 597119,
+            'name' => 'Steve',
+            'surname_1' => 'Gates',
+            'email' => 'invent@email.com',
+            'personal_comment' => 'This is a comment.',
+        ];
+
+        $customer = new Individual('Street 1', 'Madrid', '9100', '', 'Texas', 'AR', 'Steve', 'Gates');
+        $customer->setId(597119);
+        $customer->setEmail('invent@email.com');
+        $customer->setPersonalComment('This is a comment.');
+
+        $this->assertEquals($customer, CustomerFactory::createFromArray($input));
+    }
+
+    /** @test */
+    public function validApiArrayCustomerResponseShouldBeValidCompanyCustomer(): void
+    {
+        $input = [
+            'address' => 'Street 1',
+            'town' => 'Madrid',
+            'postal_code' => '9100',
+            'cif' => '',
+            'region' => 'Texas',
+            'country_code' => 'AR',
+            'business_type' => 'company',
+            'business_name' => 'My business name',
+            'tradename' => 'That tradename',
+            'id' => 597119,
+            'name' => 'Steve',
+            'surname_1' => 'Gates',
+            'email' => 'invent@email.com',
+            'personal_comment' => 'This is a comment.',
+        ];
+
+        $customer = new Company('Street 1', 'Madrid', '9100', '', 'Texas', 'AR', 'My business name', 'That tradename');
+        $customer->setId(597119);
+        $customer->setName('Steve');
+        $customer->setFirstSurname('Gates');
+        $customer->setEmail('invent@email.com');
+        $customer->setPersonalComment('This is a comment.');
+
+        $this->assertEquals($customer, CustomerFactory::createFromArray($input));
+    }
+}