Merge pull request #6 from sagitarius29/develop

Fixed bugs and refactored code
sagitarius29 · Nov 2, 2019 · 2c4859e · 2c4859e
2 parents 0c7343a + 67acd95
commit 2c4859e
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@
 [![Quality Score](https://img.shields.io/scrutinizer/g/sagitarius29/laravel-subscriptions.svg?style=flat-square)](https://scrutinizer-ci.com/g/sagitarius29/laravel-subscriptions)
 [![Total Downloads](https://img.shields.io/packagist/dt/sagitarius29/laravel-subscriptions.svg?style=flat-square)](https://packagist.org/packages/sagitarius29/laravel-subscriptions)
 
-A simple laravel package for Subscriptions
+A simple laravel package for Subscriptions.
+
+All ideas are welcome, please send your issue in: [Send Your Issue or Questions](https://github.com/sagitarius29/laravel-subscriptions/issues)
 
 ## Installation
 
@@ -31,7 +33,7 @@ Add `Sagitarius29\LaravelSubscriptions\LaravelSubscriptionsServiceProvider::clas
 #### Config file and migrations
 Publish package config file and migrations with the following command:
 ```cmd
-php artisan vendor:publish --provider="Sagitarius29\LaravelSubscriptions\LaravelSubscriptionsServiceProvider::class"
+php artisan vendor:publish --provider="Sagitarius29\LaravelSubscriptions\LaravelSubscriptionsServiceProvider"
 ```
 
 Then run migrations:
@@ -87,7 +89,7 @@ $plan->features()->saveMany($features);
 $plan->isFree(); // return true;
 
 // adding interval of price
-$interval = PlanInterval::make(PlanInterval::$MONTH, 1, 4.90);
+$interval = PlanInterval::make(PlanInterval::MONTH, 1, 4.90);
 $plan->setInterval($interval);
 
 $plan->isFree(); // return false;
@@ -129,10 +131,10 @@ $user->changePlanTo($secondPlan);
 $user = \Auth::user();
 
 // the subscription is will end in the expiration date
-$user->cancelSubscription();
+$user->unsubscribe();
 
 // the subscription end now
-$user->forceCancelSubscription();
+$user->forceUnsubscribe();
 ````
 
 ### Testing

diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
         "illuminate/support": "5.7.*"
     },
     "require-dev": {
+        "mockery/mockery": "^1.2",
         "orchestra/testbench": "3.7.*",
         "phpunit/phpunit": "^7.0"
     },

diff --git a/database/migrations/2019_10_27_012545_create_subscriptions_tables.php b/database/migrations/2019_10_27_012545_create_subscriptions_tables.php
@@ -34,7 +34,7 @@ public function up()
             $table->increments('id');
             $table->integer('plan_id')->unsigned();
             $table->decimal('price');
-            $table->enum('interval', ['day',  'month',  'year'])->nullable();
+            $table->enum('interval', ['day', 'month', 'year'])->nullable();
             $table->integer('interval_unit')->nullable();
 
             $table->foreign('plan_id')
@@ -65,7 +65,7 @@ public function up()
             $table->increments('id');
             $table->integer('plan_id')->unsigned();
             $table->string('subscriber_type')->nullable();
-            $table->timestamp('subscriber_id')->nullable();
+            $table->integer('subscriber_id')->nullable();
             $table->timestamp('start_at')->nullable();
             $table->timestamp('end_at')->nullable();
             $table->timestamp('cancelled_at')->nullable();
@@ -87,7 +87,7 @@ public function up()
             $table->integer('used')->nullable();
 
             $table->foreign('plan_feature_id')
-                ->references('id')->on('plans_features');
+                ->references('id')->on('plan_features');
 
             $table->timestamps();
         });
@@ -103,7 +103,7 @@ public function down()
         Schema::dropIfExists('subscriber_consumables');
         Schema::dropIfExists('subscriptions');
         Schema::dropIfExists('plan_features');
-        Schema::dropIfExists('plan_prices');
+        Schema::dropIfExists('plan_intervals');
         Schema::dropIfExists('plans');
     }
 }
diff --git a/src/Contracts/PlanIntervalContract.php b/src/Contracts/PlanIntervalContract.php
@@ -4,6 +4,10 @@
 
 interface PlanIntervalContract
 {
+    const DAY = 'day';
+    const MONTH = 'month';
+    const YEAR = 'year';
+
     public static function make($type, int $unit, float $price): self;
 
     public static function makeInfinite(float $price): self;

diff --git a/src/Entities/PlanInterval.php b/src/Entities/PlanInterval.php
@@ -8,9 +8,6 @@
 
 class PlanInterval extends Model implements PlanIntervalContract
 {
-    public static $DAY = 'day';
-    public static $MONTH = 'month';
-    public static $YEAR = 'year';
     protected $table = 'plan_intervals';
     protected $fillable = [
         'price', 'interval', 'interval_unit',
@@ -32,7 +29,7 @@ public static function make($type, int $unit, float $price): PlanIntervalContrac
     protected static function checkIfIntervalExists(string $interval)
     {
         $intervals = [
-            self::$DAY, self::$MONTH, self::$YEAR,
+            self::DAY, self::MONTH, self::YEAR,
         ];
         if (! in_array($interval, $intervals)) {
             throw new IntervalErrorException(

diff --git a/src/LaravelSubscriptionsFacade.php b/src/LaravelSubscriptionsFacade.php
diff --git a/src/LaravelSubscriptionsServiceProvider.php b/src/LaravelSubscriptionsServiceProvider.php
@@ -19,29 +19,11 @@ public function boot()
         // $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         // $this->loadRoutesFrom(__DIR__.'/routes.php');
 
-        if ($this->app->runningInConsole()) {
-            $this->publishes([
-                __DIR__.'/../config/config.php' => config_path('subscriptions.php'),
-            ], 'config');
-
-            // Publishing the views.
-            /*$this->publishes([
-                __DIR__.'/../resources/views' => resource_path('views/vendor/laravel-subscriptions'),
-            ], 'views');*/
-
-            // Publishing assets.
-            /*$this->publishes([
-                __DIR__.'/../resources/assets' => public_path('vendor/laravel-subscriptions'),
-            ], 'assets');*/
-
-            // Publishing the translation files.
-            /*$this->publishes([
-                __DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-subscriptions'),
-            ], 'lang');*/
-
-            // Registering package commands.
-            // $this->commands([]);
-        }
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
+
+        $this->publishes([
+            __DIR__.'/../config/config.php' => config_path('subscriptions.php'),
+        ]);
     }
 
     /**

diff --git a/src/Traits/HasSubscriptions.php b/src/Traits/HasSubscriptions.php
@@ -3,6 +3,8 @@
 namespace Sagitarius29\LaravelSubscriptions\Traits;
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Sagitarius29\LaravelSubscriptions\Entities\PlanInterval;
 use Sagitarius29\LaravelSubscriptions\Entities\Subscription;
 use Sagitarius29\LaravelSubscriptions\Contracts\PlanContract;
@@ -14,9 +16,9 @@ trait HasSubscriptions
 {
     /**
      * @param  PlanContract|PlanIntervalContract  $planOrInterval
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return Model|SubscriptionContact
      */
-    public function subscribeTo($planOrInterval)
+    public function subscribeTo($planOrInterval): SubscriptionContact
     {
         if ($planOrInterval instanceof PlanContract) {
             return $this->subscribeToPlan($planOrInterval);
@@ -25,7 +27,12 @@ public function subscribeTo($planOrInterval)
         return $this->subscribeToInterval($planOrInterval);
     }
 
-    public function subscribeToPlan(PlanContract $plan)
+    /**
+     * @param  PlanContract  $plan
+     * @return Model|SubscriptionContact
+     * @throws SubscriptionErrorException
+     */
+    public function subscribeToPlan(PlanContract $plan): SubscriptionContact
     {
         if ($plan->hasManyIntervals()) {
             throw new SubscriptionErrorException(
@@ -46,7 +53,7 @@ public function subscribeToPlan(PlanContract $plan)
         if ($plan->isFree()) {
             $end_at = null;
         } else {
-            $end_at = $this->calculateExpireDate($start_at, $plan->intervals()->first());
+            $end_at = $this->calculateExpireDate($start_at, optional($plan->intervals())->first());
         }
 
         $subscription = Subscription::make($plan, $start_at, $end_at);
@@ -62,7 +69,7 @@ public function getActiveSubscription(): ?SubscriptionContact
             ->first();
     }
 
-    public function subscriptions()
+    public function subscriptions(): MorphMany
     {
         return $this->morphMany(config('subscriptions.entities.plan_subscription'), 'subscriber');
     }
@@ -72,17 +79,19 @@ private function calculateExpireDate(Carbon $start_at, PlanIntervalContract $int
         $end_at = Carbon::createFromTimestamp($start_at->timestamp);
 
         switch ($interval->getType()) {
-            case PlanInterval::$DAY:
-                return $end_at->days($interval->getUnit());
+            case PlanInterval::DAY:
+                return $end_at->addDays($interval->getUnit());
                 break;
-            case PlanInterval::$MONTH:
+            case PlanInterval::MONTH:
                 return $end_at->addMonths($interval->getUnit());
                 break;
-            case PlanInterval::$YEAR:
+            case PlanInterval::YEAR:
                 return $end_at->addYears($interval->getUnit());
                 break;
             default:
-                //TODO error exception
+                throw new SubscriptionErrorException(
+                    'The interval \''.$interval->getType().'\' selected is not available.'
+                );
                 break;
         }
     }
@@ -151,12 +160,12 @@ protected function upgradeTo(PlanIntervalContract $interval): SubscriptionContac
             throw new SubscriptionErrorException('You need a subscription for upgrade to other.');
         }
 
-        $this->forceCancelSubscription();
+        $this->forceUnsubscribe();
 
         return $this->subscribeToInterval($interval);
     }
 
-    public function forceCancelSubscription()
+    public function forceUnsubscribe()
     {
         $currentSubscription = $this->getActiveSubscription();
         $currentSubscription->end_at = now()->subSecond();
@@ -197,7 +206,7 @@ public function renewSubscription(PlanIntervalContract $interval = null)
         return $currentSubscription;
     }
 
-    public function cancelSubscription()
+    public function unsubscribe()
     {
         $currentSubscription = $this->getActiveSubscription();
         $currentSubscription->cancelled_at = now();

diff --git a/tests/Feature/PlanIntervalTest.php b/tests/Feature/PlanIntervalTest.php
@@ -26,23 +26,23 @@ public function it_can_create_interval_for_plans()
     {
         // Make Interval
         $interval = PlanInterval::make(
-            PlanInterval::$DAY,
+            PlanInterval::DAY,
             30,
             4.99
         );
         $plan = factory(Plan::class)->create();
         $plan->setInterval($interval);
 
         $this->assertEquals($plan->id, $interval->plan->id);
-        $this->assertEquals(PlanInterval::$DAY, $interval->getType());
+        $this->assertEquals(PlanInterval::DAY, $interval->getType());
         $this->assertEquals(30, $interval->getUnit());
         $this->assertEquals(4.99, $interval->getPrice());
         $this->assertNotTrue($interval->isInfinite());
         $this->assertTrue($interval->isNotFree());
 
         // Interval Free
         $interval = PlanInterval::make(
-            PlanInterval::$DAY,
+            PlanInterval::DAY,
             30,
             0
         );

diff --git a/tests/Feature/PlansTest.php b/tests/Feature/PlansTest.php
@@ -95,7 +95,7 @@ public function it_can_set_and_change_interval_of_a_plan()
         $this->assertTrue(in_array(HasSingleInterval::class, class_uses($plan)));
 
         // Interval is not free
-        $firstInterval = PlanInterval::make(PlanInterval::$MONTH, 1, 10.50);
+        $firstInterval = PlanInterval::make(PlanInterval::MONTH, 1, 10.50);
 
         $plan->setInterval($firstInterval);
 
@@ -106,14 +106,14 @@ public function it_can_set_and_change_interval_of_a_plan()
         $this->assertTrue($plan->isNotFree());
 
         // it can change interval
-        $otherInterval = PlanInterval::make(PlanInterval::$DAY, 15, 50.00);
+        $otherInterval = PlanInterval::make(PlanInterval::DAY, 15, 50.00);
 
         $plan->setInterval($otherInterval);
 
         $this->assertDatabaseMissing((new PlanInterval())->getTable(), $firstInterval->toArray());
         $this->assertDatabaseHas((new PlanInterval())->getTable(), $otherInterval->toArray());
 
-        $this->assertEquals(PlanInterval::$DAY, $plan->getInterval()->getType());
+        $this->assertEquals(PlanInterval::DAY, $plan->getInterval()->getType());
         $this->assertEquals(15, $plan->getInterval()->getUnit());
         $this->assertEquals(50.00, $plan->getInterval()->getPrice());
 
@@ -125,7 +125,7 @@ public function it_can_set_and_change_interval_of_a_plan()
         $this->assertDatabaseMissing((new PlanInterval())->getTable(), $otherInterval->toArray());
 
         //the interval price is zero
-        $intervalWithoutPrice = PlanInterval::make(PlanInterval::$DAY, 15, 0.00);
+        $intervalWithoutPrice = PlanInterval::make(PlanInterval::DAY, 15, 0.00);
 
         $plan->setInterval($intervalWithoutPrice);
 
@@ -154,9 +154,9 @@ public function a_plan_may_has_many_intervals()
         $this->assertTrue(in_array(HasManyIntervals::class, class_uses($plan)));
 
         $intervals = [
-            PlanInterval::make(PlanInterval::$MONTH, 1, 4.90),
-            PlanInterval::make(PlanInterval::$MONTH, 3, 11.90),
-            PlanInterval::make(PlanInterval::$YEAR, 1, 49.90),
+            PlanInterval::make(PlanInterval::MONTH, 1, 4.90),
+            PlanInterval::make(PlanInterval::MONTH, 3, 11.90),
+            PlanInterval::make(PlanInterval::YEAR, 1, 49.90),
         ];
 
         $plan->setIntervals($intervals);
@@ -177,10 +177,10 @@ public function a_plan_may_has_many_intervals()
             1
         );
 
-        $firstInterval = PlanInterval::make(PlanInterval::$MONTH, 1, 4.90);
+        $firstInterval = PlanInterval::make(PlanInterval::MONTH, 1, 4.90);
         $otherPlan->addInterval($firstInterval);
 
-        $secondInterval = PlanInterval::make(PlanInterval::$YEAR, 1, 49.90);
+        $secondInterval = PlanInterval::make(PlanInterval::YEAR, 1, 49.90);
         $otherPlan->addInterval($secondInterval);
 
         $this->assertDatabaseHas($intervalsTable, $firstInterval->toArray());