fixes

goshasafonov · goshasafonov · commit 7843c726c90d · 2025-03-14T23:07:10.000+03:00
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yuges\\Package\\Tests\\": "tests/src"
+            "Yuges\\Subscribable\\Tests\\": "tests/src"
         }
     },
     "scripts": {
diff --git a/database/migrations/0000_00_00_000000_create_subscriptions_table.php b/database/migrations/0000_00_00_000000_create_subscriptions_table.php
@@ -24,8 +24,8 @@ public function up(): void
         Schema::create($this->table, function (Blueprint $table) {
             $table->key(Config::getSubscriptionKeyType(KeyType::BigInteger));
 
-            $table->morphs('subscriber');
-            $table->morphs('subscribable');
+            $table->keyMorphs(Config::getSubscriberKeyType(KeyType::BigInteger), 'subscriber');
+            $table->keyMorphs(Config::getSubscribableKeyType(KeyType::BigInteger), 'subscribable');
             $table
                 ->foreignIdFor(Config::getPlanClass(Plan::class))
                 ->nullable()
diff --git a/src/Actions/CreateSubscriptionAction.php b/src/Actions/CreateSubscriptionAction.php
@@ -40,12 +40,12 @@ public function execute(?Subscriber $subscriber = null, ?Plan $plan = null): Sub
         ];
 
         $subscription = $this->subscribable
-            ->subscriptions()
+            ->subscribableSubscriptions()
             ->getQuery()
             ->whereMorphedTo('subscriber', $subscriber)
             ->first();
 
-        return $subscription ?? $this->subscribable->subscriptions()->create($attributes);
+        return $subscription ?? $this->subscribable->subscribableSubscriptions()->create($attributes);
     }
 
     public function validateSubscriber(?Subscriber $subscriber = null): void
diff --git a/src/Actions/DeleteSubscriptionAction.php b/src/Actions/DeleteSubscriptionAction.php
@@ -33,7 +33,7 @@ public function execute(?Subscriber $subscriber = null, ?Plan $plan = null): mix
         }
 
         return $this->subscribable
-            ->subscriptions()
+            ->subscribableSubscriptions()
             ->getQuery()
             ->whereMorphedTo('subscriber', $subscriber)
             ->where('plan_id', '=', $plan?->getKey() ?? null)
diff --git a/src/Actions/ToggleSubscriptionAction.php b/src/Actions/ToggleSubscriptionAction.php
@@ -34,7 +34,7 @@ public function execute(?Subscriber $subscriber = null, ?Plan $plan = null): ?Su
         }
 
         $subscription = $this->subscribable
-            ->subscriptions()
+            ->subscribableSubscriptions()
             ->getQuery()
             ->whereMorphedTo('subscriber', $subscriber)
             ->where('plan_id', '=', $plan?->getKey() ?? null)
diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -53,7 +53,7 @@ public static function getSubscriptionKeyType(mixed $default = null): KeyType
     /** @return class-string<Subscriber> */
     public static function getSubscriberDefaultClass(mixed $default = null): string
     {
-        return self::get('models.subscriber.default', $default);
+        return self::get('models.subscriber.default.class', $default);
     }
 
     /** @return Collection<array-key, class-string<Subscriber>> */
@@ -72,7 +72,7 @@ public static function getSubscriberKeyType(mixed $default = null): KeyType
     /** @return class-string<Subscribable> */
     public static function getSubscribableDefaultClass(mixed $default = null): string
     {
-        return self::get('models.subscribable.default', $default);
+        return self::get('models.subscribable.default.class', $default);
     }
 
     /** @return Collection<array-key, class-string<Subscribable>> */
diff --git a/src/Interfaces/Subscribable.php b/src/Interfaces/Subscribable.php
@@ -11,10 +11,16 @@ interface Subscribable
 {
     public function subscriptions(): MorphMany;
 
+    public function subscribableSubscriptions(): MorphMany;
+
     public function latestSubscription(): MorphOne;
 
+    public function latestSubscribableSubscription(): MorphOne;
+
     public function oldestSubscription(): MorphOne;
 
+    public function oldestSubscribableSubscription(): MorphOne;
+
     public function subscribe(?Subscriber $subscriber = null, ?Plan $plan = null): Subscription;
 
     public function unsubscribe(?Subscriber $subscriber = null, ?Plan $plan = null): Subscription;
diff --git a/src/Traits/CanSubscribe.php b/src/Traits/CanSubscribe.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Yuges\Subscribable\Traits;
+
+use Yuges\Subscribable\Config\Config;
+use Yuges\Subscribable\Models\Subscription;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+/**
+ * @property Collection<array-key, Subscription> $subscriptions
+ * @property Collection<array-key, Subscription> $subscriberSubscriptions
+ * @property ?Subscription $latestSubscription
+ * @property ?Subscription $latestSubscriberSubscriptions
+ * @property ?Subscription $oldestSubscription
+ * @property ?Subscription $oldestSubscriberSubscriptions
+ */
+trait CanSubscribe
+{
+    public function subscriptions(): MorphMany
+    {
+        return $this->subscriberSubscriptions();
+    }
+
+    public function subscriberSubscriptions(): MorphMany
+    {
+        return $this->morphMany(Config::getSubscriptionClass(Subscription::class), 'subscriber');
+    }
+
+    public function latestSubscription(): MorphOne
+    {
+        return $this->latestSubscriberSubscriptions();
+    }
+
+    public function latestSubscriberSubscriptions(): MorphOne
+    {
+        return $this->subscriberSubscriptions()->one()->latestOfMany();
+    }
+
+    public function oldestSubscription(): MorphOne
+    {
+        return $this->oldestSubscriberSubscriptions();
+    }
+
+    public function oldestSubscriberSubscriptions(): MorphOne
+    {
+        return $this->subscriberSubscriptions()->one()->oldestOfMany();
+    }
+}
diff --git a/src/Traits/CanSubscribeAndHasSubscriptions.php b/src/Traits/CanSubscribeAndHasSubscriptions.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Yuges\Subscribable\Traits;
+
+trait CanSubscribeAndHasSubscriptions
+{
+    use CanSubscribe, HasSubscriptions {
+        CanSubscribe::subscriptions insteadof HasSubscriptions;
+        CanSubscribe::latestSubscription insteadof HasSubscriptions;
+        CanSubscribe::oldestSubscription insteadof HasSubscriptions;
+    }
+}
diff --git a/src/Traits/HasSubscriptions.php b/src/Traits/HasSubscriptions.php
@@ -12,25 +12,43 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 /**
- * @property Collection<array-key, Subscription> $subscription
+ * @property Collection<array-key, Subscription> $subscriptions
+ * @property Collection<array-key, Subscription> $subscribableSubscriptions
  * @property ?Subscription $latestSubscription
+ * @property ?Subscription $latestSubscribableSubscription
  * @property ?Subscription $oldestSubscription
+ * @property ?Subscription $oldestSubscribableSubscription
  */
 trait HasSubscriptions
 {
     public function subscriptions(): MorphMany
+    {
+        return $this->subscribableSubscriptions();
+    }
+
+    public function subscribableSubscriptions(): MorphMany
     {
         return $this->morphMany(Config::getSubscriptionClass(), 'subscribable');
     }
 
     public function latestSubscription(): MorphOne
     {
-        return $this->subscriptions()->one()->latestOfMany();
+        return $this->latestSubscribableSubscription();
+    }
+
+    public function latestSubscribableSubscription(): MorphOne
+    {
+        return $this->subscribableSubscriptions()->one()->latestOfMany();
     }
 
     public function oldestSubscription(): MorphOne
     {
-        return $this->subscriptions()->one()->oldestOfMany();
+        return $this->oldestSubscribableSubscription();
+    }
+
+    public function oldestSubscribableSubscription(): MorphOne
+    {
+        return $this->subscribableSubscriptions()->one()->oldestOfMany();
     }
 
     public function subscribe(?Subscriber $subscriber = null, ?Plan $plan = null): Subscription
diff --git a/src/Traits/HasSubscriptionsAndCanSubscribe.php b/src/Traits/HasSubscriptionsAndCanSubscribe.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Yuges\Subscribable\Traits;
+
+trait HasSubscriptionsAndCanSubscribe
+{
+    use HasSubscriptions, CanSubscribe {
+        HasSubscriptions::subscriptions insteadof CanSubscribe;
+        HasSubscriptions::latestSubscription insteadof CanSubscribe;
+        HasSubscriptions::oldestSubscription insteadof CanSubscribe;
+    }
+}
diff --git a/tests/Feature/HasTableTest copy.php b/tests/Feature/HasTableTest copy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Yuges\Package\Tests\Feature;
+namespace Yuges\Subscribable\Tests\Feature;
 
-use Yuges\Package\Tests\TestCase;
-use Yuges\Package\Tests\Stubs\Models\User;
+use Yuges\Subscribable\Tests\TestCase;
+use Yuges\Subscribable\Tests\Stubs\Models\User;
 
 class HasTableTest extends TestCase
 {
diff --git a/tests/Integration/SubscribeTest.php b/tests/Integration/SubscribeTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Yuges\Subscribable\Tests\Integration;
+
+use Yuges\Subscribable\Tests\TestCase;
+use Yuges\Subscribable\Models\Subscription;
+use Yuges\Subscribable\Tests\Stubs\Models\User;
+use Yuges\Subscribable\Tests\Stubs\Models\Channel;
+
+class SubscribeTest extends TestCase
+{
+    public function testSubscribeUserToChannel()
+    {
+        config(['subscribable.models.subscriber.allowed' => [User::class, Channel::class]]);
+
+        $user = User::query()->create([
+            'name' => 'Georgy',
+            'email' => 'goshasafonov@yandex.ru',
+            'password' => 'test',
+        ]);
+
+        $channel = Channel::query()->create([
+            'name' => 'Yuges',
+        ]);
+
+        $subscription = $user->subscribe($channel);
+        $subscription = $channel->subscribe($user);
+
+        $this->assertDatabaseHas(Subscription::getTableName(), [
+            'subscriber_id' => $channel->id,
+            'subscriber_type' => $channel->getMorphClass(),
+            'subscribable_id' => $user->id,
+            'subscribable_type' => $user->getMorphClass(),
+        ]);
+
+        $this->assertDatabaseHas(Subscription::getTableName(), [
+            'subscriber_id' => $user->id,
+            'subscriber_type' => $user->getMorphClass(),
+            'subscribable_id' => $channel->id,
+            'subscribable_type' => $channel->getMorphClass(),
+        ]);
+    }
+}
diff --git a/tests/Integration/SubscriptionsTableTest.php b/tests/Integration/SubscriptionsTableTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Yuges\Package\Tests\Feature;
+namespace Yuges\Subscribable\Tests\Feature;
 
-use Yuges\Package\Tests\TestCase;
+use Yuges\Subscribable\Tests\TestCase;
 use Yuges\Subscribable\Models\Subscription;
 
 class SubscriptionsTableTest extends TestCase
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Yuges\Package\Tests\Unit;
+namespace Yuges\Subscribable\Tests\Unit;
 
-use Yuges\Package\Tests\TestCase;
+use Yuges\Subscribable\Tests\TestCase;
 
 class ExampleTest extends TestCase
 {
diff --git a/tests/src/Stubs/Migrations/0000_00_00_000000_create_channels_table.php b/tests/src/Stubs/Migrations/0000_00_00_000000_create_channels_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Yuges\Package\Enums\KeyType;
+use Yuges\Package\Database\Schema\Schema;
+use Yuges\Package\Database\Schema\Blueprint;
+use Yuges\Package\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    public function __construct(
+        protected ?string $table = 'channels'
+    ) {
+    }
+
+    public function up(): void
+    {
+        if (Schema::hasTable($this->table)) {
+            return;
+        }
+
+        Schema::create($this->table, function (Blueprint $table) {
+            $table->key(KeyType::Ulid);
+
+            $table->string('name');
+
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+};
diff --git a/tests/src/Stubs/Models/Channel.php b/tests/src/Stubs/Models/Channel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Yuges\Subscribable\Tests\Stubs\Models;
+
+use Yuges\Package\Models\Model;
+use Yuges\Subscribable\Interfaces\Subscriber;
+use Yuges\Subscribable\Interfaces\Subscribable;
+use Illuminate\Database\Eloquent\Concerns\HasUlids;
+use Yuges\Subscribable\Traits\HasSubscriptionsAndCanSubscribe;
+
+class Channel extends Model implements Subscriber, Subscribable
+{
+    use HasUlids, HasSubscriptionsAndCanSubscribe;
+
+    protected $table = 'channels';
+
+    protected $guarded = ['id'];
+}
diff --git a/tests/src/Stubs/Models/Subscription.php b/tests/src/Stubs/Models/Subscription.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yuges\Package\Tests\Stubs\Models;
+namespace Yuges\Subscribable\Tests\Stubs\Models;
 
 use Yuges\Subscribable\Models\Subscription as ModelsSubscription;
 
diff --git a/tests/src/Stubs/Models/User.php b/tests/src/Stubs/Models/User.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace Yuges\Package\Tests\Stubs\Models;
+namespace Yuges\Subscribable\Tests\Stubs\Models;
 
-use Yuges\Package\Traits\HasTable;
-use Illuminate\Database\Eloquent\Model;
+use Yuges\Package\Models\Model;
+use Yuges\Subscribable\Interfaces\Subscriber;
+use Yuges\Subscribable\Interfaces\Subscribable;
+use Yuges\Subscribable\Traits\HasSubscriptionsAndCanSubscribe;
 
-class User extends Model
+class User extends Model implements Subscriber, Subscribable
 {
-    use HasTable;
+    use HasSubscriptionsAndCanSubscribe;
 
     protected $table = 'users';
 
diff --git a/tests/src/TestCase.php b/tests/src/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Yuges\Package\Tests;
+namespace Yuges\Subscribable\Tests;
 
 use Illuminate\Contracts\Config\Repository;
 use Orchestra\Testbench\Attributes\WithMigration; 
@@ -35,8 +35,10 @@ protected function getPackageProviders($app)
 
     protected function defineDatabaseMigrations() 
     {
-        $this->loadMigrationsFrom(
-            __DIR__ . '/../../database/migrations/'
+        $this->loadMigrationsFrom([
+                __DIR__ . '/../../database/migrations/',
+                __DIR__ . '/Stubs/Migrations',
+            ]
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`},`
`38`	`38`	`"autoload-dev": {`
`39`	`39`	`"psr-4": {`
`40`		`- "Yuges\\Package\\Tests\\": "tests/src"`
	`40`	`+ "Yuges\\Subscribable\\Tests\\": "tests/src"`
`41`	`41`	`}`
`42`	`42`	`},`
`43`	`43`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function execute(?Subscriber $subscriber = null, ?Plan $plan = null): mix`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`return $this->subscribable`
`36`		`- ->subscriptions()`
	`36`	`+ ->subscribableSubscriptions()`
`37`	`37`	`->getQuery()`
`38`	`38`	`->whereMorphedTo('subscriber', $subscriber)`
`39`	`39`	`->where('plan_id', '=', $plan?->getKey() ?? null)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function execute(?Subscriber $subscriber = null, ?Plan $plan = null): ?Su`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`$subscription = $this->subscribable`
`37`		`- ->subscriptions()`
	`37`	`+ ->subscribableSubscriptions()`
`38`	`38`	`->getQuery()`
`39`	`39`	`->whereMorphedTo('subscriber', $subscriber)`
`40`	`40`	`->where('plan_id', '=', $plan?->getKey() ?? null)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static function getSubscriptionKeyType(mixed $default = null): KeyType`
`53`	`53`	`/** @return class-string<Subscriber> */`
`54`	`54`	`public static function getSubscriberDefaultClass(mixed $default = null): string`
`55`	`55`	`{`
`56`		`- return self::get('models.subscriber.default', $default);`
	`56`	`+ return self::get('models.subscriber.default.class', $default);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/** @return Collection<array-key, class-string<Subscriber>> */`
`@@ -72,7 +72,7 @@ public static function getSubscriberKeyType(mixed $default = null): KeyType`
`72`	`72`	`/** @return class-string<Subscribable> */`
`73`	`73`	`public static function getSubscribableDefaultClass(mixed $default = null): string`
`74`	`74`	`{`
`75`		`- return self::get('models.subscribable.default', $default);`
	`75`	`+ return self::get('models.subscribable.default.class', $default);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/** @return Collection<array-key, class-string<Subscribable>> */`