Dispatching QR generation at the point of voucher generation.

openfoodfoundation · Sep 30, 2024 · e0f0c06 · e0f0c06
1 parent 39aa343
commit e0f0c06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/Jobs/Vouchers/GenerateStorageVoucherQrCode.php b/app/Jobs/Vouchers/GenerateStorageVoucherQrCode.php
@@ -9,6 +9,7 @@
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
 use SimpleSoftwareIO\QrCode\Facades\QrCode;
@@ -32,13 +33,6 @@ public function __construct(public Voucher $voucher) {}
     public function handle(): void
     {
 
-        if(!isset($this->voucher->voucher_short_code) || is_null($this->voucher->voucher_short_code))
-        {
-            dispatch(new GenerateStorageVoucherQrCode($this->voucher))->delay(now()->addMinutes(10));
-            return;
-        }
-
-
         $redeemUrl = URL::to('/redeem/' . $this->voucher->voucher_set_id . '/' . $this->voucher->id);
 
         /**

diff --git a/app/Listeners/Vouchers/HandleVoucherWasCreatedEvent.php b/app/Listeners/Vouchers/HandleVoucherWasCreatedEvent.php
@@ -29,7 +29,7 @@ public function handle(VoucherWasCreated $event): void
             /**
              * Delay this job by 5 minutes so that the image generation comes last.
              */
-            dispatch(new GenerateStorageVoucherQrCode($event->voucher))->delay(now()->addMinutes(10));
+            dispatch(new GenerateStorageVoucherQrCode($event->voucher));
         }
     }
 }
diff --git a/app/Services/VoucherTemplateService.php b/app/Services/VoucherTemplateService.php
@@ -91,6 +91,16 @@ public static function generateVoucherTemplate(VoucherTemplate $voucherTemplate,
          */
         $img->place($qrCode, 'top-left', $voucherTemplate->voucher_qr_x, $voucherTemplate->voucher_qr_y);
 
+
+
+        /**
+         *
+         */
+        if(!isset($voucher->voucher_short_code) || is_null($voucher->voucher_short_code))
+        {
+            Log::error('generateVoucherTemplate: No voucher_short_code exists for voucher #'.$voucher->id);
+        }
+
         /**
          * Place the voucher short code
          */