Merge pull request #101 from cashier-provider/3.x

Disabled logging of failed jobs when checking payments

Author: andrey-helldar

src/Jobs/Base.php

@@ -25,6 +25,7 @@
 use CashierProvider\Core\Facades\Config\Main;
 use CashierProvider\Core\Facades\Config\Payment;
 use CashierProvider\Core\Facades\Helpers\Model as ModelHelper;
+use Closure;
 use DragonCode\Contracts\Cashier\Driver;
 use DragonCode\Contracts\Cashier\Helpers\Statuses;
 use DragonCode\Contracts\Cashier\Http\Response;
@@ -35,6 +36,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Carbon;
+use Throwable;
 
 abstract class Base implements ShouldQueue, ShouldBeUnique
 {
@@ -59,11 +62,7 @@ abstract class Base implements ShouldQueue, ShouldBeUnique
 
     protected $event;
 
-    abstract public function handle();
-
-    abstract protected function process(): Response;
-
-    abstract protected function queueName(): ?string;
+    protected $doneInsteadThrow = false;
 
     public function __construct(Model $model, bool $force_break = false)
     {
@@ -78,6 +77,12 @@ public function __construct(Model $model, bool $force_break = false)
         $this->queue = $this->queueName();
     }
 
+    abstract public function handle();
+
+    abstract protected function process(): Response;
+
+    abstract protected function queueName(): ?string;
+
     public function uniqueId()
     {
         return $this->model->getKey();
@@ -88,6 +93,11 @@ public function uniqueFor(): int
         return Main::getQueue()->getUnique()->getSeconds();
     }
 
+    public function retryUntil(): ?Carbon
+    {
+        return null;
+    }
+
     protected function hasBreak(): bool
     {
         return $this->force_break;
@@ -191,4 +201,35 @@ protected function resolveStatuses(): Statuses
     {
         return $this->resolveDriver()->statuses();
     }
+
+    protected function call(Closure $callback): void
+    {
+        try {
+            $callback();
+        }
+        catch (Throwable $e) {
+            if (! $this->doneInsteadThrow) {
+                throw $e;
+            }
+
+            if ($this->retryUntil() && $this->retryUntil() <= Carbon::now()) {
+                $this->delete();
+
+                return;
+            }
+
+            if (! $this->retryUntil() && $this->maxTries() > 0 && $this->attempts() >= $this->maxTries()) {
+                $this->delete();
+
+                return;
+            }
+
+            throw $e;
+        }
+    }
+
+    protected function maxTries(): int
+    {
+        return $this->job->maxTries() ?: config('cashier.queue.tries', 100);
+    }
 }

src/Jobs/Check.php

@@ -30,50 +30,59 @@ class Check extends Base
 {
     protected $event = Checked::class;
 
+    protected $doneInsteadThrow = true;
+
     public function handle()
     {
-        $this->checkExternalId();
+        $this->call(function () {
+            $this->checkExternalId();
 
-        $response = $this->process();
+            $response = $this->process();
 
-        $status = $response->getStatus();
+            $status = $response->getStatus();
 
-        switch (true) {
-            case $this->hasFailed($status):
-                $this->update($response, Status::FAILED);
-                break;
+            switch (true) {
+                case $this->hasFailed($status):
+                    $this->update($response, Status::FAILED);
+                    break;
 
-            case $this->hasRefunding($status):
-                $this->update($response, Status::WAIT_REFUND);
-                break;
+                case $this->hasRefunding($status):
+                    $this->update($response, Status::WAIT_REFUND);
+                    break;
 
-            case $this->hasRefunded($status):
-                $this->update($response, Status::REFUND);
-                break;
+                case $this->hasRefunded($status):
+                    $this->update($response, Status::REFUND);
+                    break;
 
-            case $this->hasSuccess($status):
-                $this->update($response, Status::SUCCESS);
-                break;
+                case $this->hasSuccess($status):
+                    $this->update($response, Status::SUCCESS);
+                    break;
 
-            default:
-                if ($this->hasBreak()) {
-                    return;
-                }
+                default:
+                    if ($this->hasBreak()) {
+                        return;
+                    }
 
-                $this->returnToQueue();
-        }
+                    $this->returnToQueue();
+            }
+        });
     }
 
-    public function retryUntil(): Carbon
+    protected function process(): Response
     {
-        $timeout = Main::getCheckTimeout();
+        return $this->resolveDriver()->check();
+    }
 
-        return Carbon::now()->addSeconds($timeout);
+    protected function queueName(): ?string
+    {
+        return $this->resolveDriver()->queue()->getCheck();
     }
 
-    protected function process(): Response
+    public function retryUntil(): ?Carbon
     {
-        return $this->resolveDriver()->check();
+        $timeout = Main::getCheckTimeout();
+
+        return Carbon::now()->addSeconds($timeout);
     }
 
     protected function update(Response $response, string $status): void
@@ -82,11 +91,6 @@ protected function update(Response $response, string $status): void
         $this->store($response, false);
     }
 
-    protected function queueName(): ?string
-    {
-        return $this->resolveDriver()->queue()->getCheck();
-    }
-
     protected function checkExternalId(): void
     {
         $this->resolveCashier($this->model);

src/Jobs/Refund.php

@@ -32,13 +32,25 @@ class Refund extends Base
 
     public function handle()
     {
-        $this->checkExternalId();
+        $this->call(function () {
+            $this->checkExternalId();
 
-        $this->runCheckJob();
+            $this->runCheckJob();
 
-        $this->checkStatus();
+            $this->checkStatus();
 
-        $this->ran();
+            $this->ran();
+        });
+    }
+
+    protected function process(): Response
+    {
+        return $this->resolveDriver()->refund();
+    }
+
+    protected function queueName(): ?string
+    {
+        return $this->resolveDriver()->queue()->getRefund();
     }
 
     protected function ran()
@@ -58,11 +70,6 @@ protected function ran()
         $this->store($response, false);
     }
 
-    protected function process(): Response
-    {
-        return $this->resolveDriver()->refund();
-    }
-
     protected function paymentId()
     {
         return $this->model->getKey();
@@ -94,9 +101,4 @@ protected function checkStatus(): void
             );
         }
     }
-
-    protected function queueName(): ?string
-    {
-        return $this->resolveDriver()->queue()->getRefund();
-    }
 }

src/Jobs/Start.php

@@ -28,9 +28,11 @@ class Start extends Base
 
     public function handle()
     {
-        $data = $this->process();
+        $this->call(function () {
+            $data = $this->process();
 
-        $this->store($data);
+            $this->store($data);
+        });
     }
 
     protected function process(): Response