Merge branch 'release/2.4' into main

lucasdotvin · Sep 8, 2022 · 2b3f778 · 2b3f778
2 parents 9e686ed + 27c7e60
commit 2b3f778
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/Models/Concerns/HasSubscriptions.php b/src/Models/Concerns/HasSubscriptions.php
@@ -49,6 +49,15 @@ public function subscription()
         return $this->morphOne(config('soulbscription.models.subscription'), 'subscriber')->ofMany('started_at', 'MAX');
     }
 
+    public function lastSubscription()
+    {
+        return app(config('soulbscription.models.subscription'))
+            ->withExpired()
+            ->whereMorphedTo('subscriber', $this)
+            ->orderBy('started_at', 'DESC')
+            ->first();
+    }
+
     /**
      * @throws OutOfBoundsException
      * @throws OverflowException

diff --git a/tests/Models/Concerns/ExpiresAndHasGraceDaysTest.php b/tests/Models/Concerns/ExpiresAndHasGraceDaysTest.php
@@ -80,7 +80,6 @@ public function testModelReturnsNotExpiredStatus()
         $this->assertTrue($notExpiredModel->notExpired());
     }
 
-
     public function testModelReturnsIfItHasExpired()
     {
         $expiredModel = self::MODEL::factory()

diff --git a/tests/Models/Concerns/HasSubscriptionsTest.php b/tests/Models/Concerns/HasSubscriptionsTest.php
@@ -837,4 +837,17 @@ public function testItChecksIfTheUserDoesNotHaveSubscriptionToAPlan()
         $this->assertFalse($hasSubscription);
         $this->assertFalse($isSubscribed);
     }
+
+    public function testItReturnsTheLastSubscriptionWhenRetrievingExpired()
+    {
+        $plan = Plan::factory()->createOne();
+
+        $subscriber = User::factory()->createOne();
+        $subscriber->subscribeTo($plan, now()->subDay(), now()->subDay());
+        $expectedSubscription = $subscriber->subscribeTo($plan, now()->subHour(), now()->subHour());
+
+        $returnedSubscription = $subscriber->lastSubscription();
+
+        $this->assertEquals($expectedSubscription->id, $returnedSubscription->id);
+    }
 }