chore(core): remove redundant 'addWalletIfNonexistent' function

core/api/src/app/accounts/index.ts

@@ -2,7 +2,6 @@ import { AccountsRepository, WalletsRepository } from "@/services/mongoose"
 
 export * from "./account-limit"
 export * from "./add-new-contact"
-export * from "./add-wallet"
 export * from "./create-account"
 export * from "./get-account-transactions-for-contact"
 export * from "./get-contact-by-username"

core/api/src/debug/create-usd-wallets.ts

@@ -3,13 +3,36 @@
  * yarn ts-node --files -r tsconfig-paths/register src/debug/create-usd-wallets.ts
  */
 
-import { Accounts as AccountsWithSpans } from "@/app"
 import { WalletCurrency } from "@/domain/shared"
 import { WalletType } from "@/domain/wallets"
 import { isUp } from "@/services/lnd/health"
 import { lndsConnect } from "@/services/lnd/auth"
 import { setupMongoConnection } from "@/services/mongodb"
-import { AccountsRepository } from "@/services/mongoose"
+import { AccountsRepository, WalletsRepository } from "@/services/mongoose"
+
+const addWalletIfNonexistent = async ({
+  accountId,
+  type,
+  currency,
+}: {
+  accountId: AccountId
+  type: WalletType
+  currency: WalletCurrency
+}): Promise<Wallet | ApplicationError> => {
+  const wallets = await WalletsRepository().listByAccountId(accountId)
+  if (wallets instanceof Error) return wallets
+
+  const walletOfTypeAndCurrency = wallets.find(
+    (wallet) => wallet.currency === currency && wallet.type === type,
+  )
+  if (walletOfTypeAndCurrency) return walletOfTypeAndCurrency
+
+  return WalletsRepository().persistNew({
+    accountId,
+    type,
+    currency,
+  })
+}
 
 const createUsdWallets = async () => {
   await setupMongoConnection()
@@ -18,7 +41,7 @@ const createUsdWallets = async () => {
   if (accounts instanceof Error) return accounts
   let progress = 0
   for await (const account of accounts) {
-    await AccountsWithSpans.addWalletIfNonexistent({
+    await addWalletIfNonexistent({
       accountId: account.id,
       type: WalletType.Checking,
       currency: WalletCurrency.Usd,

core/api/test/helpers/user.ts

@@ -3,7 +3,6 @@ import { lndOutside1, safePay } from "./lightning"
 import { randomPhone, randomUserId } from "."
 
 import { createAccountWithPhoneIdentifier } from "@/app/accounts"
-import { addWalletIfNonexistent } from "@/app/accounts/add-wallet"
 import { getAdminAccounts, getDefaultAccountsConfig } from "@/config"
 
 import { CouldNotFindAccountFromKratosIdError, CouldNotFindError } from "@/domain/errors"
@@ -155,12 +154,6 @@ export const createUserAndWalletFromPhone = async (
     const accountIP = await AccountsIpsRepository().update(accountIp)
     if (!(accountIP instanceof CouldNotFindError) && accountIP instanceof Error)
       throw accountIP
-
-    await addWalletIfNonexistent({
-      currency: WalletCurrency.Usd,
-      accountId: account.id,
-      type: WalletType.Checking,
-    })
   }
 
   if (account instanceof Error) throw account
@@ -190,20 +183,14 @@ export const createRandomUserAndWallets = async (): Promise<{
   const phone = randomPhone()
   const btcWalletDescriptor = await createUserAndWallet(phone)
 
-  const usdWallet = await addWalletIfNonexistent({
-    currency: WalletCurrency.Usd,
-    accountId: btcWalletDescriptor.accountId,
-    type: WalletType.Checking,
-  })
-  if (usdWallet instanceof Error) throw usdWallet
+  const accountWallets = await WalletsRepository().findAccountWalletsByAccountId(
+    btcWalletDescriptor.accountId,
+  )
+  if (accountWallets instanceof Error) throw accountWallets
 
   return {
     btcWalletDescriptor,
-    usdWalletDescriptor: {
-      id: usdWallet.id,
-      currency: WalletCurrency.Usd,
-      accountId: usdWallet.accountId,
-    },
+    usdWalletDescriptor: accountWallets.USD,
   }
 }
 
@@ -256,12 +243,6 @@ export const createUserAndWallet = async (
     const accountIP = await AccountsIpsRepository().update(accountIp)
     if (!(accountIP instanceof CouldNotFindError) && accountIP instanceof Error)
       throw accountIP
-
-    await addWalletIfNonexistent({
-      currency: WalletCurrency.Usd,
-      accountId: account.id,
-      type: WalletType.Checking,
-    })
   }
 
   if (account instanceof Error) throw account