Touch tokens

agilicent · Jan 9, 2021 · aeb2366 · aeb2366
1 parent 3378d41
commit aeb2366
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/ExpoPushNotifications.php b/src/ExpoPushNotifications.php
@@ -66,14 +66,16 @@ public function fetchReceipts(array $tickets): array
      */
     public function createPushNotificationRecord($ticket, $token, \Ramsey\Uuid\UuidInterface $batchId, $notification, $notifiable)
     {
+        $pushToken = PushToken::findByReference($token);
         $status = $ticket['status'] === 'error' ? 'error' : 'unknown';
         if ($status === 'error' && $ticket['details']['error'] === 'DeviceNotRegistered') {
             try {
-                PushToken::findByReference($token)->expire();
+                $pushToken->expire();
             } catch (\Exception $exception) {
                 Log::error("Unable to find token $token to expire");
             }
         }
+        $pushToken->touch();
         return \Relative\LaravelExpoPushNotifications\Models\PushNotification::create([
             'batch_id' => $batchId,
             'notification' => (array)$notification,
@@ -96,7 +98,7 @@ public function updatePushNotificationReceiptStatuses(array $tickets, Collection
         collect($tickets)->map(function ($ticket, $index) use ($pushNotifications, $receipts) {
             $pushNotification = $pushNotifications[$index];
             if (isset($ticket['id'])) {
-                $pushNotification->status = $receipts[$index]['status'];
+                $pushNotification->status = $receipts[$index]['status'] ?? 'unknown';
                 if ($pushNotification->status === 'error') {
                     $pushNotification->errors = $receipts[$pushNotification->ticket]['details']['error'];
                 }

diff --git a/src/Models/PushToken.php b/src/Models/PushToken.php
@@ -27,7 +27,9 @@ class PushToken extends Model
 
     protected $fillable = [
         'token',
-        'meta'
+        'meta',
+        'expired_at',
+        'last_used_at',
     ];
 
     protected $table = 'expo_push_tokens';
@@ -53,4 +55,9 @@ public function expire()
     {
         $this->update(['expired_at' => Carbon::now()]);
     }
+
+    public function touch()
+    {
+        $this->update(['last_used_at' => Carbon::now()]);
+    }
 }