Merge branch 'release/2.5' into main

README.md

@@ -321,6 +321,20 @@ $subscriber->subscription->renew();
 
 It will calculate a new expiration based on the current date.
 
+#### Expired Subscriptions
+
+In order to retrieve an expired subscription, you can use the `lastSubscription` method:
+
+```php
+$subscriber->lastSubscription();
+```
+
+This method will return the last subscription of the user, regardless of its status, so you can, for instance, get an expired subscription to renew it.:
+
+```php
+$subscriber->lastSubscription()->renew();
+```
+
 #### Canceling
 
 > There is a thing to keep in mind when canceling a subscription: it won't revoke the access immediately. To avoid making you need to handle refunds of any kind, we keep the subscription active and just mark it as canceled, so you just have to not renew it in the future. If you need to suppress a subscription immediately, give a look on the method `suppress()`.

database/factories/FeatureFactory.php

@@ -28,6 +28,7 @@ public function definition()
                 PeriodicityType::Day,
             ]),
             'quota'            => false,
+            'postpaid'         => false,
         ];
     }
 
@@ -64,4 +65,18 @@ public function notQuota()
             'quota' => false,
         ]);
     }
+
+    public function postpaid()
+    {
+        return $this->state(fn (array $attributes) => [
+            'postpaid' => true,
+        ]);
+    }
+
+    public function prepaid()
+    {
+        return $this->state(fn (array $attributes) => [
+            'postpaid' => false,
+        ]);
+    }
 }

database/migrations/2022_02_01_235540_create_features_table.php

@@ -17,6 +17,7 @@ public function up()
             $table->string('name');
             $table->boolean('consumable');
             $table->boolean('quota')->default(false);
+            $table->boolean('postpaid')->default(false);
             $table->unsignedInteger('periodicity')->nullable();
             $table->string('periodicity_type')->nullable();
             $table->softDeletes();

database/migrations/upgrades/2.4-2.5/2022_05_19_0000_add_postpaid_column_to_features_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('features', function (Blueprint $table) {
+            $table->boolean('postpaid')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('features', function (Blueprint $table) {
+            $table->dropColumn('postpaid');
+        });
+    }
+};

docker-compose.yml

@@ -6,10 +6,12 @@ services:
       - .:/app
     working_dir: /app
     command: install
+    entrypoint: composer
   php:
     build:
         context: .
         dockerfile: .docker/php/Dockerfile
     volumes:
       - .:/app
     working_dir: /app
+    entrypoint: php

src/Models/Concerns/HasSubscriptions.php

@@ -214,6 +214,10 @@ public function canConsume($featureName, ?float $consumption = null): bool
             return true;
         }
 
+        if ($feature->postpaid) {
+            return true;
+        }
+
         $remainingCharges = $this->getRemainingCharges($featureName);
 
         return $remainingCharges >= $consumption;

src/Models/Feature.php

@@ -19,6 +19,7 @@ class Feature extends Model
         'periodicity_type',
         'periodicity',
         'quota',
+        'postpaid',
     ];
 
     public function plans()

src/SoulbscriptionServiceProvider.php

@@ -29,5 +29,9 @@ public function boot()
         $this->publishes([
             __DIR__ . '/../database/migrations/upgrades/2.1-2.2' => database_path('migrations'),
         ], 'soulbscription-migrations-upgrades-2.1-2.2');
+
+        $this->publishes([
+            __DIR__ . '/../database/migrations/upgrades/2.4-2.5' => database_path('migrations'),
+        ], 'soulbscription-migrations-upgrades-2.4-2.5');
     }
 }

tests/Models/Concerns/HasSubscriptionsTest.php

@@ -850,4 +850,27 @@ public function testItReturnsTheLastSubscriptionWhenRetrievingExpired()
 
         $this->assertEquals($expectedSubscription->id, $returnedSubscription->id);
     }
+
+    public function testItCanConsumeAFeatureAfterItsChargesIfThisFeatureIsPostpaid()
+    {
+        $charges = $this->faker->numberBetween(5, 10);
+        $consumption = $this->faker->numberBetween(1, $charges * 2);
+
+        $plan = Plan::factory()->createOne();
+        $feature = Feature::factory()->postpaid()->createOne();
+        $feature->plans()->attach($plan, [
+            'charges' => $charges,
+        ]);
+
+        $subscriber = User::factory()->createOne();
+        $subscriber->subscribeTo($plan);
+
+        $subscriber->consume($feature->name, $consumption);
+
+        $this->assertDatabaseHas('feature_consumptions', [
+            'consumption' => $consumption,
+            'feature_id' => $feature->id,
+            'subscriber_id' => $subscriber->id,
+        ]);
+    }
 }