Merge pull request #75 from wedevBr/feature/NewFacadeClients

Feature/new facade clients
wedevBr · Aug 29, 2024 · 585e0f4 · 585e0f4
2 parents ff09070 + 8415237
commit 585e0f4
Show file tree

Hide file tree

Showing 28 changed files with 145 additions and 110 deletions.
diff --git a/src/Celcoin.php b/src/Celcoin.php
@@ -15,6 +15,7 @@
 use WeDevBr\Celcoin\Clients\CelcoinDDAUser;
 use WeDevBr\Celcoin\Clients\CelcoinDDAWebhooks;
 use WeDevBr\Celcoin\Clients\CelcoinElectronicTransactions;
+use WeDevBr\Celcoin\Clients\CelcoinInternationalTopups;
 use WeDevBr\Celcoin\Clients\CelcoinKyc;
 use WeDevBr\Celcoin\Clients\CelcoinPIXCOB;
 use WeDevBr\Celcoin\Clients\CelcoinPIXCOBV;
@@ -169,4 +170,14 @@ public static function clientBAASBillet(): CelcoinBAASBillet
     {
         return new CelcoinBAASBillet();
     }
+
+    public static function clientBAASWebhook(): CelcoinBAASWebhooks
+    {
+        return new CelcoinBAASWebhooks();
+    }
+
+    public static function clientInternationalTopup(): CelcoinInternationalTopups
+    {
+        return new CelcoinInternationalTopups();
+    }
 }
diff --git a/src/Clients/CelcoinBAASBillet.php b/src/Clients/CelcoinBAASBillet.php
@@ -10,7 +10,7 @@
 
 class CelcoinBAASBillet extends CelcoinBaseApi
 {
-    public const BILLET_URL = '/api-integration-baas-webservice/v1/charge';
+    public const BILLET_URL = '/baas/v2/Charge';
 
     /**
      * @throws RequestException
@@ -42,4 +42,9 @@ public function cancelBillet($transactionId)
     {
         return $this->delete(sprintf('%s/%s', self::BILLET_URL, $transactionId));
     }
+
+    public function printBillet(string $billetId)
+    {
+        return $this->get(sprintf('%s/pdf/%s', self::BILLET_URL, $billetId));
+    }
 }
diff --git a/src/Clients/CelcoinBAASPIX.php b/src/Clients/CelcoinBAASPIX.php
@@ -68,10 +68,10 @@ public function getParticipant(?string $ISPB = null, ?string $name = null)
     {
         return $this->get(
             self::GET_PARTICIPANT_ENDPOINT,
-            [
+            array_filter([
                 'ISPB' => $ISPB,
                 'Name' => $name,
-            ]
+            ])
         );
     }
 
@@ -89,17 +89,17 @@ public function statusPix(?string $id = null, ?string $clientCode = null, ?strin
     {
         return $this->get(
             self::STATUS_PIX_ENDPOINT,
-            [
+            array_filter([
                 'id' => $id,
                 'clientCode' => $clientCode,
                 'endToEndId' => $endToEndId,
-            ]
+            ])
         );
     }
 
     public function registerPixKey(RegisterPixKey $data)
     {
-        $body = Validator::validate($data->toArray(), BAASRegisterPixKey::rules());
+        $body = Validator::validate(array_filter($data->toArray()), BAASRegisterPixKey::rules());
 
         return $this->post(
             self::REGISTER_PIX_KEY_ENDPOINT,
@@ -138,11 +138,11 @@ public function statusRefundPix(?string $id = null, ?string $clientCode = null,
     {
         return $this->get(
             self::STATUS_REFUND_PIX_ENDPOINT,
-            [
+            array_filter([
                 'id' => $id,
                 'clientCode' => $clientCode,
                 'returnIdentification' => $returnIdentification,
-            ]
+            ])
         );
     }
 
@@ -193,7 +193,7 @@ public function claimConsult(string $claimId): ?array
         $validatedClaim = Validator::validate(['claimId' => $claimId], ['claimId' => ['string', 'uuid']]);
 
         return $this->get(
-            self::CLAIM_CANCEL.'/'.$validatedClaim['claimId']
+            self::CLAIM_DICT.'/'.$validatedClaim['claimId']
         );
     }
 
@@ -218,5 +218,4 @@ public function claimList(array $params = []): ?array
             $validatedParams
         );
     }
-
 }
diff --git a/src/Clients/CelcoinPIXCOBV.php b/src/Clients/CelcoinPIXCOBV.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use WeDevBr\Celcoin\Common\CelcoinBaseApi;
 use WeDevBr\Celcoin\Rules\PIX\COBVCreate;
 use WeDevBr\Celcoin\Rules\PIX\COBVGet;
@@ -62,7 +63,10 @@ final public function payloadCOBVPIX(string $url): ?array
         Validator::validate(compact('url'), COBVPayload::rules());
 
         return $this->get(
-            sprintf(self::PAYLOAD_COBV_PIX, urlencode($url))
+            sprintf(
+                self::PAYLOAD_COBV_PIX,
+                urlencode(Str::replace('https://', '', $url))
+            )
         );
     }
 

diff --git a/src/Common/CelcoinBaseApi.php b/src/Common/CelcoinBaseApi.php
@@ -78,10 +78,8 @@ public function get(string $endpoint, array|string|null $query = null, $response
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -100,10 +98,8 @@ public function post(string $endpoint, array $body = [], ?Attachable $attachment
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -112,11 +108,18 @@ public function post(string $endpoint, array $body = [], ?Attachable $attachment
         foreach ($body as $field => $document) {
             if ($document instanceof File) {
                 $request->attach($field, $document->getContent(), $document->getFileName());
+                $request->contentType('multipart/form-data; boundary=*');
             }
         }
 
         if ($attachment) {
-            $request->attach($attachment->getField(), $attachment->getContents(), $attachment->getFileName());
+            $request->attach(
+                $attachment->getField(),
+                $attachment->getContents(),
+                $attachment->getFileName(),
+                $attachment->getHeaders()
+            );
+            $request->contentType('multipart/form-data; boundary=*');
         }
 
         return $request->post($this->getFinalUrl($endpoint), $body)
@@ -133,10 +136,8 @@ public function put(
     ): mixed {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -158,11 +159,9 @@ public function patch(
         $body_format = $asJson ? 'json' : 'form_params';
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->bodyFormat($body_format)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson()
+            ->bodyFormat($body_format);
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);

diff --git a/src/Facades/CelcoinFacade.php b/src/Facades/CelcoinFacade.php
@@ -31,6 +31,10 @@
  * @uses Celcoin::clientPIXReverse
  * @uses Celcoin::clientPixWebhooks
  * @uses Celcoin::clientKyc
+ * @uses Celcoin::clientBAASWebhook
+ * @uses Celcoin::clientInternationalTopup
+ * @uses Celcoin::clientBAASBillPayment
+ * @uses Celcoin::clientBAASBillet
  */
 class CelcoinFacade extends Facade
 {

diff --git a/src/Interfaces/Attachable.php b/src/Interfaces/Attachable.php
@@ -9,4 +9,6 @@ public function getField(): string;
     public function getContents();
 
     public function getFileName();
+
+    public function getHeaders(): array;
 }
diff --git a/src/Rules/BAAS/Billet.php b/src/Rules/BAAS/Billet.php
@@ -8,11 +8,9 @@ public static function rules(): array
     {
         return [
             'externalId' => ['required'],
-            'merchantCategoryCode' => ['sometimes', 'required'],
             'expirationAfterPayment' => ['required', 'numeric', 'min:1'],
-            'duedate' => ['required', 'date'],
+            'dueDate' => ['required', 'date', 'after:yesterday'],
             'amount' => ['required', 'decimal:0,2'],
-            'key' => ['required'],
             'debtor' => ['required', 'array'],
             'debtor.name' => ['required', 'string', 'max: 25'],
             'debtor.document' => ['required'],
@@ -26,10 +24,10 @@ public static function rules(): array
             'receiver.document' => ['required'],
             'receiver.account' => ['required', 'numeric'],
             'instructions' => ['sometimes', 'array', 'nullable'],
-            'instructions.discount' => ['required_with:instructions', 'array'],
-            'instructions.discount.amount' => ['required_with:discount', 'decimal:0,2'],
-            'instructions.discount.modality' => ['required_with:discount'],
-            'instructions.discount.limitDate' => ['required_with:discount', 'date'],
+            'instructions.discount' => ['sometimes', 'nullable'],
+            'instructions.discount.amount' => ['required_with:instructions.discount.limitDate', 'decimal:0,2'],
+            'instructions.discount.modality' => ['required_with:discount.modality'],
+            'instructions.discount.limitDate' => ['required_with:discount.amount', 'date'],
             'instructions.fine' => ['nullable', 'decimal:0,2'],
             'instructions.interest' => ['nullable', 'decimal:0,2'],
             'split' => ['sometimes', 'array'],

diff --git a/src/Rules/BAAS/RegisterPixKey.php b/src/Rules/BAAS/RegisterPixKey.php
@@ -13,7 +13,7 @@ public static function rules()
         return [
             'account' => ['required', 'string'],
             'keyType' => ['required', Rule::enum(PixKeyTypeEnum::class)],
-            'key' => ['required_unless:keyType,EVP', 'string'],
+            'key' => ['required_unless:keyType,EVP', 'string', 'nullable'],
         ];
     }
 }
diff --git a/src/Rules/BAAS/TEDTransfer.php b/src/Rules/BAAS/TEDTransfer.php
@@ -22,7 +22,7 @@ public static function rules()
             'creditParty.accountType' => ['required', 'string'],
             'creditParty.personType' => ['required', 'string'],
             'clientFinality' => ['required', 'string'],
-            'description' => ['some', 'required_if:clientFinality,'.ClientFinalityEnum::OTHERS->value, 'string'],
+            'description' => ['sometimes', 'required_if:clientFinality,'.ClientFinalityEnum::OTHERS->value, 'string'],
         ];
     }
 }
diff --git a/src/Types/BAAS/Billet.php b/src/Types/BAAS/Billet.php
@@ -8,16 +8,12 @@ class Billet extends Data
 {
     public string $externalId;
 
-    public ?string $merchantCategoryCode;
-
     public int $expirationAfterPayment;
 
-    public string $duedate;
+    public string $dueDate;
 
     public float $amount;
 
-    public ?string $key;
-
     public BilletDebtor $debtor;
 
     public BilletReceiver $receiver;

diff --git a/src/Types/KYC/KycDocument.php b/src/Types/KYC/KycDocument.php
@@ -42,4 +42,9 @@ public function getField(): string
     {
         return $this->field;
     }
+
+    public function getHeaders(): array
+    {
+        return ['Content-Type' => $this->file->getMimeType()];
+    }
 }
diff --git a/tests/Feature/CelcoinClientInstancesTest.php b/tests/Feature/CelcoinClientInstancesTest.php
@@ -160,4 +160,10 @@ public function testSuccessCreateBaasBillPayment()
         $instance = Celcoin::clientBAASBillPayment();
         $this->assertInstanceOf(CelcoinBAASBillPayment::class, $instance);
     }
+
+    public function testSuccessCreteBaasWebhooks()
+    {
+        $instance = Celcoin::clientBAASWebhooks();
+        $this->assertInstanceOf(CelcoinBAASWebhooks::class, $instance);
+    }
 }
diff --git a/tests/Integration/BAAS/CelcoinBASSBilletTest.php b/tests/Integration/BAAS/CelcoinBASSBilletTest.php
@@ -47,10 +47,8 @@ public static function billetBodyRequest(): Billet
         return new Billet([
             'externalId' => 'externalId1',
             'expirationAfterPayment' => 1,
-            'merchantCatagoryCode' => '0000',
-            'duedate' => '2023-12-30T00:00:00.0000000',
+            'dueDate' => now()->format('Y-m-d'),
             'amount' => 12.5,
-            'key' => '[email protected]',
             'debtor' => new BilletDebtor([
                 'name' => 'João teste de teste',
                 'document' => '12345678910',

diff --git a/tests/Integration/BAAS/PixClaim/PixKeyCancelConfirmTest.php b/tests/Integration/BAAS/PixClaim/PixKeyCancelConfirmTest.php
@@ -11,6 +11,7 @@
 use WeDevBr\Celcoin\Tests\GlobalStubs;
 use WeDevBr\Celcoin\Tests\TestCase;
 use WeDevBr\Celcoin\Types\PIX\ClaimAnswer;
+
 use function PHPUnit\Framework\assertEquals;
 
 class PixKeyCancelConfirmTest extends TestCase

diff --git a/tests/Integration/BAAS/PixClaim/PixKeyClaimConfirmTest.php b/tests/Integration/BAAS/PixClaim/PixKeyClaimConfirmTest.php
@@ -11,14 +11,13 @@
 use WeDevBr\Celcoin\Tests\GlobalStubs;
 use WeDevBr\Celcoin\Tests\TestCase;
 use WeDevBr\Celcoin\Types\PIX\ClaimAnswer;
+
 use function PHPUnit\Framework\assertEquals;
 
 class PixKeyClaimConfirmTest extends TestCase
 {
     use WithFaker;
 
-    /**
-     */
     public function testClaimPixKey()
     {
         Http::fake(

diff --git a/tests/Integration/BAAS/PixClaim/PixKeyClaimConsultTest.php b/tests/Integration/BAAS/PixClaim/PixKeyClaimConsultTest.php
@@ -10,6 +10,7 @@
 use WeDevBr\Celcoin\Clients\CelcoinBAASPIX;
 use WeDevBr\Celcoin\Tests\GlobalStubs;
 use WeDevBr\Celcoin\Tests\TestCase;
+
 use function PHPUnit\Framework\assertEquals;
 
 class PixKeyClaimConsultTest extends TestCase