From 8ed2eb81d184468a1ba8ba780887d5a98563495a Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Mon, 23 Oct 2023 11:18:21 +0900
Subject: [PATCH] =?UTF-8?q?JOB=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Jobs/BaseJob.php                 | 16 ++++++++++++++++
 app/Jobs/Email/SimpleEmail.php       |  7 +------
 app/Jobs/File/DeleteFile.php         |  7 +------
 app/Providers/AppServiceProvider.php |  6 +++++-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/Jobs/BaseJob.php b/app/Jobs/BaseJob.php
index 50af44f..9a22738 100644
--- a/app/Jobs/BaseJob.php
+++ b/app/Jobs/BaseJob.php
@@ -7,11 +7,18 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 abstract class BaseJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public function handle()
+    {
+        $this->logConfig();
+        $this->handleJob();
+    }
+
     /**
      * ジョブを再試行する前に待機する秒数を計算
      */
@@ -19,4 +26,13 @@ abstract class BaseJob implements ShouldQueue
     {
         return 5;
     }
+
+    abstract protected function handleJob();
+
+    private  function logConfig()
+    {
+        Log::withContext([
+            '__job_class__' => staitc::class,
+        ]);
+    }
 }
diff --git a/app/Jobs/Email/SimpleEmail.php b/app/Jobs/Email/SimpleEmail.php
index 13be367..0538854 100644
--- a/app/Jobs/Email/SimpleEmail.php
+++ b/app/Jobs/Email/SimpleEmail.php
@@ -24,12 +24,7 @@ class SimpleEmail extends BaseJob
         $this->onQueue(QueueName::EMAIL->value);
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
+    protected function handleJob()
     {
         try {
             Sender::send($this->emailId);
diff --git a/app/Jobs/File/DeleteFile.php b/app/Jobs/File/DeleteFile.php
index e997a9f..a6aa36b 100644
--- a/app/Jobs/File/DeleteFile.php
+++ b/app/Jobs/File/DeleteFile.php
@@ -27,12 +27,7 @@ class DeleteFile extends BaseJob
         logger("FILE削除JOB登録:" . $this->storagePath);
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
+    protected function handleJob()
     {
         if (Storage::exists($this->storagePath)) {
             Storage::delete($this->storagePath);
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index e820d69..9501216 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,11 +4,11 @@ namespace App\Providers;
 
 use App\Codes\EnvironmentName;
 use App\Codes\QueueName;
-use App\Codes\SMSProviderName;
 use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Str;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -39,6 +39,10 @@ class AppServiceProvider extends ServiceProvider
             } else if ($queueName === QueueName::JOB->value) {
                 Log::setDefaultDriver('queue-job');
             }
+
+            Log::withContext([
+                '__job_uuid__' => strval(Str::uuid()),
+            ]);
         });