Merge pull request #275 from moonstream-to/token-stat-fetch-optimization

Token stat fetch optimization
moonstream-to · May 8, 2024 · e6123a1 · e6123a1
2 parents 442561d + c3cf60c
commit e6123a1
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 54 deletions.
diff --git a/web/src/components/HomePage/PvpView.tsx b/web/src/components/HomePage/PvpView.tsx
@@ -42,7 +42,6 @@ const PvpView = ({ atBats, tokens }: { atBats: AtBat[]; tokens: OwnedToken[] })
         queryClient.setQueryData(
           ["atBats"],
           (oldData: { atBats: AtBat[]; tokens: Token[] } | undefined) => {
-            console.log(oldData);
             if (!oldData) {
               return { atBats: [], tokens: [] };
             }
@@ -64,7 +63,6 @@ const PvpView = ({ atBats, tokens }: { atBats: AtBat[]; tokens: OwnedToken[] })
           },
         );
         queryClient.setQueryData(["owned_tokens", user], (oldData: OwnedToken[] | undefined) => {
-          console.log(oldData);
           if (!oldData) {
             return [];
           }

diff --git a/web/src/components/Playing.tsx b/web/src/components/Playing.tsx
@@ -65,7 +65,6 @@ const Playing = () => {
   const ownedTokens = useQuery<OwnedToken[]>(
     ["owned_tokens", user],
     async () => {
-      console.log("FETCHING TOKENS");
       const ownedTokens = user ? await fetchFullcountPlayerTokens() : [];
       if (ownedTokens.length > 0 && !selectedToken && ownedTokens[selectedTokenIdx]) {
         updateContext({ selectedToken: { ...ownedTokens[selectedTokenIdx] } });

diff --git a/web/src/components/atbat/AtBatView.tsx b/web/src/components/atbat/AtBatView.tsx
@@ -127,7 +127,6 @@ const AtBatView: React.FC = () => {
     },
     {
       onSuccess: (data) => {
-        console.log(data);
         if (data && !selectedToken && ownedTokens.data) {
           const token = ownedTokens.data.find(
             (t) => isSameToken(t, data.atBat.batter) || isSameToken(t, data.atBat.pitcher),

diff --git a/web/src/components/atbat/TokenCard.tsx b/web/src/components/atbat/TokenCard.tsx
@@ -31,7 +31,7 @@ const TokenCard = ({ token, isPitcher }: { token: Token; isPitcher: boolean }) =
       retry: (failureCount) => {
         return failureCount < 3;
       },
-      refetchInterval: 5000,
+      refetchInterval: 50000,
     },
   );
 
@@ -56,7 +56,7 @@ const TokenCard = ({ token, isPitcher }: { token: Token; isPitcher: boolean }) =
       retry: (failureCount) => {
         return failureCount < 3;
       },
-      refetchInterval: 5000,
+      refetchInterval: 50000,
     },
   );
 
@@ -93,7 +93,7 @@ const TokenCard = ({ token, isPitcher }: { token: Token; isPitcher: boolean }) =
       retry: (failureCount) => {
         return failureCount < 3;
       },
-      refetchInterval: 5000,
+      refetchInterval: 50000,
     },
   );
 
@@ -127,7 +127,7 @@ const TokenCard = ({ token, isPitcher }: { token: Token; isPitcher: boolean }) =
       retry: (failureCount) => {
         return failureCount < 3;
       },
-      refetchInterval: 5000,
+      refetchInterval: 50000,
     },
   );
   return (

diff --git a/web/src/components/campaign/CharacterCard.tsx b/web/src/components/campaign/CharacterCard.tsx
@@ -50,7 +50,6 @@ const CharacterCard = ({
         queryClient.setQueryData(
           ["atBats"],
           (oldData: { atBats: AtBat[]; tokens: Token[] } | undefined) => {
-            console.log(oldData);
             if (!oldData) {
               return { atBats: [], tokens: [] };
             }

diff --git a/web/src/components/leaderboard/leaderboards.ts b/web/src/components/leaderboard/leaderboards.ts
@@ -73,7 +73,6 @@ export const fetchWindowsForTokens = async (
     return res.data;
   });
   const response = await Promise.all(promises);
-  console.log(response);
   const windows = response.map((window: any) =>
     window.map((entry: { address: string }) => {
       const [address, id] = entry.address.split("_");

diff --git a/web/src/components/playing/MainStat.tsx b/web/src/components/playing/MainStat.tsx
@@ -27,7 +27,7 @@ const pitcherRecord = (stats: PlayerStats): string => {
 const MainStat = ({ stats, isPitcher }: { stats: PlayerStats; isPitcher: boolean }) => {
   return (
     <>
-      {isPitcher && stats && stats.points_data?.pitching_data && (
+      {isPitcher && !!stats && !!stats.points_data?.pitching_data && (
         <Flex className={styles.container}>
           <Text className={styles.data}>{pitcherRecord(stats)}</Text>
           <Text className={styles.label}>W-L</Text>
@@ -44,7 +44,7 @@ const MainStat = ({ stats, isPitcher }: { stats: PlayerStats; isPitcher: boolean
           <Text className={styles.label}>WHIP</Text>
         </Flex>
       )}
-      {!isPitcher && stats && stats.points_data?.batting_data && (
+      {!isPitcher && !!stats && !!stats.points_data?.batting_data && (
         <Flex className={styles.container}>
           <Text className={styles.data}>
             {formatDecimal(stats.points_data.batting_data.batting_average)}

diff --git a/web/src/components/playing/PlayView.tsx b/web/src/components/playing/PlayView.tsx
@@ -96,15 +96,11 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
   const atBat = useQuery(
     ["sessionAtBatID", selectedSession],
     () => {
-      console.log("sessionAtBatID");
       if (!selectedSession) return undefined;
       return gameContract.methods.SessionAtBat(selectedSession.sessionID).call();
     },
     {
       refetchInterval: 100000000,
-      onSuccess: (data) => {
-        console.log("sessionAtBatID success: ", data);
-      },
     },
   );
 
@@ -114,10 +110,8 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
     ["atBatStatus", atBat.data?.progress],
     async () => {
       if (!atBat.data) {
-        console.log("!atBat.data");
         return;
       }
-      console.log("atBatStatus", atBat.data);
 
       const atBatID = atBat.data;
       const status = await gameContract.methods.getAtBat(atBatID).call();
@@ -127,13 +121,6 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
       const currentSessionID = await gameContract.methods
         .AtBatSessions(atBatID, numSessions - 1)
         .call();
-      console.log({
-        atBat: {
-          ...status,
-          currentSessionID,
-          numSessions,
-        },
-      });
       if (Number(status.outcome) !== 0) {
         queryClient.refetchQueries("owned_tokens");
       }
@@ -145,16 +132,12 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
     },
     {
       enabled: false,
-      onSuccess: (data) => {
-        console.log("atBatStatus success: ", data);
-      },
     },
   );
 
   const sessionStatus = useQuery(
     ["session", selectedSession, atBatStatus.data, sessionID],
     async () => {
-      console.log("sessionStatus");
       if (!selectedSession) return undefined;
       const id = sessionID ?? selectedSession.sessionID;
       if (!secondsPerPhase) {
@@ -274,9 +257,6 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
     },
 
     {
-      onSuccess: (data) => {
-        console.log("sessionStatus success: ", data);
-      },
       refetchInterval: 3000,
       retry: false,
     },
@@ -288,20 +268,12 @@ const PlayView = ({ selectedToken }: { selectedToken: Token }) => {
   }, [selectedToken, opponent]);
 
   useEffect(() => {
-    console.log("sessionStatus.data useEffect:", sessionStatus.data?.progress);
     if (sessionStatus.data) {
       atBatStatus.refetch();
     }
   }, [sessionStatus.data?.progress]);
 
   useEffect(() => {
-    console.log(
-      "atBatStatus.data, isShowOutcomeDone useEffect: ",
-      atBatStatus.data,
-      isShowOutcomeDone,
-      "sessionID: ",
-      sessionID,
-    );
     if (isShowOutcomeDone && atBatStatus.data?.currentSessionID) {
       if (Number(atBatStatus.data.currentSessionID) !== sessionStatus.data?.sessionID) {
         setSessionID(atBatStatus.data.currentSessionID);

diff --git a/web/src/components/playing/PlayerView.tsx b/web/src/components/playing/PlayerView.tsx
@@ -121,13 +121,6 @@ const PlayerView = ({
   }, [sessionStatus.sessionID]);
 
   useEffect(() => {
-    console.log(
-      isPitcher,
-      sessionStatus.progress,
-      sessionStatus.didBatterReveal,
-      sessionStatus.didPitcherReveal,
-      token.source,
-    );
     if (isPitcher && sessionStatus.progress === 4 && !sessionStatus.didPitcherReveal) {
       handleReveal();
     }

diff --git a/web/src/components/practice/PracticeSelect.tsx b/web/src/components/practice/PracticeSelect.tsx
@@ -49,7 +49,6 @@ const PracticeSelect = () => {
         queryClient.setQueryData(
           ["atBats"],
           (oldData: { atBats: AtBat[]; tokens: Token[] } | undefined) => {
-            console.log(oldData);
             if (!oldData) {
               return { atBats: [], tokens: [] };
             }
@@ -71,7 +70,6 @@ const PracticeSelect = () => {
           },
         );
         queryClient.setQueryData(["owned_tokens", user], (oldData: OwnedToken[] | undefined) => {
-          console.log(oldData);
           if (!oldData) {
             return [];
           }

diff --git a/web/src/components/tokens/OwnedTokens.tsx b/web/src/components/tokens/OwnedTokens.tsx
@@ -76,7 +76,6 @@ const OwnedTokens = ({
 
   const mintToken = useMutation(
     async ({ name, imageIndex, source }: { name: string; imageIndex: number; source: string }) => {
-      console.log(imageIndex);
       switch (source) {
         case "BLBContract":
           return mintBLBToken({ web3ctx, name, imageIndex });

diff --git a/web/src/contexts/GameContext.tsx b/web/src/contexts/GameContext.tsx
@@ -97,7 +97,6 @@ export const GameContextProvider: FC<ProviderProps> = ({ children }) => {
   }, [contextState.userSessionId]);
 
   const updateContext = (newState: Partial<GameContextProps>) => {
-    console.log("updating context: ", { newState });
     setContextState((prevState) => {
       const isTokenSelected =
         prevState.isTokenSelected || !!newState.selectedToken || !!prevState.selectedToken;

diff --git a/web/src/hooks/useSendReport.tsx b/web/src/hooks/useSendReport.tsx
@@ -35,7 +35,6 @@ export const useSendReport = () => {
           `report_version:${HUMBUG_REPORT_VERSION}`,
         ],
       };
-      console.log("Sending data:", data);
 
       await axios.post("https://spire.bugout.dev/humbug/reports?sync=true", data, {
         headers: {

diff --git a/web/src/services/fullcounts.ts b/web/src/services/fullcounts.ts
@@ -10,7 +10,6 @@ const FullcountABI = FullcountABIImported as unknown as AbiItem[];
 const AT_BATS_OFFSET = 400;
 
 export const getAtBat = async ({ tokensCache, id }: { tokensCache: Token[]; id: number }) => {
-  console.log("FETCHING ATBAT", id);
   const { gameContract } = getContracts();
   const callData = [
     gameContract.methods.AtBatState(id).encodeABI(),
@@ -138,7 +137,6 @@ export const getAtBat = async ({ tokensCache, id }: { tokensCache: Token[]; id:
 };
 
 export const getAtBats = async ({ tokensCache }: { tokensCache: Token[] }) => {
-  console.log("FETCHING ATBATS");
   const { gameContract } = getContracts();
   const numAtBats = Number(await gameContract.methods.NumAtBats().call());
   const oldestAtBatNumber = Math.max(numAtBats - AT_BATS_OFFSET, 1);