fix: fix batch of reminders (monicahq/chandler#402)

monicahq · Jan 12, 2023 · a23da58 · a23da58
1 parent 6a0d603
commit a23da58
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php b/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
@@ -57,16 +57,20 @@ public function handle()
 
             $this->updateScheduledContactReminderTriggeredAt($scheduledReminder);
             $this->updateNumberOfTimesTriggered($scheduledReminder->contact_reminder_id);
+
+            (new RescheduleContactReminderForChannel())->execute([
+                'contact_reminder_id' => $scheduledReminder->contact_reminder_id,
+                'user_notification_channel_id' => $scheduledReminder->user_notification_channel_id,
+                'contact_reminder_scheduled_id' => $scheduledReminder->id,
+            ]);
         }
     }
 
     private function updateScheduledContactReminderTriggeredAt($scheduledReminder): void
     {
-        (new RescheduleContactReminderForChannel())->execute([
-            'contact_reminder_id' => $scheduledReminder->contact_reminder_id,
-            'user_notification_channel_id' => $scheduledReminder->user_notification_channel_id,
-            'contact_reminder_scheduled_id' => $scheduledReminder->id,
-        ]);
+        DB::table('contact_reminder_scheduled')
+            ->where('id', $scheduledReminder->id)
+            ->update(['triggered_at' => Carbon::now()]);
     }
 
     private function updateNumberOfTimesTriggered(int $id): void

diff --git a/app/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php b/app/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
@@ -57,6 +57,8 @@ public function execute(array $data): void
 
         if ($this->contactReminder->type !== ContactReminder::TYPE_ONE_TIME) {
             $this->schedule();
+        } else {
+            $this->contactReminder->delete();
         }
     }