From 43c27bf3d6013cffa71a72ed5c8f376f757ba288 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Wed, 12 Jun 2024 09:03:53 +0800 Subject: [PATCH 1/3] Fix condition when checking for commodity balance --- app/Jobs/WhatsappUnsoldCommodityNotification.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/WhatsappUnsoldCommodityNotification.php b/app/Jobs/WhatsappUnsoldCommodityNotification.php index 2f6eaea..b636586 100644 --- a/app/Jobs/WhatsappUnsoldCommodityNotification.php +++ b/app/Jobs/WhatsappUnsoldCommodityNotification.php @@ -37,7 +37,7 @@ class WhatsappUnsoldCommodityNotification extends Job $start_time = $settings->where('key', 'start_time')->first()->value; $end_time = $settings->where('key', 'end_time')->first()->value; $message = $settings->where('key', 'message')->first()->value; - $isAllKomoditiSold = KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi === 0; + $isAllKomoditiSold = KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi === 0.0; $isWabotCredentialNotComplete = env('WABOT_API') === null || env('WABOT_INSTANCES_ID') === null || env('WABOT_TOKEN_KEYS') === null; $isNotActiveJobServer = env('ACTIVE_JOB_SERVER') !== true; @@ -97,7 +97,7 @@ class WhatsappUnsoldCommodityNotification extends Job $logblastwasap = new BlastWasap(); $logblastwasap->kodcaw = 'OPERASI'; $logblastwasap->notelefon = $phone_number; - $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual'; + $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual' . 'baki : ' . KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi; $logblastwasap->status = $response; $logblastwasap->created_at = Carbon::now(); $logblastwasap->updated_at = Carbon::now(); From 96d7d5ed9f3e6d11dc123bd40a7d921980ce9945 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Wed, 12 Jun 2024 09:25:37 +0800 Subject: [PATCH 2/3] Checks if its today komoditi and then only notification will send --- app/Jobs/WhatsappUnsoldCommodityNotification.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Jobs/WhatsappUnsoldCommodityNotification.php b/app/Jobs/WhatsappUnsoldCommodityNotification.php index b636586..e1f2435 100644 --- a/app/Jobs/WhatsappUnsoldCommodityNotification.php +++ b/app/Jobs/WhatsappUnsoldCommodityNotification.php @@ -37,7 +37,11 @@ class WhatsappUnsoldCommodityNotification extends Job $start_time = $settings->where('key', 'start_time')->first()->value; $end_time = $settings->where('key', 'end_time')->first()->value; $message = $settings->where('key', 'message')->first()->value; - $isAllKomoditiSold = KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi === 0.0; + + $latestKomoditi = KomuditiPurchase::on('mysql7')->latest()->first(); + $isAllKomoditiSold = $latestKomoditi->unit_komuditi === 0.0; + $isLatestKomoditiToday = $latestKomoditi->created_at->isToday(); + $isWabotCredentialNotComplete = env('WABOT_API') === null || env('WABOT_INSTANCES_ID') === null || env('WABOT_TOKEN_KEYS') === null; $isNotActiveJobServer = env('ACTIVE_JOB_SERVER') !== true; @@ -77,8 +81,8 @@ class WhatsappUnsoldCommodityNotification extends Job return false; } - if ($isAllKomoditiSold) { - Log::info('All komoditi is sold'); + if ($isLatestKomoditiToday && $isAllKomoditiSold) { + Log::info('All today komoditi is sold'); return false; } @@ -97,7 +101,7 @@ class WhatsappUnsoldCommodityNotification extends Job $logblastwasap = new BlastWasap(); $logblastwasap->kodcaw = 'OPERASI'; $logblastwasap->notelefon = $phone_number; - $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual' . 'baki : ' . KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi; + $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual. ' . 'baki : ' . KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi; $logblastwasap->status = $response; $logblastwasap->created_at = Carbon::now(); $logblastwasap->updated_at = Carbon::now(); From 66927875ce6b37d2ea5d99a7ecd48983816bbc37 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Wed, 12 Jun 2024 09:30:37 +0800 Subject: [PATCH 3/3] Change notification interval to 15 minutes --- app/Jobs/WhatsappUnsoldCommodityNotification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/WhatsappUnsoldCommodityNotification.php b/app/Jobs/WhatsappUnsoldCommodityNotification.php index e1f2435..1d7b15d 100644 --- a/app/Jobs/WhatsappUnsoldCommodityNotification.php +++ b/app/Jobs/WhatsappUnsoldCommodityNotification.php @@ -112,6 +112,6 @@ class WhatsappUnsoldCommodityNotification extends Job - dispatch((new WhatsappUnsoldCommodityNotification($this->message))->delay(Carbon::now()->addMinutes(5))); + dispatch((new WhatsappUnsoldCommodityNotification($this->message))->delay(Carbon::now()->addMinutes(15))); } }