Release 2.5.0

pagarme · Jun 13, 2024 · 7566480 · 7566480
2 parents 3e75e53 + 9dff92d
commit 7566480
Show file tree

Hide file tree

Showing 42 changed files with 2,063 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@
 /vendor/
 /tests/report
 /tests/mock/db_test.sqlite
+composer.lock
+.phpunit.result.cache
+coverage
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "pagarme/ecommerce-module-core",
   "description": "Core component for Pagar.me e-commerce platform modules.",
   "license": "MIT",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "authors": [
     {
       "name":"Open Source Team"
@@ -12,7 +12,7 @@
   "require": {
     "php": ">=7.1",
     "monolog/monolog": "<3",
-    "pagarme/pagarmecoreapi": "v5.6.4",
+    "pagarme/pagarmecoreapi": "v5.6.5",
     "ext-json": "*"
   },
   "require-dev": {

diff --git a/src/Kernel/Aggregates/Charge.php b/src/Kernel/Aggregates/Charge.php
@@ -401,7 +401,7 @@ public function updateTransaction(Transaction $updatedTransaction, $overwriteId
     /**
      * @return array
      */
-    public function getAcquirerTidCapturedAndAutorize()
+    public function getAcquirerTidCapturedAndAuthorize()
     {
         $transactions = $this->getTransactions();
 

diff --git a/src/Kernel/Aggregates/Configuration.php b/src/Kernel/Aggregates/Configuration.php
@@ -14,6 +14,7 @@
 use Pagarme\Core\Kernel\ValueObjects\Configuration\RecurrenceConfig;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\VoucherConfig;
 use Pagarme\Core\Kernel\ValueObjects\Configuration\DebitConfig;
+use Pagarme\Core\Kernel\ValueObjects\Configuration\GooglePayConfig;
 use Pagarme\Core\Kernel\ValueObjects\Key\AbstractSecretKey;
 use Pagarme\Core\Kernel\ValueObjects\Key\AbstractPublicKey;
 use Pagarme\Core\Kernel\ValueObjects\Key\TestPublicKey;
@@ -42,6 +43,7 @@ final class Configuration extends AbstractEntity
      * @var bool
      */
     private $creditCardEnabled;
+    private $googlepayEnabled;
     /**
      *
      * @var bool
@@ -158,6 +160,7 @@ final class Configuration extends AbstractEntity
 
     /** @var DebitConfig */
     private $debitConfig;
+    private $googlePayConfig;
 
     /**
      * @var PixConfig
@@ -222,6 +225,18 @@ public function getDebitConfig()
         return $this->debitConfig;
     }
 
+    public function getGooglePayConfig()
+    {
+        return $this->googlePayConfig;
+    }
+
+    /**
+     * @param GooglePayConfig $googlePayConfig
+     */
+    public function setGooglePayConfig(GooglePayConfig $googlePayConfig)
+    {
+        $this->googlePayConfig = $googlePayConfig;
+    }
     /**
      * @param DebitConfig $debitConfig
      */
@@ -421,6 +436,19 @@ public function setCreditCardEnabled($creditCardEnabled)
         return $this;
     }
 
+     /**
+     *
+     * @param bool $googlepayEnabled
+     * @return Configuration
+     */
+    public function setGooglePayEnabled($googlepayEnabled)
+    {
+        $this->googlepayEnabled = filter_var(
+            $googlepayEnabled,
+            FILTER_VALIDATE_BOOLEAN
+        );
+        return $this;
+    }
     /**
      * @param $sendMailEnable
      * @return $this
@@ -492,6 +520,10 @@ protected function isCreditCardEnabled()
     {
         return $this->creditCardEnabled;
     }
+    protected function isGooglePayEnabled()
+    {
+        return $this->googlepayEnabled;
+    }
 
     /**
      * @return bool
@@ -845,6 +877,7 @@ public function jsonSerialize()
             "voucherConfig" => $this->getVoucherConfig(),
             "debitConfig" => $this->getDebitConfig(),
             "pixConfig" => $this->getPixConfig(),
+            "googlePayConfig" => $this->getGooglePayConfig(),
             "marketplaceConfig" => $this->getMarketplaceConfig()
         ];
     }

diff --git a/src/Kernel/Aggregates/Order.php b/src/Kernel/Aggregates/Order.php
@@ -152,12 +152,18 @@ public function applyOrderStatusFromCharges()
         }
 
         if (
-            in_array(ChargeStatus::failed()->getStatus(), $listChargeStatus) &&
             in_array(ChargeStatus::canceled()->getStatus(), $listChargeStatus)
         ) {
             $this->setStatus(OrderStatus::canceled());
         }
 
+        if (
+            in_array(ChargeStatus::failed()->getStatus(), $listChargeStatus)
+        )
+        {
+            $this->setStatus(OrderStatus::failed());
+        }
+
         if (
             $chargesStatusEquals &&
             !$this->getCharges()[0]->getStatus()->equals(ChargeStatus::underpaid())

diff --git a/src/Kernel/Factories/ConfigurationFactory.php b/src/Kernel/Factories/ConfigurationFactory.php
@@ -7,6 +7,7 @@
 use Pagarme\Core\Kernel\Factories\Configurations\DebitConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\MarketplaceConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\PixConfigFactory;
+use Pagarme\Core\Kernel\Factories\Configurations\GooglePayConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\RecurrenceConfigFactory;
 use Pagarme\Core\Kernel\Factories\Configurations\VoucherConfigFactory;
 use Pagarme\Core\Kernel\Interfaces\FactoryInterface;
@@ -231,6 +232,11 @@ public function createFromJsonData($json)
                 (new PixConfigFactory())->createFromDbData($data->pixConfig)
             );
         }
+        if (!empty($data->googlePayConfig)) {
+            $config->setGooglePayConfig(
+                (new GooglePayConfigFactory())->createFromDbData($data->googlePayConfig)
+            );
+        }
 
         if (!empty($data->allowNoAddress)) {
             $config->setAllowNoAddress($data->allowNoAddress);

diff --git a/src/Kernel/Factories/Configurations/GooglePayConfigFactory.php b/src/Kernel/Factories/Configurations/GooglePayConfigFactory.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Pagarme\Core\Kernel\Factories\Configurations;
+
+use Pagarme\Core\Kernel\Interfaces\FactoryCreateFromDbDataInterface;
+use Pagarme\Core\Kernel\ValueObjects\Configuration\GooglePayConfig;
+
+class GooglePayConfigFactory implements FactoryCreateFromDbDataInterface
+{
+    /**
+     * @param object $data
+     * @return GooglePayConfig
+     */
+    public function createFromDbData($data)
+    {
+        $googlePayConfig = new GooglePayConfig();
+
+        if (isset($data->enabled)) {
+            $googlePayConfig->setEnabled((bool) $data->enabled);
+        }
+
+        if (!empty($data->title)) {
+            $googlePayConfig->setTitle($data->title);
+        }
+
+        if (!empty($data->merchantId)) {
+            $googlePayConfig->setMerchantId($data->merchantId);
+        }
+        if (!empty($data->merchantName)) {
+            $googlePayConfig->setMerchantName($data->merchantName);
+        }
+
+        return $googlePayConfig;
+    }
+}
diff --git a/src/Kernel/Services/LogService.php b/src/Kernel/Services/LogService.php
@@ -49,9 +49,10 @@ class LogService
      */
     public function __construct(
         $channelName,
-        $addHost = false
+        $addHost = false,
+        $stackTraceDepth = 2
     ) {
-        $this->stackTraceDepth = 2;
+        $this->stackTraceDepth = $stackTraceDepth;
         $this->channelName = $channelName;
         $this->path = AbstractModuleCoreSetup::getLogPath();
         if (is_array($this->path)) {

diff --git a/src/Kernel/ValueObjects/Configuration/GooglePayConfig.php b/src/Kernel/ValueObjects/Configuration/GooglePayConfig.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Pagarme\Core\Kernel\ValueObjects\Configuration;
+
+use Pagarme\Core\Kernel\Abstractions\AbstractValueObject;
+
+class GooglePayConfig extends AbstractValueObject
+{
+    private $enabled;
+    private $title;
+    private $merchantId;
+    private $merchantName;
+
+    /**
+     * @param bool $enabled
+     * @return GooglePayConfig
+     */
+    public function setEnabled($enabled)
+    {
+        $this->enabled = $enabled;
+        return $this;
+    }
+
+    /**
+     * @param string $title
+     * @return GooglePayConfig
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+        return $this;
+    }
+
+    /**
+     * @param string $merchantId
+     * @return GooglePayConfig
+     */
+    public function setMerchantId($merchantId)
+    {
+        $this->merchantId = $merchantId;
+        return $this;
+    }
+
+    /**
+     * @param string $merchantId
+     * @return GooglePayConfig
+     */
+    public function setMerchantName($merchantName)
+    {
+        $this->merchantName = $merchantName;
+        return $this;
+    }
+
+    protected function isEqual($object)
+    {
+        return $this->enabled === $this->isEnabled()
+            && $this->title === $this->getTitle()
+            && $this->merchantName === $this->getMerchantName()
+            && $this->merchantId === $this->getMerchantId();
+    }
+
+    public function isEnabled()
+    {
+        return $this->enabled;
+    }
+
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    public function getMerchantName()
+    {
+        return $this->merchantName;
+    }
+
+    public function getMerchantId()
+    {
+        return $this->merchantId;
+    }
+
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return [
+            "enabled" => $this->isEnabled(),
+            "title" => $this->getTitle(),
+            "merchantId" => $this->getMerchantId(),
+            "merchantName" => $this->getMerchantName(),
+        ];
+    }
+}
diff --git a/src/Kernel/ValueObjects/PaymentMethod.php b/src/Kernel/ValueObjects/PaymentMethod.php
@@ -11,6 +11,7 @@ final class PaymentMethod extends AbstractValueObject
     const DEBIT_CARD = 'debit_card';
     const VOUCHER = 'voucher';
     const PIX = 'pix';
+    const GOOGLEPAY = 'googlepay';
 
     /**
      * @var string
@@ -51,6 +52,10 @@ static public function pix()
     {
         return new self(self::PIX);
     }
+    static public function googlepay()
+    {
+        return new self(self::GOOGLEPAY);
+    }
 
     /**
      *

diff --git a/src/Kernel/ValueObjects/TransactionType.php b/src/Kernel/ValueObjects/TransactionType.php
@@ -11,6 +11,7 @@ final class TransactionType extends AbstractValueObject
     const VOUCHER = "voucher";
     const DEBIT_CARD = "debit_card";
     const PIX = 'pix';
+    const GOOGLEPAY = 'googlepay';
     /**
      *
      * @var string
@@ -51,6 +52,10 @@ public static function pix()
     {
         return new self(self::PIX);
     }
+    public static function googlepay()
+    {
+        return new self(self::GOOGLEPAY);
+    }
 
     /**
      *

diff --git a/src/Marketplace/Aggregates/Recipient.php b/src/Marketplace/Aggregates/Recipient.php
@@ -57,6 +57,8 @@ class Recipient extends AbstractEntity implements RecipientInterface
     /** @var int */
     private $transferDay = 0;
     /** @var string */
+    private $status = '';
+    /** @var string */
     private $createdAt;
     /** @var string */
     private $updatedAt;
@@ -477,6 +479,48 @@ public function setTransferDay($transferDay)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param string $status
+     * @return Recipient
+     */
+    public function setStatus($status, $kycStatus = '')
+    {
+        $recipientStatus = static::parseStatus($status, $kycStatus);
+        $this->status = $recipientStatus;
+        return $this;
+    }
+
+    public static function parseStatus($status, $kycStatus)
+    {
+        if ($status === 'registration') {
+            if ($kycStatus === 'pending') {
+                return static::REGISTERED;
+            }
+
+            if ($kycStatus === 'denied') {
+                return static::DISAPPROVED;
+            }
+        }
+
+        if ($status === 'affiliation' && $kycStatus === 'pending') {
+            return static::WAITING_FOR_ANALYSIS;
+        }
+
+        if ($kycStatus === 'partially_denied') {
+            return static::VALIDATION_REQUESTED;
+        }
+
+        return $status;
+    }
+
     /**
      * @return string
      */