Browse Source

JOBの共通化

develop
sosuke.iwabuchi 2 years ago
parent
commit
5a0514a02b
7 changed files with 34 additions and 50 deletions
  1. +22
    -0
      app/Jobs/BaseJob.php
  2. +2
    -8
      app/Jobs/Email/SimpleEmail.php
  3. +2
    -7
      app/Jobs/File/DeleteFile.php
  4. +2
    -11
      app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php
  5. +2
    -8
      app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php
  6. +2
    -7
      app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php
  7. +2
    -9
      app/Jobs/SMS/SendSMS.php

+ 22
- 0
app/Jobs/BaseJob.php View File

@@ -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;
}
}

+ 2
- 8
app/Jobs/Email/SimpleEmail.php View File

@@ -4,17 +4,11 @@ namespace App\Jobs\Email;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Email\Sender; use App\Email\Sender;
use App\Jobs\BaseJob;
use App\Models\Email; 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; private string $emailId;


/** /**


+ 2
- 7
app/Jobs/File/DeleteFile.php View File

@@ -4,16 +4,11 @@ namespace App\Jobs\File;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Files\TmpFile; 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; use Illuminate\Support\Facades\Storage;


class DeleteFile implements ShouldQueue
class DeleteFile extends BaseJob
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;


private string $fileId; private string $fileId;
private string $storagePath; private string $storagePath;


+ 2
- 11
app/Jobs/Other/Custom/HelloTechno/CacheParkingName.php View File

@@ -3,22 +3,13 @@
namespace App\Jobs\Other\Custom\HelloTechno; namespace App\Jobs\Other\Custom\HelloTechno;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Jobs\BaseJob;
use App\Logic\SMS\SMSManager; use App\Logic\SMS\SMSManager;
use App\Models\HtCustomParkingName; use App\Models\HtCustomParkingName;
use App\Models\SMSSendOrder;
use App\Util\Custom\HelloTechno\API; 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. * Create a new job instance.
* *


+ 2
- 8
app/Jobs/Other/Custom/HelloTechno/NoticeReceiptIssuingOrder.php View File

@@ -3,19 +3,13 @@
namespace App\Jobs\Other\Custom\HelloTechno; namespace App\Jobs\Other\Custom\HelloTechno;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Jobs\BaseJob;
use App\Models\ReceiptIssuingHTParkingCustomOrder; use App\Models\ReceiptIssuingHTParkingCustomOrder;
use App\Models\ReceiptIssuingOrder; use App\Models\ReceiptIssuingOrder;
use App\Util\Custom\HelloTechno\API; 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. * Create a new job instance.
* *


+ 2
- 7
app/Jobs/ReceiptIssuingOrder/PollEmailSendStatus.php View File

@@ -3,20 +3,15 @@
namespace App\Jobs\ReceiptIssuingOrder; namespace App\Jobs\ReceiptIssuingOrder;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Jobs\BaseJob;
use App\Models\Email; use App\Models\Email;
use App\Models\ReceiptIssuingOrder; use App\Models\ReceiptIssuingOrder;
use App\Util\DateUtil; 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\Carbon;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;


class PollEmailSendStatus implements ShouldQueue
class PollEmailSendStatus extends BaseJob
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;


private int $currentRetryCount; private int $currentRetryCount;




+ 2
- 9
app/Jobs/SMS/SendSMS.php View File

@@ -3,19 +3,12 @@
namespace App\Jobs\SMS; namespace App\Jobs\SMS;


use App\Codes\QueueName; use App\Codes\QueueName;
use App\Jobs\BaseJob;
use App\Logic\SMS\SMSManager; use App\Logic\SMS\SMSManager;
use App\Models\SMSSendOrder; 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. * Create a new job instance.
* *


Loading…
Cancel
Save