Merge pull request #1976 from bakaphp/analysis-16M2Lw

Apply fixes from StyleCI

app/GraphQL/Subscription/Builders/PlanBuilder.php

@@ -29,4 +29,4 @@ public function getPlans(
          */
         return Plan::query();
     }
-}
+}

app/GraphQL/Subscription/Builders/SubscriptionBuilder.php

@@ -29,4 +29,4 @@ public function getSubscriptions(
          */
         return Subscription::query();
     }
-}
+}

app/GraphQL/Subscription/Mutations/Prices/PriceMutation.php

@@ -35,7 +35,7 @@ public function create(array $req): PriceModel
         ]);
 
         $stripePrice = StripePrice::create([
-            'unit_amount' => $req['input']['amount'] * 100, 
+            'unit_amount' => $req['input']['amount'] * 100,
             'currency' => $req['input']['currency'],
             'recurring' => ['interval' => $req['input']['interval']],
             'product' => $stripeProduct->id,
@@ -62,8 +62,8 @@ public function update(array $req): PriceModel
 
         StripePrice::create([
             'unit_amount' => $req['input']['amount'] * 100,
-            'currency' => $price->currency, 
-            'recurring' => ['interval' => $price->interval], 
+            'currency' => $price->currency,
+            'recurring' => ['interval' => $price->interval],
             'product' => $price->stripe_id,
         ]);
 

app/GraphQL/Subscription/Mutations/SubscriptionItems/SubscriptionItemMutation.php

@@ -29,7 +29,6 @@ public function __construct()
      */
     public function create(array $req): SubscriptionItemModel
     {
-
         StripeSubscriptionItem::create([
             'subscription' => $req['input']['subscription_id'],
             'price' => $req['input']['stripe_price_id'],
@@ -53,7 +52,6 @@ public function create(array $req): SubscriptionItemModel
      */
     public function update(array $req): SubscriptionItemModel
     {
-
         $subscriptionItem = SubscriptionItemRepository::getById($req['id']);
 
         StripeSubscriptionItem::update($subscriptionItem->stripe_id, [

app/GraphQL/Subscription/Mutations/Subscriptions/SubscriptionMutation.php

@@ -16,7 +16,7 @@
 use Kanvas\Companies\Models\Companies;
 
 class SubscriptionMutation
-{   
+{
     public function __construct()
     {
         Stripe::setApiKey(env('STRIPE_SECRET'));
@@ -32,9 +32,8 @@ public function __construct()
      */
     public function create(array $req): SubscriptionModel
     {
-
         $company = Companies::findOrFail($req['input']['companies_id']);
-        
+
         $paymentMethodId = $req['input']['payment_method_id'];
 
         $customer_id = $company->stripe_id ?? $this->createStripeCustomer($company, $paymentMethodId);
@@ -58,7 +57,6 @@ public function create(array $req): SubscriptionModel
 
     public function update(array $req): SubscriptionModel
     {
-
         $subscription = SubscriptionModel::findOrFail($req['input']['id']);
 
         $stripeSubscription = StripeSubscription::update($subscription->stripe_id, [
@@ -68,12 +66,13 @@ public function update(array $req): SubscriptionModel
                     'price' => $item['price_id'], // Nuevo price_id
                 ];
             }, $req['input']['items']),
-        ]);;
+        ]);
+        ;
 
         $dto = SubscriptionDto::viaRequest($req['input'], Auth::user(), $stripeSubscription);
 
         (new UpdateSubscription($subscription, $dto))->execute();
-        
+
         return $subscription;
     }
 
@@ -113,4 +112,4 @@ private function createStripeCustomer(Companies $company, string $paymentMethodI
 
         return $customer->id;
     }
-}
+}

app/Providers/EventServiceProvider.php

@@ -55,6 +55,7 @@
 use Kanvas\Users\Observers\UsersAssociatedAppsObserver;
 use Kanvas\Users\Observers\UsersAssociatedCompaniesObserver;
 use Kanvas\Users\Observers\UsersObserver;
+
 //use Kanvas\Subscriptions\Subscription\Models\Subscription;
 //use Kanvas\Subscriptions\Subscription\Observers\SubscriptionObserver;
 

database/migrations/Subscription/2024_09_10_122123_add_payment_method_to_subscriptions_table.php

@@ -4,15 +4,15 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
     public function up(): void
     {
         Schema::table('subscriptions', function (Blueprint $table) {
-            $table->string('payment_method_id')->nullable()->after('apps_plans_id');;
+            $table->string('payment_method_id')->nullable()->after('apps_plans_id');
+            ;
         });
     }
 

src/Domains/Subscription/Models/BaseModel.php

@@ -42,4 +42,4 @@ public function trashed()
     {
         return $this->{$this->getDeletedAtColumn()};
     }
-}
+}

src/Domains/Subscription/Plans/Actions/CreatePlan.php

@@ -28,4 +28,4 @@ public function execute(): Plan
             'users_id' => $this->dto->user->getId(),
         ]);
     }
-}
+}

src/Domains/Subscription/Plans/Actions/UpdatePlan.php

@@ -24,4 +24,4 @@ public function execute(): Plan
 
         return $this->plan;
     }
-}
+}

src/Domains/Subscription/Plans/DataTransferObject/Plan.php

@@ -20,7 +20,7 @@ public function __construct(
         public string $name,
         public ?string $description = null,
         public string $stripe_id,
-        public bool $is_default =false,
+        public bool $is_default = false,
         public bool $is_deleted = false,
     ) {
     }
@@ -32,10 +32,10 @@ public static function viaRequest(array $request, UserInterface $user): self
             app(Apps::class),
             auth()->user,
             $request['name'],
-            $request['stripe_id'], 
+            $request['stripe_id'],
             $request['description'] ?? null,
             $request['is_default'] ?? false,
             $request['is_deleted'] ?? false
         );
     }
-}
+}

src/Domains/Subscription/Plans/Models/Plan.php

@@ -9,6 +9,7 @@
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Subscription\Models\BaseModel;
 use Kanvas\Subscription\SubscriptionItems\Models\SubscriptionItem;
+
 /**
  * Class Plan.
  *
@@ -26,15 +27,15 @@ class Plan extends BaseModel
 {
     protected $table = 'apps_plans';
     protected $guarded = [];
-    
+
     /**
      * apps.
      */
     public function apps(): BelongsTo
     {
         return $this->belongsTo(Apps::class, 'apps_id');
     }
-    
+
     /**
      * subscriptionItem.
      */
@@ -52,4 +53,4 @@ public function trashed(): bool
     {
         return $this->{$this->getDeletedAtColumn()};
     }
-}
+}

src/Domains/Subscription/Prices/Repositories/PriceRepository.php

@@ -19,7 +19,7 @@ public static function getModel(): Model
     {
         return new Price();
     }
-    
+
     /**
      * Get a price by its Stripe ID.
      *
@@ -30,5 +30,4 @@ public static function getByStripeId(string $stripeId): Price
     {
         return Price::where('stripe_id', $stripeId)->firstOrFail();
     }
-
 }

src/Domains/Subscription/SubscriptionItems/Actions/CreateSubscriptionItem.php

@@ -22,4 +22,4 @@ public function execute(): SubscriptionItem
             'quantity' => $this->subscriptionItemDto->quantity,
         ]);
     }
-}
+}

src/Domains/Subscription/SubscriptionItems/Actions/UpdateSubscriptionItem.php

@@ -24,4 +24,4 @@ public function execute(): SubscriptionItem
 
         return $this->subscriptionItem;
     }
-}
+}

src/Domains/Subscription/SubscriptionItems/DataTransferObject/SubscriptionItem.php

@@ -20,7 +20,7 @@ public function __construct(
         public int $subscription_id,
         public int $apps_plans_id,
         public string $stripe_price_id,
-        public ?int $quantity = 1, 
+        public ?int $quantity = 1,
     ) {
     }
 
@@ -33,7 +33,7 @@ public static function viaRequest(array $request, UserInterface $user): self
             $request['subscription_id'],
             $request['apps_plans_id'],
             $request['stripe_price_id'],
-            $request['quantity'] ?? 1, 
+            $request['quantity'] ?? 1,
         );
     }
-}
+}

src/Domains/Subscription/SubscriptionItems/Models/SubscriptionItem.php

@@ -26,7 +26,7 @@ class SubscriptionItem extends BaseModel
 {
     protected $table = 'subscription_items';
     protected $guarded = [];
-    
+
     /**
      * subscription.
      */
@@ -60,4 +60,4 @@ public function trashed(): bool
     {
         return $this->{$this->getDeletedAtColumn()};
     }
-}
+}

src/Domains/Subscription/Subscriptions/Actions/CreateSubscription.php

@@ -32,4 +32,4 @@ public function execute(): Subscription
 
         return $subscription;
     }
-}
+}

src/Domains/Subscription/Subscriptions/Actions/UpdateSubscription.php

@@ -12,14 +12,13 @@
 class UpdateSubscription
 {
     public function __construct(
-        protected Subscription $subscription, 
+        protected Subscription $subscription,
         protected SubscriptionDto $subscriptionDto
     ) {
     }
 
     public function execute(): Subscription
     {
-
         $this->subscription->update([
             'name' => $this->subscriptionDto->name ?? $this->subscription->name,
             'payment_method_id' => $this->subscriptionDto->payment_method_id ?? $this->subscription->payment_method_id,
@@ -28,4 +27,4 @@ public function execute(): Subscription
 
         return $this->subscription;
     }
-}
+}

src/Domains/Subscription/Subscriptions/DataTransferObject/Subscription.php

@@ -26,7 +26,6 @@ public function __construct(
         public bool $is_cancelled = false,
         public bool $paid = false,
         public ?string $charge_date = null,
-
     ) {
     }
 
@@ -43,4 +42,4 @@ public static function viaRequest(array $request, UserInterface $user): self
             $request['trial_days'] ?? null,
         );
     }
-}
+}

src/Domains/Subscription/Subscriptions/Models/Subscription.php

@@ -37,7 +37,6 @@
  */
 class Subscription extends BaseModel
 {
-
     protected $table = 'subscriptions';
     protected $guarded = [];
 
@@ -74,4 +73,4 @@ public function trashed(): bool
     {
         return $this->{$this->getDeletedAtColumn()};
     }
-}
+}

src/Domains/Subscription/Subscriptions/Observers/SubscriptionObserver.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Kanvas\Subscriptions\Subscription\Observers;
@@ -16,4 +17,4 @@ public function updating(Subscription $subscription)
     {
         //
     }
-}
+}

src/Domains/Subscription/Subscriptions/Repositories/SubscriptionRepository.php

@@ -6,6 +6,7 @@
 
 use Kanvas\Subscription\Subscriptions\Models\Subscription;
 use Kanvas\Subscription\Subscriptions\DataTransferObject\Subscription as SubscriptionDto;
+
 class SubscriptionRepository
 {
     public static function create(array $data): Subscription
@@ -19,4 +20,4 @@ public static function cancel(int $id): Subscription
         $subscription->cancel();
         return $subscription;
     }
-}
+}