From 5a0514a02b303f389499477f0ba8752dcd9daf3e Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Thu, 20 Jul 2023 15:11:38 +0900
Subject: [PATCH] =?UTF-8?q?JOB=E3=81=AE=E5=85=B1=E9=80=9A=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Jobs/BaseJob.php                          | 22 +++++++++++++++++++
 app/Jobs/Email/SimpleEmail.php                | 10 ++-------
 app/Jobs/File/DeleteFile.php                  |  9 ++------
 .../Custom/HelloTechno/CacheParkingName.php   | 13 ++---------
 .../HelloTechno/NoticeReceiptIssuingOrder.php | 10 ++-------
 .../PollEmailSendStatus.php                   |  9 ++------
 app/Jobs/SMS/SendSMS.php                      | 11 ++--------
 7 files changed, 34 insertions(+), 50 deletions(-)
 create mode 100644 app/Jobs/BaseJob.php

diff --git a/app/Jobs/BaseJob.php b/app/Jobs/BaseJob.php
new file mode 100644
index 0000000..50af44f
--- /dev/null
+++ b/app/Jobs/BaseJob.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+abstract class BaseJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * ジョブを再試行する前に待機する秒数を計算
+     */
+    public function backoff(): int
+    {
+        return 5;
+    }
+}
diff --git a/app/Jobs/Email/SimpleEmail.php b/app/Jobs/Email/SimpleEmail.php
index a4918d0..580a36f 100644
--- a/app/Jobs/Email/SimpleEmail.php
+++ b/app/Jobs/Email/SimpleEmail.php
@@ -4,17 +4,11 @@ namespace App\Jobs\Email;
 
 use App\Codes\QueueName;
 use App\Email\Sender;
+use App\Jobs\BaseJob;
 use App\Models\Email;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 
-class SimpleEmail implements ShouldQueue
+class SimpleEmail extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
     private string $emailId;
 
     /**
diff --git a/app/Jobs/File/DeleteFile.php b/app/Jobs/File/DeleteFile.php
index 9bddabd..e997a9f 100644
--- a/app/Jobs/File/DeleteFile.php
+++ b/app/Jobs/File/DeleteFile.php
@@ -4,16 +4,11 @@ namespace App\Jobs\File;
 
 use App\Codes\QueueName;
 use App\Files\TmpFile;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
+use App\Jobs\BaseJob;
 use Illuminate\Support\Facades\Storage;
 
-class DeleteFile implements ShouldQueue
+class DeleteFile extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     private string $fileId;
     private string $storagePath;
diff --git a/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php b/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php
index 493c21e..d3412d0 100644
--- a/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php
+++ b/app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php
@@ -3,22 +3,13 @@
 namespace App\Jobs\Other\Custom\HelloTechno;
 
 use App\Codes\QueueName;
+use App\Jobs\BaseJob;
 use App\Logic\SMS\SMSManager;
 use App\Models\HtCustomParkingName;
-use App\Models\SMSSendOrder;
 use App\Util\Custom\HelloTechno\API;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Arr;
 
-class CacheParkingName implements ShouldQueue
+class CacheParkingName extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
     /**
      * Create a new job instance.
      *
diff --git a/app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php b/app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php
index 8c1f5ed..328ac3b 100644
--- a/app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php
+++ b/app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php
@@ -3,19 +3,13 @@
 namespace App\Jobs\Other\Custom\HelloTechno;
 
 use App\Codes\QueueName;
+use App\Jobs\BaseJob;
 use App\Models\ReceiptIssuingHTParkingCustomOrder;
 use App\Models\ReceiptIssuingOrder;
 use App\Util\Custom\HelloTechno\API;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 
-class NoticeReceiptIssuingOrder implements ShouldQueue
+class NoticeReceiptIssuingOrder extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
     /**
      * Create a new job instance.
      *
diff --git a/app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php b/app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php
index ce49b79..e0cd2c8 100644
--- a/app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php
+++ b/app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php
@@ -3,20 +3,15 @@
 namespace App\Jobs\ReceiptIssuingOrder;
 
 use App\Codes\QueueName;
+use App\Jobs\BaseJob;
 use App\Models\Email;
 use App\Models\ReceiptIssuingOrder;
 use App\Util\DateUtil;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Log;
 
-class PollEmailSendStatus implements ShouldQueue
+class PollEmailSendStatus extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     private int $currentRetryCount;
 
diff --git a/app/Jobs/SMS/SendSMS.php b/app/Jobs/SMS/SendSMS.php
index fb0ea8f..d7aa42f 100644
--- a/app/Jobs/SMS/SendSMS.php
+++ b/app/Jobs/SMS/SendSMS.php
@@ -3,19 +3,12 @@
 namespace App\Jobs\SMS;
 
 use App\Codes\QueueName;
+use App\Jobs\BaseJob;
 use App\Logic\SMS\SMSManager;
 use App\Models\SMSSendOrder;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 
-class SendSMS implements ShouldQueue
+class SendSMS extends BaseJob
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-
     /**
      * Create a new job instance.
      *