fixes

Author: goshasafonov

config/subscribable.php

@@ -2,23 +2,21 @@
 
 // Config for yuges/subscribable
 
-use Yuges\Package\Enums\KeyType;
-
 return [
     /*
      * FQCN (Fully Qualified Class Name) of the models to use for subscriptions
      */
     'models' => [
         'plan' => [
-            'key' => KeyType::Ulid,
+            'key' => Yuges\Package\Enums\KeyType::BigInteger,
             'class' => Yuges\Subscribable\Models\Plan::class,
         ],
         'feature' => [
-            'key' => KeyType::Ulid,
+            'key' => Yuges\Package\Enums\KeyType::BigInteger,
             'class' => Yuges\Subscribable\Models\Feature::class,
         ],
         'subscriber' => [
-            'key' => KeyType::Ulid,
+            'key' => Yuges\Package\Enums\KeyType::BigInteger,
             'default' => [
                 'class' => \App\Models\User::class,
             ],
@@ -29,7 +27,7 @@
             ],
         ],
         'subscribable' => [
-            'key' => KeyType::Ulid,
+            'key' => Yuges\Package\Enums\KeyType::BigInteger,
             'default' => [
                 'class' => \App\Models\User::class,
             ],
@@ -40,7 +38,7 @@
             ],
         ],
         'subscription' => [
-            'key' => KeyType::Ulid,
+            'key' => Yuges\Package\Enums\KeyType::BigInteger,
             'class' => Yuges\Subscribable\Models\Subscription::class,
         ],
     ],

database/migrations/create_features_table.php

@@ -26,7 +26,6 @@ public function up(): void
             $table->string('name');
 
             $table->timestamps();
-            $table->softDeletes();
         });
     }
 };

database/migrations/create_plans_table.php

@@ -34,7 +34,6 @@ public function up(): void
 
             $table->timestamp('expired_at')->nullable();
             $table->timestamps();
-            $table->softDeletes();
         });
     }
 };

database/migrations/create_subscriptions_table.php

@@ -35,7 +35,6 @@ public function up(): void
 
             $table->timestamp('expired_at')->nullable();
             $table->timestamps();
-            $table->softDeletes();
         });
     }
 };

src/Models/Feature.php

@@ -3,14 +3,11 @@
 namespace Yuges\Subscribable\Models;
 
 use Yuges\Package\Models\Model;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Feature extends Model
 {
-    use
-        HasUlids,
-        HasFactory;
+    use HasFactory;
 
     protected $table = 'features';
 

src/Models/Plan.php

@@ -3,14 +3,11 @@
 namespace Yuges\Subscribable\Models;
 
 use Yuges\Package\Models\Model;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Plan extends Model
 {
-    use
-        HasUlids,
-        HasFactory;
+    use HasFactory;
 
     protected $table = 'plans';
 

src/Models/Subscription.php

@@ -5,13 +5,11 @@
 use Yuges\Package\Models\Model;
 use Yuges\Subscribable\Traits\HasSubscriber;
 use Yuges\Subscribable\Traits\HasSubscribable;
-use Illuminate\Database\Eloquent\Concerns\HasUlids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Subscription extends Model
 {
     use
-        HasUlids,
         HasFactory,
         HasSubscriber,
         HasSubscribable;

tests/src/Stubs/Migrations/create_channels_table.php

@@ -19,12 +19,11 @@ public function up(): void
         }
 
         Schema::create($this->table, function (Blueprint $table) {
-            $table->key(KeyType::Ulid);
+            $table->key(KeyType::BigInteger);
 
             $table->string('name');
 
             $table->timestamps();
-            $table->softDeletes();
         });
     }
 };

tests/src/Stubs/Models/Channel.php

@@ -5,12 +5,11 @@
 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;
+    use HasSubscriptionsAndCanSubscribe;
 
     protected $table = 'channels';