fix: updates CepHandler class to validate both ceps at the same time …

…and avoid duplicated origin and destiny ceps
devaguia · Oct 24, 2024 · c24d33b · c24d33b
1 parent c74bb62
commit c24d33b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     ]
   },
   "require-dev": {
-    "pestphp/pest": "^2.9",
+    "pestphp/pest": "^2.36.0",
     "pestphp/pest-plugin-faker": "^2.0"
   },
   "config": {

diff --git a/src/Exceptions/.gitkeep b/src/Exceptions/.gitkeep
diff --git a/src/Includes/Traits/CepHandler.php b/src/Includes/Traits/CepHandler.php
@@ -8,14 +8,13 @@ trait CepHandler
 {
     private string $originCep  = '';
     private string $destinyCep = '';
-    private function validateCep(string $cep): string
+    private function validateCep(string $originCep, string $destinyCep): void
     {
-        $cleanCep = cep()->validate($cep);
+        $this->originCep = cep()->validate($originCep);
+        $this->destinyCep = cep()->validate($destinyCep);
 
-        if ($this->originCep === $cleanCep && $this->destinyCep === $cleanCep) {
-            throw new SameCepException($cep);
+        if ($this->originCep === $this->destinyCep) {
+            throw new SameCepException($this->originCep);
         }
-
-        return $cleanCep;
     }
 }
diff --git a/src/Services/Date/Date.php b/src/Services/Date/Date.php
@@ -49,8 +49,7 @@ private function buildBody(array $serviceCodes, array $fields = []): void
     public function get(array $serviceCodes, string $originCep, string $destinyCep, array $fields = []): array
     {
         try {
-            $this->originCep  = $this->validateCep($originCep);
-            $this->destinyCep = $this->validateCep($destinyCep);
+            $this->validateCep($originCep, $destinyCep);
 
             $this->buildBody($serviceCodes, $fields);
             $this->sendRequest();

diff --git a/src/Services/Price/Price.php b/src/Services/Price/Price.php
@@ -125,8 +125,7 @@ private function validateProductItem(array $product): array
     public function get(array $serviceCodes, array $products, string $originCep, string $destinyCep, array $fields = []): array
     {
         try {
-            $this->originCep  = $this->validateCep($originCep);
-            $this->destinyCep = $this->validateCep($destinyCep);
+            $this->validateCep($originCep, $destinyCep);
 
             $this->buildBody(
                 $serviceCodes,