fix TS #96

djobbo · Oct 12, 2023 · 73e3727 · 73e3727
1 parent 8f9b211
commit 73e3727
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 66 deletions.
diff --git a/packages/bhapi/index.ts b/packages/bhapi/index.ts
@@ -72,15 +72,15 @@ export const get2v2Rankings = async (region: RankedRegion, page: number) => {
     return rankings2v2Mock
 }
 
-export const getPlayerStats = async (playerId: string) =>
+export const getPlayerStats = async (playerId: string | number) =>
     __DEV ? playerStatsMock : getBhApi<PlayerStats>(`/player/${playerId}/stats`)
 
-export const getPlayerRanked = async (playerId: string) =>
+export const getPlayerRanked = async (playerId: string | number) =>
     __DEV
         ? playerRankedMock
         : getBhApi<PlayerRanked>(`/player/${playerId}/ranked`)
 
-export const getClan = async (clanId: string) =>
+export const getClan = async (clanId: string | number) =>
     __DEV ? clanMock : getBhApi<Clan>(`/clan/${clanId}`)
 
 export const getAllLegends = async () => getBhApi("/legend/all")

diff --git a/packages/server/mutations/updateDBPlayerData.ts b/packages/server/mutations/updateDBPlayerData.ts
@@ -64,8 +64,8 @@ export const updateDBPlayerData = async (
         falls,
         suicides,
         teamkos,
-        damagedealt,
-        damagetaken,
+        damageDealt,
+        damageTaken,
     } = getLegendsAccumulativeData(legends)
 
     const { unarmed, gadgets, throws } = getWeaponlessData(legends)
@@ -84,8 +84,8 @@ export const updateDBPlayerData = async (
         rankedWins: playerRanked.wins,
         tier: playerRanked.tier,
         region: playerRanked.region,
-        damageDealt: damagedealt,
-        damageTaken: damagetaken,
+        damageDealt,
+        damageTaken,
         kos,
         falls,
         suicides,

diff --git a/packages/server/router/stats/getRankings.ts b/packages/server/router/stats/getRankings.ts
@@ -1,4 +1,7 @@
-import { getRankings } from "bhapi"
+import {
+    get1v1Rankings as get1v1RankingsFn,
+    get2v2Rankings as get2v2RankingsFn,
+} from "bhapi"
 import { logInfo } from "logger"
 import { numericLiteralValidator } from "common/helpers/validators"
 import { publicProcedure } from "../../trpc"
@@ -22,9 +25,9 @@ export const get1v1Rankings = publicProcedure //
             // const controller = new AbortController()
 
             const rankings = await withTimeLog(
-                getRankings,
+                get1v1RankingsFn,
                 "BHAPI:rankings1v1",
-            )("1v1", region, page, name)
+            )(region, page, name)
 
             // Fire and forget
             // const fireAndForget = withTimeLog(
@@ -67,9 +70,9 @@ export const get2v2Rankings = publicProcedure //
             // const controller = new AbortController()
 
             const rankings = await withTimeLog(
-                getRankings,
+                get2v2RankingsFn,
                 "BHAPI:rankings2v2",
-            )("2v2", region, page)
+            )(region, page)
 
             // Fire and forget
             // const fireAndForget = withTimeLog(

diff --git a/packages/web-parser/common/dev.ts b/packages/web-parser/common/dev.ts
diff --git a/worker/src/crawler/index.ts b/worker/src/crawler/index.ts
@@ -1,5 +1,5 @@
 import { formatTime } from "common/helpers/date"
-import { getPlayerStats, getRankings } from "bhapi"
+import { get1v1Rankings, getPlayerStats } from "bhapi"
 import { logInfo, logWarning } from "logger"
 import { supabaseService } from "db/supabase/service"
 import { updateDBPlayerData } from "server/mutations/updateDBPlayerData"
@@ -68,7 +68,7 @@ const createCrawlerQueue = async (config: CrawlerConfig) => {
 
                 logInfo("Crawling leaderboard page", currentPage)
                 const players = await requestWithMinimumDelay(
-                    () => getRankings("1v1", "all", currentPage),
+                    () => get1v1Rankings("all", currentPage),
                     delayMs,
                 )