Merge pull request #10 from gdebrauwer/delete-old-codes-query-fix

Fix and simplify query to delete old codes

Author: gdebrauwer

src/Models/VerificationCode.php

@@ -59,9 +59,16 @@ public static function boot()
         static::created(function ($verificationCode) {
             $maxCodes = config('verification-code.max_per_verifiable', 1);
 
-            if ($maxCodes !== null) {
-                VerificationCode::exceptRecentFor($verificationCode->verifiable, $maxCodes)->delete();
+            if ($maxCodes === null) {
+                return;
             }
+
+            VerificationCode::for($verificationCode->verifiable)
+                ->orderByDesc('expires_at')
+                ->orderByDesc('id')
+                ->skip($maxCodes)
+                ->take(PHP_INT_MAX)
+                ->delete();
         });
     }
 
@@ -104,28 +111,4 @@ public function scopeFor($query, string $verifiable)
     {
         return $query->where('verifiable', $verifiable);
     }
-
-    /**
-     * Scope a query to only include verification codes from the provided verifiable.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param string $verifiable
-     * @param int $amount
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeExceptRecentFor($query, string $verifiable, int $amount)
-    {
-        return $query
-            ->for($verifiable)
-            ->whereNotIn(
-                'id',
-                static::query()
-                    ->select('id')
-                    ->for($verifiable)
-                    ->orderByDesc('expires_at')
-                    ->orderByDesc('id')
-                    ->limit($amount)
-            );
-    }
 }