remove can_expire

ageekdev · Dec 31, 2023 · d5e51c8 · d5e51c8
1 parent 4852102
commit d5e51c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/database/2023_12_31_153356_create_credits_table.php b/database/2023_12_31_153356_create_credits_table.php
@@ -22,8 +22,6 @@ public function up(): void
                 ->default(0);
             $table->unsignedDecimal('remaining_balance', 64, 8)
                 ->default(0);
-            $table->boolean('can_expire')
-                ->index();
             $table->dateTime('expires_at')
                 ->nullable()
                 ->index();
@@ -44,7 +42,7 @@ public function up(): void
             ALTER TABLE {$creditTable}
             ADD COLUMN unique_non_expire_holder VARCHAR(255) GENERATED ALWAYS AS (
                 CASE
-                    WHEN can_expire = 0 THEN MD5(CONCAT(holder_type, '::', holder_id))
+                    WHEN expires_at IS NULL THEN MD5(CONCAT(holder_type, '::', holder_id))
                     ELSE NULL
                 END
             ) STORED;

diff --git a/src/Models/Credit.php b/src/Models/Credit.php
@@ -13,7 +13,6 @@ class Credit extends Model
         'holder_id',
         'initial_balance',
         'remaining_balance',
-        'can_expire',
         'expires_at',
         'meta',
     ];
@@ -36,7 +35,7 @@ public function scopeIsHolder(Builder $query, Model $holder): Builder
     public function scopeNotExpired(Builder $query): Builder
     {
         return $query->where(function (Builder $query) {
-            $query->where('can_expire', false)
+            $query->whereNull('expires_at')
                 ->orWhere('expires_at', '>', now());
         });
     }

diff --git a/src/Services/CreditService.php b/src/Services/CreditService.php
@@ -51,7 +51,7 @@ public function addCreditToHolder(
                 'meta' => $meta,
             ]);
 
-            if (! $expiresAt) {
+            if (!$expiresAt) {
                 $credit = $this->addNonExpiringCredit(
                     $holder,
                     $amount,
@@ -82,18 +82,17 @@ public function addNonExpiringCredit(
         float $amount,
     ): Credit {
         $credit = $this->creditModel->query()
-            ->where('can_expire', false)
+            ->whereNull('expires_at')
             ->isHolder($holder)
             ->lockForUpdate()
             ->first();
 
-        if (! $credit) {
+        if (!$credit) {
             $credit = $this->creditModel->newInstance([
                 'holder_type' => $holder->getMorphClass(),
                 'holder_id' => $holder->getKey(),
                 'initial_balance' => 0,
                 'remaining_balance' => 0,
-                'can_expire' => false,
             ]);
         }
 
@@ -114,7 +113,6 @@ public function addExpiringCredit(
             'initial_balance' => $amount,
             'remaining_balance' => $amount,
             'expires_at' => $expiresAt,
-            'can_expire' => true,
         ]);
     }
 
@@ -126,7 +124,7 @@ public function useCredit(
         ?array $meta = null,
     ) {
 
-        if (! $this->checkHolderCredit($holder, $amount)) {
+        if (!$this->checkHolderCredit($holder, $amount)) {
             throw new \Exception('Insufficient credit');
         }
 
@@ -160,7 +158,6 @@ public function useCredit(
                         : abs($remainingAmount),
                     'holder_type' => $credit->holder_type,
                     'holder_id' => $credit->holder_id,
-                    'can_expire' => $credit->can_expire,
                 ];
 
                 $details[] = [
@@ -203,15 +200,14 @@ public function getRemainingCreditByHolderForUpdate(
             ->isHolder($holder)
             ->notExpired()
             ->hasRemainingBalance()
-            ->orderBy('can_expire', 'desc')
+            ->orderBy('unique_non_expire_holder', 'asc')
             ->orderBy('expires_at', 'asc')
             ->lockForUpdate()
             ->get([
                 'id',
                 'remaining_balance',
                 'holder_type',
                 'holder_id',
-                'can_expire',
             ]);
     }