[PAY-2924] Migrate getUser, supporter, followers endpoints to sdk

packages/common/src/api/signUp.ts

@@ -24,8 +24,7 @@ const signUpApi = createApi({
         const user = await userApiFetch.getUserByHandle(
           {
             handle,
-            currentUserId: null,
-            retry: false
+            currentUserId: null
           },
           context
         )

packages/common/src/api/user.ts

@@ -1,7 +1,13 @@
 import { full } from '@audius/sdk'
 
 import { createApi } from '~/audius-query'
-import { ID, Kind, StringUSDC } from '~/models'
+import {
+  ID,
+  Kind,
+  OptionalId,
+  StringUSDC,
+  userMetadataListFromSDK
+} from '~/models'
 import {
   USDCTransactionDetails,
   USDCTransactionMethod,
@@ -46,10 +52,14 @@ const userApi = createApi({
     getUserById: {
       fetch: async (
         { id, currentUserId }: { id: ID; currentUserId: Nullable<ID> },
-        { apiClient }
+        { audiusSdk }
       ) => {
-        const apiUser = await apiClient.getUser({ userId: id, currentUserId })
-        return apiUser?.[0]
+        const sdk = await audiusSdk()
+        const { data: users = [] } = await sdk.full.users.getUser({
+          id: Id.parse(id),
+          userId: OptionalId.parse(currentUserId)
+        })
+        return userMetadataListFromSDK(users)[0]
       },
       options: {
         idArgKey: 'id',
@@ -61,17 +71,16 @@ const userApi = createApi({
       fetch: async (
         {
           handle,
-          currentUserId,
-          retry = true
-        }: { handle: string; currentUserId: Nullable<ID>; retry?: boolean },
-        { apiClient }
+          currentUserId
+        }: { handle: string; currentUserId: Nullable<ID> },
+        { audiusSdk }
       ) => {
-        const apiUser = await apiClient.getUserByHandle({
+        const sdk = await audiusSdk()
+        const { data: users = [] } = await sdk.full.users.getUserByHandle({
           handle,
-          currentUserId,
-          retry
+          userId: OptionalId.parse(currentUserId)
         })
-        return apiUser?.[0]
+        return userMetadataListFromSDK(users)[0]
       },
       options: {
         kind: Kind.USERS,

packages/common/src/api/utils.ts

@@ -2,6 +2,9 @@ import { z } from 'zod'
 
 import { decodeHashId, encodeHashId } from '~/utils/hashIds'
 
+// TODO: Move usage of these utils
+// to the version in packages/common/src/models/Identifiers.ts
+// https://linear.app/audius/issue/PAY-2997/migrate-idhashid-usage-to-models-version
 export const HashId = z.string().transform<number>((data: string, context) => {
   const id = decodeHashId(data)
   if (id === null) {

packages/common/src/models/Identifiers.ts

@@ -1,3 +1,7 @@
+import { z } from 'zod'
+
+import { decodeHashId, encodeHashId } from '~/utils/hashIds'
+
 export type ID = number
 export type UID = string
 export type CID = string
@@ -7,3 +11,39 @@ export enum PlayableType {
   PLAYLIST = 'playlist',
   ALBUM = 'album'
 }
+
+export const HashId = z.string().transform<number>((data: string, context) => {
+  const id = decodeHashId(data)
+  if (id === null) {
+    context.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: 'Hash id is invalid'
+    })
+
+    return z.NEVER
+  }
+  return id
+})
+
+/** Parses a `Nullable<ID>` safely for use with SDK functions which acccept an optional
+   id parameter.
+*/
+export const OptionalId = z
+  .number()
+  .nullable()
+  .transform<string | undefined>(
+    (data: number | null) => encodeHashId(data) ?? undefined
+  )
+
+export const Id = z.number().transform<string>((data: number, context) => {
+  const id = encodeHashId(data)
+  if (id === null) {
+    context.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: 'Hash id is invalid'
+    })
+
+    return z.NEVER
+  }
+  return id
+})

packages/common/src/models/Tipping.ts

@@ -1,5 +1,9 @@
+import { full } from '@audius/sdk'
+
 import { ID } from '~/models/Identifiers'
+import { removeNullable } from '~/utils/typeUtils'
 
+import { UserMetadata, userMetadataFromSDK } from './User'
 import { StringWei } from './Wallet'
 
 export type Supporter = {
@@ -27,3 +31,45 @@ export type UserTip = {
 export type LastDismissedTip = {
   receiver_id: ID
 }
+
+export type SupporterMetadata = {
+  sender: UserMetadata
+  amount: StringWei
+  rank: number
+}
+
+export type SupportedUserMetadata = {
+  receiver: UserMetadata
+  amount: StringWei
+  rank: number
+}
+
+export const supporterMetadataFromSDK = (
+  input: full.FullSupporter
+): SupporterMetadata | undefined => {
+  const user = userMetadataFromSDK(input.sender)
+  return user
+    ? { sender: user, amount: input.amount as StringWei, rank: input.rank }
+    : undefined
+}
+
+export const supporterMetadataListFromSDK = (input?: full.FullSupporter[]) =>
+  input
+    ? input.map((d) => supporterMetadataFromSDK(d)).filter(removeNullable)
+    : []
+
+export const supportedUserMetadataFromSDK = (
+  input: full.FullSupporting
+): SupportedUserMetadata | undefined => {
+  const user = userMetadataFromSDK(input.receiver)
+  return user
+    ? { receiver: user, amount: input.amount as StringWei, rank: input.rank }
+    : undefined
+}
+
+export const supportedUserMetadataListFromSDK = (
+  input?: full.FullSupporting[]
+) =>
+  input
+    ? input.map((d) => supportedUserMetadataFromSDK(d)).filter(removeNullable)
+    : []