Merge pull request #23 from pagarme/release/1.1.2

Release 1.1.2

Author: sfwill-dev

composer.json

@@ -2,7 +2,7 @@
   "name": "pagarme/ecommerce-module-core",
   "description": "Core component for Pagar.me e-commerce platform modules.",
   "license": "MIT",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "authors": [
     {
       "name":"Open Source Team"

src/Maintenance/Assets/integrityData

@@ -564,21 +564,12 @@ private function setCardData(CreateSubscriptionRequest $subscriptionRequest)
             return;
         }
 
-        if(!empty($subscriptionRequest->cardId)){
-            return;
-        }
-
-        if(!empty($subscriptionRequest->cardToken)){
-            return;
-        }
-
         $card = new CreateCardRequest();
         if ($this->getCustomer()->getAddress() != null) {
             $card->billingAddress = $this->getCustomer()->getAddress()->convertToSDKRequest();
         }
 
         $subscriptionRequest->card = $card;
-
     }
 
     public function getStatusValue()

src/Recurrence/Aggregates/Subscription.php

@@ -3,6 +3,8 @@
 namespace Pagarme\Core\Test\Recurrence\Aggregates;
 
 use Mockery;
+use MundiAPILib\Models\CreateAddressRequest;
+use MundiAPILib\Models\CreateCardRequest;
 use MundiAPILib\Models\CreateSubscriptionRequest;
 use Pagarme\Core\Kernel\Interfaces\PlatformOrderInterface;
 use Pagarme\Core\Kernel\ValueObjects\Id\ChargeId;
@@ -187,4 +189,52 @@ public function testShouldSetAnArrayOfChargesOnSubscription()
         $this->assertContainsOnlyInstancesOf(Charge::class, $this->subscription->getCharges());
         $this->assertCount(2, $this->subscription->getCharges());
     }
-}
+
+    public function testShouldReturnACreateSubscriptionRequestObjectWithCardBillingAddress()
+    {
+        $this->subscription->setCustomer(new Customer());
+        $this->subscription->setItems([new SubProduct]);
+        $this->subscription->getCustomer()->setAddress(new Address());
+        $this->subscription->setCardToken("cardToken");
+
+        $shipping = new Shipping;
+        $shipping->setRecipientPhone(new Phone("021999999999"));
+        $shipping->setAddress(new Address());
+
+        $this->subscription->setShipping($shipping);
+
+        $card = new CreateCardRequest();
+        $card->billingAddress = $this->subscription->getCustomer()
+            ->getAddress()->convertToSDKRequest();
+        $this->subscription->card = $card;
+
+        $sdkObject = $this->subscription->convertToSdkRequest();
+
+        $this->assertInstanceOf(CreateSubscriptionRequest::class, $sdkObject);
+        $this->assertNotNull($sdkObject->card->billingAddress);
+    }
+
+    public function testShouldReturnACreateSubscriptionRequestObjectWithSavedCardBillingAddress()
+    {
+        $this->subscription->setCustomer(new Customer());
+        $this->subscription->setItems([new SubProduct]);
+        $this->subscription->getCustomer()->setAddress(new Address());
+        $this->subscription->setCardId("cardId");
+
+        $shipping = new Shipping;
+        $shipping->setRecipientPhone(new Phone("021999999999"));
+        $shipping->setAddress(new Address());
+
+        $this->subscription->setShipping($shipping);
+
+        $card = new CreateCardRequest();
+        $card->billingAddress = $this->subscription->getCustomer()
+            ->getAddress()->convertToSDKRequest();
+        $this->subscription->card = $card;
+
+        $sdkObject = $this->subscription->convertToSdkRequest();
+
+        $this->assertInstanceOf(CreateSubscriptionRequest::class, $sdkObject);
+        $this->assertNotNull($sdkObject->card->billingAddress);
+    }
+}