From ccb9c508944432ac440af8e037d3e33155c20d11 Mon Sep 17 00:00:00 2001
From: Nevo David <nevo@notu.co>
Date: Fri, 17 May 2024 17:56:37 +0700
Subject: [PATCH] feat: fix account again

---
 .../src/components/marketplace/seller.tsx     |  9 ++---
 .../subscriptions/subscription.repository.ts  |  3 +-
 .../src/services/stripe.service.ts            | 34 +++++++++----------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/apps/frontend/src/components/marketplace/seller.tsx b/apps/frontend/src/components/marketplace/seller.tsx
index df6b761d..14592cbb 100644
--- a/apps/frontend/src/components/marketplace/seller.tsx
+++ b/apps/frontend/src/components/marketplace/seller.tsx
@@ -21,11 +21,8 @@ export const AddAccount: FC<{ openBankAccount: (country: string) => void }> = (
   const [country, setCountry] = useState('');
   return (
     <div className="bg-sixth p-[32px] text-[20px] w-full max-w-[600px] mx-auto flex flex-col gap-[24px] rounded-[4px] border border-[#172034] relative">
-      Please select your country where your business is registered.
+      Please select your country where your business is.
       <br />
-      <span className="bg-red-400 text-red-950 font-[600]">
-        THIS IS IRREVERSIBLE.
-      </span>
       <Select
         label="Country"
         name="country"
@@ -141,7 +138,7 @@ export const Seller = () => {
   const { data } = useSWR('/marketplace/account', accountInformation);
 
   const connectBankAccount = useCallback(async () => {
-    if (!data?.account) {
+    if (!data?.connectedAccount) {
       modals.openModal({
         size: '100%',
         classNames: {
@@ -198,7 +195,7 @@ export const Seller = () => {
                 onClick={connectBankAccount}
                 loading={connectedLoading}
               >
-                {!data?.account
+                {!data?.connectedAccount
                   ? 'Connect Bank Account'
                   : 'Update Bank Account'}
               </Button>
diff --git a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.repository.ts b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.repository.ts
index 9f088cb3..1d8963b0 100644
--- a/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.repository.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/subscriptions/subscription.repository.ts
@@ -16,6 +16,7 @@ export class SubscriptionRepository {
       },
       select: {
         account: true,
+        connectedAccount: true,
       },
     });
   }
@@ -43,7 +44,7 @@ export class SubscriptionRepository {
   updateConnectedStatus(account: string, accountCharges: boolean) {
     return this._user.model.user.updateMany({
       where: {
-        account
+        account,
       },
       data: {
         connectedAccount: accountCharges,
diff --git a/libraries/nestjs-libraries/src/services/stripe.service.ts b/libraries/nestjs-libraries/src/services/stripe.service.ts
index 588292f3..54c45856 100644
--- a/libraries/nestjs-libraries/src/services/stripe.service.ts
+++ b/libraries/nestjs-libraries/src/services/stripe.service.ts
@@ -282,33 +282,31 @@ export class StripeService {
   }
 
   async createAccountProcess(userId: string, email: string, country: string) {
-    const account =
-      (await this._subscriptionService.getUserAccount(userId))?.account ||
-      (await this.createAccount(userId, email, country));
-    return { url: await this.addBankAccount(account) };
+    const account = await this._subscriptionService.getUserAccount(userId);
+
+    if (account?.account && account?.connectedAccount) {
+      return { url: await this.addBankAccount(account.account) };
+    }
+
+    if (account?.account && !account?.connectedAccount) {
+      await stripe.accounts.del(account.account);
+    }
+
+    const createAccount = await this.createAccount(userId, email, country);
+
+    return { url: await this.addBankAccount(createAccount) };
   }
 
   async createAccount(userId: string, email: string, country: string) {
     const account = await stripe.accounts.create({
       type: 'custom',
-      // controller: {
-      //   stripe_dashboard: {
-      //     type: 'express',
-      //   },
-      //   fees: {
-      //     payer: 'application',
-      //   },
-      //   losses: {
-      //     payments: 'application',
-      //   },
-      // },
       capabilities: {
         transfers: {
           requested: true,
         },
-        card_payments: {
-          requested: true,
-        },
+      },
+      tos_acceptance: {
+        service_agreement: 'recipient',
       },
       metadata: {
         service: 'gitroom',