[PE-6075] Remove useGetTracksByIds from a-query

packages/common/src/api/suggestedTracks.ts

@@ -15,7 +15,7 @@ import { getTrack } from '~/store/cache/tracks/selectors'
 import { CommonState } from '~/store/index'
 
 import { useGetFavoritedTrackList } from './favorites'
-import { useGetTracksByIds } from './track'
+import { useTracks } from './tan-query/tracks/useTracks'
 import { useGetTrending } from './trending'
 
 const suggestedTrackCount = 5
@@ -172,22 +172,16 @@ export const useGetSuggestedPlaylistTracks = (collectionId: ID) => {
     isEqual
   )
 
-  useGetTracksByIds(
-    {
-      currentUserId,
-      ids: suggestedTracks
-        .filter(
-          (
-            suggestedTrack
-          ): suggestedTrack is { isLoading: true; id: ID; key: ID } =>
-            'id' in suggestedTrack && suggestedTrack.isLoading
-        )
-        .map((suggestedTrack) => suggestedTrack.id)
-    },
-    {
-      disabled: !currentUserId || suggestedTrackIds.length === 0
-    }
-  )
+  const trackIds = suggestedTracks
+    .filter(
+      (
+        suggestedTrack
+      ): suggestedTrack is { isLoading: true; id: ID; key: ID } =>
+        'id' in suggestedTrack && suggestedTrack.isLoading
+    )
+    .map((suggestedTrack) => suggestedTrack.id)
+
+  useTracks(trackIds)
 
   const handleAddTrack = useCallback(
     (trackId: ID) => {

packages/common/src/api/track.ts

@@ -10,6 +10,7 @@ import { SDKRequest } from './types'
 const trackApi = createApi({
   reducerPath: 'trackApi',
   endpoints: {
+    // TODO: Remove after purchases.ts is deprecated
     getTracksByIds: {
       fetch: async (
         { ids, currentUserId }: { ids: ID[]; currentUserId: Nullable<ID> },

packages/common/src/hooks/chats/usePurchasersAudience.ts

@@ -7,7 +7,7 @@ import {
   useGetPlaylistsByIds,
   useGetPurchasersCount,
   useGetSalesAggegrate,
-  useGetTracksByIds
+  useTracks
 } from '~/api'
 import { ID } from '~/models'
 import { removeNullable } from '~/utils'
@@ -32,10 +32,9 @@ export const usePurchasersAudience = ({
     (sale) => sale.contentType === 'album'
   )
 
-  const { data: tracks } = useGetTracksByIds({
-    ids: trackAggregates?.map((sale) => sale.contentId) ?? [],
-    currentUserId
-  })
+  const { data: tracks } = useTracks(
+    trackAggregates?.map((sale) => sale.contentId) ?? []
+  )
   const { data: albums } = useGetPlaylistsByIds({
     ids: albumAggregates?.map((sale) => sale.contentId) ?? [],
     currentUserId

packages/mobile/src/screens/chat-screen/ChatMessagePlaylist.tsx

@@ -1,8 +1,9 @@
 import { useCallback, useMemo, useEffect } from 'react'
 
 import {
-  useGetTracksByIds,
-  useGetPlaylistByPermalink
+  useGetPlaylistByPermalink,
+  useTracks,
+  useUsers
 } from '@audius/common/api'
 import { usePlayTrack, usePauseTrack } from '@audius/common/hooks'
 import type { TrackPlayback } from '@audius/common/hooks'
@@ -46,13 +47,8 @@ export const ChatMessagePlaylist = ({
 
   const trackIds =
     collection?.playlist_contents?.track_ids?.map((t) => t.track) ?? []
-  const { data: tracks } = useGetTracksByIds(
-    {
-      ids: trackIds,
-      currentUserId
-    },
-    { disabled: !trackIds.length }
-  )
+  const { data: tracks } = useTracks(trackIds)
+  const { byId: usersById } = useUsers(tracks?.map((t) => t.owner_id))
 
   const collectionId = collection?.playlist_id
 
@@ -76,11 +72,11 @@ export const ChatMessagePlaylist = ({
   const tracksWithUids = useMemo(() => {
     return (tracks || []).map((track) => ({
       ...track,
-      user: track.user,
+      user: usersById[track.owner_id],
       id: track.track_id,
       uid: uidMap[track.track_id]
     }))
-  }, [tracks, uidMap])
+  }, [tracks, uidMap, usersById])
 
   const entries = useMemo(() => {
     return (tracks || []).map((track) => ({

packages/web/src/pages/chat-page/components/ChatMessagePlaylist.tsx

@@ -1,9 +1,10 @@
 import { useCallback, useMemo, useEffect } from 'react'
 
 import {
-  useGetTracksByIds,
   useGetPlaylistByPermalink,
-  useCollection
+  useCollection,
+  useTracks,
+  useUsers
 } from '@audius/common/api'
 import { usePlayTrack, usePauseTrack } from '@audius/common/hooks'
 import {
@@ -65,13 +66,8 @@ export const ChatMessagePlaylist = ({
 
   const trackIds =
     playlist?.playlist_contents?.track_ids?.map((t) => t.track) ?? []
-  const { data: tracks } = useGetTracksByIds(
-    {
-      ids: trackIds,
-      currentUserId: currentUserId!
-    },
-    { disabled: !trackIds.length || !currentUserId }
-  )
+  const { data: tracks } = useTracks(trackIds)
+  const { byId: usersById } = useUsers(tracks?.map((t) => t.owner_id))
 
   const uidMap = useMemo(() => {
     return trackIds.reduce((result: { [id: ID]: string }, id) => {
@@ -89,11 +85,11 @@ export const ChatMessagePlaylist = ({
   const tracksWithUids = useMemo(() => {
     return (tracks || []).map((track) => ({
       ...track,
-      user: track.user,
+      user: usersById[track.owner_id],
       id: track.track_id,
       uid: uidMap[track.track_id]
     }))
-  }, [tracks, uidMap])
+  }, [tracks, uidMap, usersById])
 
   const entries = useMemo(() => {
     return (tracks || []).map((track) => ({