refactor: replace useQueries with useQuery in getConferences and getGithubRepos; update getArticles in getProductHuntProducts and add getSourceArticles

Author: medyo

src/features/cards/api/getConferences.ts

@@ -1,10 +1,14 @@
-import { useQueries, UseQueryOptions } from '@tanstack/react-query'
-import { QueryConfig } from 'src/lib/react-query'
-import { Conference } from 'src/types'
+import { useQuery } from '@tanstack/react-query'
 import { axios } from 'src/lib/axios'
+import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
+import { Conference } from 'src/types'
 
-const getConferences = async (tag: string): Promise<Conference[]> => {
-  return axios.get(`/data/v2/conferences/${tag}.json`)
+const getConferences = async (tags: string[]): Promise<Conference[]> => {
+  return axios.get(`/engine/conferences`, {
+    params: {
+      tags: tags?.join(','),
+    },
+  })
 }
 
 type QueryFnType = typeof getConferences
@@ -15,13 +19,9 @@ type UseGetConferencesOptions = {
 }
 
 export const useGetConferences = ({ config, tags }: UseGetConferencesOptions) => {
-  return useQueries({
-    queries: tags.map<UseQueryOptions<Conference[]>>((tag) => {
-      return {
-        ...config,
-        queryKey: ['conferences', tag],
-        queryFn: () => getConferences(tag),
-      }
-    })
+  return useQuery<ExtractFnReturnType<QueryFnType>>({
+    ...config,
+    queryKey: ['conferences', ...tags],
+    queryFn: () => getConferences(tags),
   })
 }

src/features/cards/api/getGithubRepos.ts

@@ -1,28 +1,35 @@
-import { useQueries, UseQueryOptions } from '@tanstack/react-query'
-import { QueryConfig } from 'src/lib/react-query'
-import { Repository } from 'src/types'
+import { useQuery } from '@tanstack/react-query'
 import { axios } from 'src/lib/axios'
+import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
+import { Repository } from 'src/types'
 
-const getRepos = async (tag: string, dateRange: string): Promise<Repository[]> => {
-  return axios.get(`/data/v2/github/${tag}/${dateRange}.json`)
+const getRepos = async ({
+  tags,
+  dateRange,
+}: {
+  tags: string[]
+  dateRange: string
+}): Promise<Repository[]> => {
+  return axios.get(`/engine/repos`, {
+    params: {
+      range: dateRange,
+      tags: tags.join(','),
+    },
+  })
 }
 
 type QueryFnType = typeof getRepos
 
 type UseGetReposOptions = {
   config?: QueryConfig<QueryFnType>
   tags: string[]
-  dateRange: "daily" | "monthly" | "weekly"
+  dateRange: 'daily' | 'monthly' | 'weekly'
 }
 
 export const useGetGithubRepos = ({ config, tags, dateRange }: UseGetReposOptions) => {
-  return useQueries({
-    queries: tags.map<UseQueryOptions<Repository[]>>((tag) => {
-      return {
-        ...config,
-        queryKey: ['github', tag, dateRange],
-        queryFn: () => getRepos(tag, dateRange),
-      }
-    })
+  return useQuery<ExtractFnReturnType<QueryFnType>>({
+    ...config,
+    queryKey: ['github', ...tags, dateRange],
+    queryFn: () => getRepos({ tags, dateRange }),
   })
-}
+}

src/features/cards/api/getProductHuntProducts.ts

@@ -1,22 +1,27 @@
 import { useQuery } from '@tanstack/react-query'
-import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
-import { Article } from 'src/types'
 import { axios } from 'src/lib/axios'
+import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
+import { Product } from 'src/types'
 
-const getArticles = async (): Promise<Article[]> => {
-  return axios.get('/data/v2/producthunt.json')
+const getArticles = async ({ date }: { date: string }): Promise<Product[]> => {
+  return axios.get(`/engine/products`, {
+    params: {
+      date,
+    },
+  })
 }
 
 type QueryFnType = typeof getArticles
 
 type UseGetArticlesOptions = {
   config?: QueryConfig<QueryFnType>
+  date: string
 }
 
-export const useGeProductHuntProducts = ({ config }: UseGetArticlesOptions = {}) => {
+export const useGeProductHuntProducts = ({ date, config }: UseGetArticlesOptions) => {
   return useQuery<ExtractFnReturnType<QueryFnType>>({
     ...config,
-    queryKey: ['producthunt'],
-    queryFn: () => getArticles(),
+    queryKey: ['producthunt', date],
+    queryFn: () => getArticles({ date }),
   })
 }

src/features/cards/api/getSourceArticles.ts

@@ -0,0 +1,35 @@
+import { useQuery } from '@tanstack/react-query'
+import { axios } from 'src/lib/axios'
+import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query'
+import { Article } from 'src/types'
+
+const getArticles = async ({
+  source,
+  tags,
+}: {
+  source: string
+  tags?: string[]
+}): Promise<Article[]> => {
+  return axios.get(`/engine/feeds`, {
+    params: {
+      source,
+      ...(tags?.length ? { tags: tags.join(',') } : {}),
+    },
+  })
+}
+
+type QueryFnType = typeof getArticles
+
+type UseGetArticlesOptions = {
+  config?: QueryConfig<QueryFnType>
+  source: string
+  tags?: string[]
+}
+
+export const useGetSourceArticles = ({ config, source, tags }: UseGetArticlesOptions) => {
+  return useQuery<ExtractFnReturnType<QueryFnType>>({
+    ...config,
+    queryKey: [source, ...(tags || [])],
+    queryFn: () => getArticles({ source, tags }),
+  })
+}