Merge pull request #57 from wedevBr/develop

Develop
wedevBr · Mar 25, 2024 · d913097 · d913097
2 parents cf61e88 + e0a2ca0
commit d913097
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 26 deletions.
diff --git a/src/Clients/CelcoinKyc.php b/src/Clients/CelcoinKyc.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Validator;
 use WeDevBr\Celcoin\Common\CelcoinBaseApi;
+use WeDevBr\Celcoin\Interfaces\Attachable;
 use WeDevBr\Celcoin\Rules\KYC\CreateKycRule;
 use WeDevBr\Celcoin\Types\KYC\CreateKyc;
 
@@ -15,13 +16,14 @@ class CelcoinKyc extends CelcoinBaseApi
     /**
      * @throws RequestException
      */
-    public function createKyc(CreateKyc $data): array
+    public function createKyc(CreateKyc $data, Attachable $attachable = null): array
     {
         $body = Validator::validate($data->toArray(), CreateKycRule::rules());
 
         return $this->post(
             self::CREATE_KYC_ENDPOINT,
-            $body
+            $body,
+            $attachable
         );
     }
 }
diff --git a/src/Common/CelcoinBaseApi.php b/src/Common/CelcoinBaseApi.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use WeDevBr\Celcoin\Auth\Auth;
+use WeDevBr\Celcoin\Interfaces\Attachable;
 
 class CelcoinBaseApi
 {
@@ -94,7 +95,7 @@ public function get(string $endpoint, array|string|null $query = null, $response
     /**
      * @throws RequestException
      */
-    public function post(string $endpoint, array $body = [])
+    public function post(string $endpoint, array $body = [], Attachable $attachment = null)
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
@@ -113,6 +114,10 @@ public function post(string $endpoint, array $body = [])
             }
         }
 
+        if ($attachment) {
+            $request->attach($attachment->getField(), $attachment->getContents(), $attachment->getFileName());
+        }
+
         return $request->post($this->getFinalUrl($endpoint), $body)
             ->throw()
             ->json();

diff --git a/src/Interfaces/Attachable.php b/src/Interfaces/Attachable.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace WeDevBr\Celcoin\Interfaces;
+
+interface Attachable
+{
+    public function getField(): string;
+
+    public function getContents();
+
+    public function getFileName();
+}
diff --git a/src/Rules/KYC/CreateKycRule.php b/src/Rules/KYC/CreateKycRule.php
@@ -12,9 +12,9 @@ public static function rules(): array
         return [
             'documentnumber' => ['required', 'digits:11,14'],
             'filetype' => ['required', Rule::enum(KycDocumentEnum::class)],
-            'front' => ['required', 'file'],
-            'verse' => ['sometimes', 'file'],
-            'cnpj' => ['sometimes', 'same:documentnumber', 'digits:11,14'],
+            'front' => ['sometimes',],
+            'verse' => ['sometimes',],
+            'cnpj' => ['sometimes', 'digits:11,14'],
         ];
     }
 }
diff --git a/src/Types/KYC/CreateKyc.php b/src/Types/KYC/CreateKyc.php
@@ -3,6 +3,7 @@
 namespace WeDevBr\Celcoin\Types\KYC;
 
 use WeDevBr\Celcoin\Enums\KycDocumentEnum;
+use WeDevBr\Celcoin\Interfaces\Attachable;
 use WeDevBr\Celcoin\Types\Data;
 
 class CreateKyc extends Data
@@ -13,30 +14,15 @@ class CreateKyc extends Data
 
     public KycDocumentEnum $filetype;
 
-    public KycDocument $front;
-
-    public ?KycDocument $verse = null;
-
     public function __construct(array $data = [])
     {
-        if (empty($data['cnpj']) && strlen($data['documentnumber']) === 14) {
-            $data['cnpj'] = $data['documentnumber'];
-        }
         parent::__construct($data);
     }
 
     public function toArray(): array
     {
         $array = parent::toArray();
 
-        if (!empty($array['front'])) {
-            $array['front'] = $this->front->file;
-        }
-
-        if (!empty($array['verse'])) {
-            $array['verse'] = $this->verse->file;
-        }
-
         return array_filter($array);
     }
 }
diff --git a/src/Types/KYC/KycDocument.php b/src/Types/KYC/KycDocument.php
@@ -3,21 +3,24 @@
 namespace WeDevBr\Celcoin\Types\KYC;
 
 use Illuminate\Http\File;
+use WeDevBr\Celcoin\Interfaces\Attachable;
 use WeDevBr\Celcoin\Types\Data;
 
-class KycDocument extends Data
+class KycDocument extends Data implements Attachable
 {
     public string $fileName;
     public string $contents;
     public ?File $file;
 
-    public function __construct(?File $file)
+    public string $field;
+
+    public function __construct(?File $file, string $field)
     {
         $data = [];
         if (!empty($file)) {
             $data['contents'] = $file->getContent();
             $data['fileName'] = $file->getFilename();
-            $data['file'] = $file;
+            $data['field'] = $field;
         }
 
         parent::__construct($data);
@@ -32,4 +35,9 @@ public function getFileName(): string
     {
         return $this->fileName;
     }
+
+    public function getField(): string
+    {
+        return $this->field;
+    }
 }
diff --git a/tests/Integration/KYC/CelcoinSendKycTest.php b/tests/Integration/KYC/CelcoinSendKycTest.php
@@ -46,11 +46,16 @@ public function testSendKycValidationRules()
     {
         Http::fake([
             config('celcoin.login_url') => GlobalStubs::loginResponse(),
+            sprintf(
+                '%s%s',
+                config('celcoin.api_url'),
+                CelcoinKyc::CREATE_KYC_ENDPOINT
+            ) => static::successResponse(),
         ]);
 
         $kyc = new CelcoinKyc();
         $body = static::getKycBody();
-        unset($body['front']);
+        unset($body['documentnumber']);
         $this->expectException(ValidationException::class);
         $kyc->createKyc(new CreateKyc($body));
     }
@@ -132,6 +137,6 @@ public static function internalErrorResponse(): PromiseInterface
 
     public function getFile(string $path = null): KycDocument
     {
-        return new KycDocument(new File($path));
+        return new KycDocument(new File($path), 'verse');
     }
 }