chore: username undefined (#3318)

Co-authored-by: Nicolas Burtey <[email protected]>
GaloyMoney · Oct 11, 2023 · 9750e5a · 9750e5a
1 parent 37ab866
commit 9750e5a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 31 deletions.
diff --git a/core/api/src/app/accounts/index.ts b/core/api/src/app/accounts/index.ts
@@ -53,14 +53,3 @@ export const hasPermissions = async (
 export const getBusinessMapMarkers = async () => {
   return accounts.listBusinessesForMap()
 }
-
-export const getUsernameFromWalletId = async (
-  walletId: WalletId,
-): Promise<Username | ApplicationError> => {
-  const wallet = await WalletsRepository().findById(walletId)
-  if (wallet instanceof Error) return wallet
-
-  const account = await accounts.findById(wallet.accountId)
-  if (account instanceof Error) return account
-  return account.username
-}
diff --git a/core/api/src/app/payments/helpers.ts b/core/api/src/app/payments/helpers.ts
@@ -77,7 +77,7 @@ const recipientDetailsFromInvoice = async <R extends WalletCurrency>(
       recipientWalletDescriptors: AccountWalletDescriptors
       pubkey: Pubkey
       usdPaymentAmount: UsdPaymentAmount | undefined
-      username: Username
+      username: Username | undefined
       userId: UserId
     }
   | ApplicationError

diff --git a/core/api/src/domain/accounts/index.types.d.ts b/core/api/src/domain/accounts/index.types.d.ts
@@ -97,7 +97,7 @@ type AccountStatusHistory = Array<{
 type Account = {
   readonly id: AccountId
   readonly createdAt: Date
-  username: Username
+  username?: Username | undefined
   defaultWalletId: WalletId
   withdrawFee: Satoshis // TODO: make it optional. only save when not default value from yaml
   level: AccountLevel

diff --git a/core/api/src/graphql/public/root/mutation/intraledger-payment-send.ts b/core/api/src/graphql/public/root/mutation/intraledger-payment-send.ts
@@ -1,6 +1,6 @@
 import dedent from "dedent"
 
-import { Accounts, Payments } from "@/app"
+import { Payments } from "@/app"
 import { checkedToWalletId } from "@/domain/wallets"
 import { mapAndParseErrorForGqlResponse } from "@/graphql/error-map"
 import { GT } from "@/graphql/index"
@@ -48,14 +48,6 @@ const IntraLedgerPaymentSendMutation = GT.Field<null, GraphQLPublicContextAuth>(
       return { errors: [mapAndParseErrorForGqlResponse(recipientWalletIdChecked)] }
     }
 
-    // TODO: confirm whether we need to check for username here
-    const recipientUsername = await Accounts.getUsernameFromWalletId(
-      recipientWalletIdChecked,
-    )
-    if (recipientUsername instanceof Error) {
-      return { errors: [mapAndParseErrorForGqlResponse(recipientUsername)] }
-    }
-
     const status = await Payments.intraledgerPaymentSendWalletIdForBtcWallet({
       recipientWalletId,
       memo,

diff --git a/core/api/src/graphql/public/root/mutation/intraledger-usd-payment-send.ts b/core/api/src/graphql/public/root/mutation/intraledger-usd-payment-send.ts
@@ -1,6 +1,6 @@
 import dedent from "dedent"
 
-import { Accounts, Payments } from "@/app"
+import { Payments } from "@/app"
 import { checkedToWalletId } from "@/domain/wallets"
 import { mapAndParseErrorForGqlResponse } from "@/graphql/error-map"
 import { GT } from "@/graphql/index"
@@ -48,14 +48,6 @@ const IntraLedgerUsdPaymentSendMutation = GT.Field<null, GraphQLPublicContextAut
       return { errors: [mapAndParseErrorForGqlResponse(recipientWalletIdChecked)] }
     }
 
-    // TODO: confirm whether we need to check for username here
-    const recipientUsername = await Accounts.getUsernameFromWalletId(
-      recipientWalletIdChecked,
-    )
-    if (recipientUsername instanceof Error) {
-      return { errors: [mapAndParseErrorForGqlResponse(recipientUsername)] }
-    }
-
     const status = await Payments.intraledgerPaymentSendWalletIdForUsdWallet({
       recipientWalletId,
       memo,