Make Stripe Connect account type configurable (#359)

daveearley · web-flow · commit 94b5e590fa77 · 2025-02-03T12:45:40.000Z
diff --git a/backend/.env.example b/backend/.env.example
@@ -11,6 +11,7 @@ APP_SAAS_MODE_ENABLED=false
 APP_SAAS_STRIPE_APPLICATION_FEE_PERCENT=1.5
 APP_HOMEPAGE_VIEWS_UPDATE_BATCH_SIZE=8
 APP_DISABLE_REGISTRATION=false
+APP_STRIPE_CONNECT_ACCOUNT_TYPE=express
 
 STRIPE_PUBLIC_KEY=
 STRIPE_SECRET_KEY=
diff --git a/backend/app/DomainObjects/Enums/StripeConnectAccountType.php b/backend/app/DomainObjects/Enums/StripeConnectAccountType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace HiEvents\DomainObjects\Enums;
+
+enum StripeConnectAccountType: string
+{
+    use BaseEnum;
+
+    case STANDARD = 'standard';
+    case EXPRESS = 'express';
+}
diff --git a/backend/app/DomainObjects/Generated/AccountDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/AccountDomainObjectAbstract.php
@@ -23,6 +23,7 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     final public const STRIPE_CONNECT_SETUP_COMPLETE = 'stripe_connect_setup_complete';
     final public const ACCOUNT_VERIFIED_AT = 'account_verified_at';
     final public const CONFIGURATION = 'configuration';
+    final public const STRIPE_CONNECT_ACCOUNT_TYPE = 'stripe_connect_account_type';
 
     protected int $id;
     protected string $currency_code = 'USD';
@@ -37,6 +38,7 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     protected ?bool $stripe_connect_setup_complete = false;
     protected ?string $account_verified_at = null;
     protected array|string|null $configuration = null;
+    protected ?string $stripe_connect_account_type = null;
 
     public function toArray(): array
     {
@@ -54,6 +56,7 @@ public function toArray(): array
                     'stripe_connect_setup_complete' => $this->stripe_connect_setup_complete ?? null,
                     'account_verified_at' => $this->account_verified_at ?? null,
                     'configuration' => $this->configuration ?? null,
+                    'stripe_connect_account_type' => $this->stripe_connect_account_type ?? null,
                 ];
     }
 
@@ -199,4 +202,15 @@ public function getConfiguration(): array|string|null
     {
         return $this->configuration;
     }
+
+    public function setStripeConnectAccountType(?string $stripe_connect_account_type): self
+    {
+        $this->stripe_connect_account_type = $stripe_connect_account_type;
+        return $this;
+    }
+
+    public function getStripeConnectAccountType(): ?string
+    {
+        return $this->stripe_connect_account_type;
+    }
 }
diff --git a/backend/app/DomainObjects/Generated/StripeCustomerDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/StripeCustomerDomainObjectAbstract.php
@@ -17,6 +17,7 @@ abstract class StripeCustomerDomainObjectAbstract extends \HiEvents\DomainObject
     final public const CREATED_AT = 'created_at';
     final public const UPDATED_AT = 'updated_at';
     final public const DELETED_AT = 'deleted_at';
+    final public const STRIPE_ACCOUNT_ID = 'stripe_account_id';
 
     protected int $id;
     protected string $name;
@@ -25,6 +26,7 @@ abstract class StripeCustomerDomainObjectAbstract extends \HiEvents\DomainObject
     protected ?string $created_at = null;
     protected ?string $updated_at = null;
     protected ?string $deleted_at = null;
+    protected ?string $stripe_account_id = null;
 
     public function toArray(): array
     {
@@ -36,6 +38,7 @@ public function toArray(): array
                     'created_at' => $this->created_at ?? null,
                     'updated_at' => $this->updated_at ?? null,
                     'deleted_at' => $this->deleted_at ?? null,
+                    'stripe_account_id' => $this->stripe_account_id ?? null,
                 ];
     }
 
@@ -115,4 +118,15 @@ public function getDeletedAt(): ?string
     {
         return $this->deleted_at;
     }
+
+    public function setStripeAccountId(?string $stripe_account_id): self
+    {
+        $this->stripe_account_id = $stripe_account_id;
+        return $this;
+    }
+
+    public function getStripeAccountId(): ?string
+    {
+        return $this->stripe_account_id;
+    }
 }
diff --git a/backend/app/Http/Actions/Accounts/Stripe/CreateStripeConnectAccountAction.php b/backend/app/Http/Actions/Accounts/Stripe/CreateStripeConnectAccountAction.php
@@ -32,7 +32,7 @@ public function __invoke(int $accountId): JsonResponse
 
         try {
             $accountResult = $this->createStripeConnectAccountHandler->handle(CreateStripeConnectAccountDTO::fromArray([
-                'accountId' => $accountId,
+                'accountId' => $this->getAuthenticatedAccountId(),
             ]));
         } catch (CreateStripeConnectAccountLinksFailedException|CreateStripeConnectAccountFailedException $e) {
             return $this->errorResponse(
diff --git a/backend/app/Resources/Account/Stripe/StripeConnectAccountResponseResource.php b/backend/app/Resources/Account/Stripe/StripeConnectAccountResponseResource.php
@@ -14,6 +14,7 @@ class StripeConnectAccountResponseResource extends JsonResource
     public function toArray($request): array
     {
         return [
+            'stripe_connect_account_type' => $this->stripeConnectAccountType,
             'stripe_account_id' => $this->stripeAccountId,
             'is_connect_setup_complete' => $this->isConnectSetupComplete,
             'connect_url' => $this->connectUrl,
diff --git a/backend/app/Services/Application/Handlers/Account/Payment/Stripe/CreateStripeConnectAccountHandler.php b/backend/app/Services/Application/Handlers/Account/Payment/Stripe/CreateStripeConnectAccountHandler.php
@@ -3,6 +3,8 @@
 namespace HiEvents\Services\Application\Handlers\Account\Payment\Stripe;
 
 use HiEvents\DomainObjects\AccountDomainObject;
+use HiEvents\DomainObjects\Enums\StripeConnectAccountType;
+use HiEvents\DomainObjects\Generated\AccountDomainObjectAbstract;
 use HiEvents\Exceptions\CreateStripeConnectAccountFailedException;
 use HiEvents\Exceptions\CreateStripeConnectAccountLinksFailedException;
 use HiEvents\Exceptions\SaasModeEnabledException;
@@ -55,6 +57,7 @@ private function createOrGetStripeConnectAccount(CreateStripeConnectAccountDTO $
         );
 
         $response = new CreateStripeConnectAccountResponse(
+            stripeConnectAccountType: $stripeConnectAccount->type,
             stripeAccountId: $stripeConnectAccount->id,
             account: $account,
             isConnectSetupComplete: $this->isStripeAccountComplete($stripeConnectAccount),
@@ -80,7 +83,8 @@ private function getOrCreateStripeConnectAccount(AccountDomainObject $account):
             }
 
             $stripeAccount = $this->stripe->accounts->create([
-                'type' => 'express',
+                'type' => $this->config->get('app.stripe_connect_account_type')
+                    ?? StripeConnectAccountType::EXPRESS->value,
             ]);
         } catch (Throwable $e) {
             $this->logger->error('Failed to create or fetch Stripe Connect Account: ' . $e->getMessage(), [
@@ -98,7 +102,8 @@ private function getOrCreateStripeConnectAccount(AccountDomainObject $account):
 
         $this->accountRepository->updateWhere(
             attributes: [
-                'stripe_account_id' => $stripeAccount->id,
+                AccountDomainObjectAbstract::STRIPE_ACCOUNT_ID => $stripeAccount->id,
+                AccountDomainObjectAbstract::STRIPE_CONNECT_ACCOUNT_TYPE => $stripeAccount->type,
             ],
             where: [
                 'id' => $account->getId(),
diff --git a/backend/app/Services/Application/Handlers/Account/Payment/Stripe/DTO/CreateStripeConnectAccountResponse.php b/backend/app/Services/Application/Handlers/Account/Payment/Stripe/DTO/CreateStripeConnectAccountResponse.php
@@ -8,6 +8,7 @@
 class CreateStripeConnectAccountResponse extends BaseDTO
 {
     public function __construct(
+        public string              $stripeConnectAccountType,
         public string              $stripeAccountId,
         public AccountDomainObject $account,
         public bool                $isConnectSetupComplete,
diff --git a/backend/app/Services/Domain/Payment/Stripe/StripePaymentIntentCreationService.php b/backend/app/Services/Domain/Payment/Stripe/StripePaymentIntentCreationService.php
@@ -151,6 +151,7 @@ private function upsertStripeCustomer(CreatePaymentIntentRequestDTO $paymentInte
     {
         $customer = $this->stripeCustomerRepository->findFirstWhere([
             'email' => $paymentIntentDTO->order->getEmail(),
+            'stripe_account_id' => $paymentIntentDTO->account->getStripeAccountId(),
         ]);
 
         if ($customer === null) {
@@ -166,6 +167,7 @@ private function upsertStripeCustomer(CreatePaymentIntentRequestDTO $paymentInte
                 'name' => $stripeCustomer->name,
                 'email' => $stripeCustomer->email,
                 'stripe_customer_id' => $stripeCustomer->id,
+                'stripe_account_id' => $paymentIntentDTO->account->getStripeAccountId(),
             ]);
         }
 
diff --git a/backend/config/app.php b/backend/config/app.php
@@ -17,6 +17,7 @@
     'saas_stripe_application_fee_fixed' => env('APP_SAAS_STRIPE_APPLICATION_FEE_FIXED', 0),
     'disable_registration' => env('APP_DISABLE_REGISTRATION', false),
     'api_rate_limit_per_minute' => env('APP_API_RATE_LIMIT_PER_MINUTE', 180),
+    'stripe_connect_account_type' => env('APP_STRIPE_CONNECT_ACCOUNT_TYPE', 'express'),
 
     /**
      * The number of page views to batch before updating the database
diff --git a/backend/database/migrations/2025_02_03_112136_add_stripe_connect_account_type_to_accounts.php b/backend/database/migrations/2025_02_03_112136_add_stripe_connect_account_type_to_accounts.php
@@ -0,0 +1,27 @@
+<?php
+
+use HiEvents\DomainObjects\Enums\StripeConnectAccountType;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('accounts', function (Blueprint $table) {
+            $table->string('stripe_connect_account_type')->nullable();
+        });
+
+        DB::table('accounts')
+            ->whereNotNull('stripe_account_id')
+            ->update(['stripe_connect_account_type' => StripeConnectAccountType::EXPRESS->value]);
+    }
+
+    public function down(): void
+    {
+        Schema::table('accounts', static function (Blueprint $table) {
+            $table->dropColumn('stripe_connect_account_type');
+        });
+    }
+};
diff --git a/backend/database/migrations/2025_02_03_121516_add_stripe_account_id_to_stripe_customers_table.php b/backend/database/migrations/2025_02_03_121516_add_stripe_account_id_to_stripe_customers_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('stripe_customers', function (Blueprint $table) {
+            $table->string('stripe_account_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('stripe_customers', function (Blueprint $table) {
+            $table->dropColumn('stripe_account_id');
+        });
+    }
+};

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ class StripeConnectAccountResponseResource extends JsonResource`
`14`	`14`	`public function toArray($request): array`
`15`	`15`	`{`
`16`	`16`	`return [`
	`17`	`+ 'stripe_connect_account_type' => $this->stripeConnectAccountType,`
`17`	`18`	`'stripe_account_id' => $this->stripeAccountId,`
`18`	`19`	`'is_connect_setup_complete' => $this->isConnectSetupComplete,`
`19`	`20`	`'connect_url' => $this->connectUrl,`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`class CreateStripeConnectAccountResponse extends BaseDTO`
`9`	`9`	`{`
`10`	`10`	`public function __construct(`
	`11`	`+ public string $stripeConnectAccountType,`
`11`	`12`	`public string $stripeAccountId,`
`12`	`13`	`public AccountDomainObject $account,`
`13`	`14`	`public bool $isConnectSetupComplete,`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ private function upsertStripeCustomer(CreatePaymentIntentRequestDTO $paymentInte`
`151`	`151`	`{`
`152`	`152`	`$customer = $this->stripeCustomerRepository->findFirstWhere([`
`153`	`153`	`'email' => $paymentIntentDTO->order->getEmail(),`
	`154`	`+ 'stripe_account_id' => $paymentIntentDTO->account->getStripeAccountId(),`
`154`	`155`	`]);`
`155`	`156`
`156`	`157`	`if ($customer === null) {`
`@@ -166,6 +167,7 @@ private function upsertStripeCustomer(CreatePaymentIntentRequestDTO $paymentInte`
`166`	`167`	`'name' => $stripeCustomer->name,`
`167`	`168`	`'email' => $stripeCustomer->email,`
`168`	`169`	`'stripe_customer_id' => $stripeCustomer->id,`
	`170`	`+ 'stripe_account_id' => $paymentIntentDTO->account->getStripeAccountId(),`
`169`	`171`	`]);`
`170`	`172`	`}`
`171`	`173`