Merge branch 'main' into 2788-builder-applyToRound

gitcoinco · Feb 14, 2024 · d7217ca · d7217ca
2 parents c149198 + e5a9c9a
commit d7217ca
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 130 deletions.
diff --git a/packages/data-layer/src/data-layer.ts b/packages/data-layer/src/data-layer.ts
@@ -17,6 +17,7 @@ import {
   RoundOverview,
   SearchBasedProjectCategory,
   TimestampVariables,
+  V2RoundWithRoles,
   v2Project,
   V2Round,
 } from "./data.types";
@@ -35,6 +36,7 @@ import {
   getProjects,
   getProjectsAndRolesByAddress,
   getRoundByIdAndChainId,
+  getRoundsByProgramIdAndUserAddress,
 } from "./queries";
 import { Address } from "viem";
 
@@ -396,6 +398,20 @@ export class DataLayer {
     return response.rounds[0] ?? [];
   }
 
+  async getRoundsByProgramIdAndUserAddress(args: {
+    chainId: number;
+    programId: string;
+    userAddress: Address;
+  }): Promise<V2RoundWithRoles[]> {
+    const response: { rounds: V2RoundWithRoles[] } = await request(
+      this.gsIndexerEndpoint,
+      getRoundsByProgramIdAndUserAddress,
+      { ...args, userAddress: args.userAddress.toLowerCase() },
+    );
+
+    return response.rounds;
+  }
+
   /**
    * Legacy - Allo v1 queries
    */

diff --git a/packages/data-layer/src/data.types.ts b/packages/data-layer/src/data.types.ts
@@ -229,12 +229,18 @@ export type V2Round = {
   donationsStartTime: string;
   donationsEndTime: string;
   matchTokenAddress: string;
-  roundMetadata: any;
+  roundMetadata: RoundMetadata | null;
   roundMetadataCid: string;
-  applicationMetadata: RoundApplicationMetadata;
+  applicationMetadata: RoundApplicationMetadata | null;
   applicationMetadataCid: string;
   strategyId: string;
+  projectId: string;
   strategyAddress: string;
+  strategyName: string;
+};
+
+export type V2RoundWithRoles = V2Round & {
+  roles: AddressAndRole[];
 };
 
 export type ProjectEvents = {

diff --git a/packages/data-layer/src/queries.ts b/packages/data-layer/src/queries.ts
@@ -308,3 +308,38 @@ export const getRoundByIdAndChainId = gql`
     }
   }
 `;
+
+export const getRoundsByProgramIdAndUserAddress = gql`
+  query getRoundsByProgramIdAndMemberAddress(
+    $chainId: Int!
+    $programId: String!
+    $userAddress: String!
+  ) {
+    rounds(
+      filter: {
+        chainId: { equalTo: $chainId }
+        projectId: { equalTo: $programId }
+        roles: { some: { address: { equalTo: $userAddress } } }
+      }
+    ) {
+      id
+      chainId
+      applicationsStartTime
+      applicationsEndTime
+      donationsStartTime
+      donationsEndTime
+      matchTokenAddress
+      roundMetadata
+      roundMetadataCid
+      applicationMetadata
+      applicationMetadataCid
+      strategyAddress
+      strategyName
+      roles {
+        role
+        address
+        createdAtBlock
+      }
+    }
+  }
+`;
diff --git a/packages/round-manager/src/context/round/RoundContext.tsx b/packages/round-manager/src/context/round/RoundContext.tsx
@@ -4,6 +4,8 @@ import { useWallet } from "../../features/common/Auth";
 import { getRoundById, listRounds } from "../../features/api/round";
 import { Web3Provider } from "@ethersproject/providers";
 import { datadogLogs } from "@datadog/browser-logs";
+import { DataLayer, useDataLayer } from "data-layer";
+import { Address } from "viem";
 
 export interface RoundState {
   data: Round[];
@@ -36,8 +38,9 @@ export const RoundContext = createContext<
 
 const fetchRounds = async (
   dispatch: Dispatch,
-  address: string,
-  walletProvider: Web3Provider,
+  dataLayer: DataLayer,
+  address: Address,
+  chainId: number,
   programId: string
 ) => {
   datadogLogs.logger.info(`fetchRounds: program - ${programId}`);
@@ -48,7 +51,13 @@ const fetchRounds = async (
   });
 
   try {
-    const { rounds } = await listRounds(address, walletProvider, programId);
+    const { rounds } = await listRounds({
+      chainId: chainId,
+      dataLayer,
+      programId,
+      userAddress: address,
+    });
+
     dispatch({ type: ActionType.SET_ROUNDS, payload: rounds });
     dispatch({
       type: ActionType.SET_FETCH_ROUNDS_STATUS,
@@ -135,16 +144,26 @@ export const RoundProvider = ({ children }: { children: React.ReactNode }) => {
 
 export const useRounds = (programId?: string) => {
   const context = useContext(RoundContext);
+  const dataLayer = useDataLayer();
+
   if (context === undefined) {
     throw new Error("useRounds must be used within a RoundProvider");
   }
   const { address, provider } = useWallet();
 
   useEffect(() => {
     if (programId) {
-      fetchRounds(context.dispatch, address, provider, programId);
+      provider.getNetwork().then((network) => {
+        fetchRounds(
+          context.dispatch,
+          dataLayer,
+          address,
+          network.chainId,
+          programId
+        );
+      });
     }
-  }, [address, provider, programId, context.dispatch]);
+  }, [address, dataLayer, provider, programId, context.dispatch]);
 
   return { ...context.state, dispatch: context.dispatch };
 };

diff --git a/packages/round-manager/src/context/round/__tests__/RoundContext.test.tsx b/packages/round-manager/src/context/round/__tests__/RoundContext.test.tsx
@@ -4,6 +4,7 @@ import { render, screen } from "@testing-library/react";
 import { makeRoundData } from "../../../test-utils";
 import { getRoundById, listRounds } from "../../../features/api/round";
 import { ProgressStatus, Round } from "../../../features/api/types";
+import { DataLayer, DataLayerProvider } from "data-layer";
 
 jest.mock("../../../features/api/round");
 jest.mock("wagmi");
@@ -15,6 +16,7 @@ jest.mock("../../../features/common/Auth", () => ({
 }));
 const mockWallet = {
   address: "0x0",
+  provider: { getNetwork: () => Promise.resolve({ chainId: "0" }) },
   signer: {
     getChainId: () => {
       /* do nothing.*/
@@ -61,10 +63,12 @@ describe("<RoundProvider />", () => {
       );
 
       render(
-        <RoundProvider>
-          {/*// @ts-expect-error test file*/}
-          <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
-        </RoundProvider>
+        <DataLayerProvider client={{} as DataLayer}>
+          <RoundProvider>
+            {/*// @ts-expect-error test file*/}
+            <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
+          </RoundProvider>
+        </DataLayerProvider>
       );
 
       expect(
@@ -86,9 +90,11 @@ describe("<RoundProvider />", () => {
       });
 
       render(
-        <RoundProvider>
-          <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
-        </RoundProvider>
+        <DataLayerProvider client={{} as DataLayer}>
+          <RoundProvider>
+            <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
+          </RoundProvider>
+        </DataLayerProvider>
       );
 
       expect(
@@ -108,12 +114,19 @@ describe("<RoundProvider />", () => {
     it("sets fetch round status to error when fetch fails", async () => {
       const expectedRound = makeRoundData();
       const expectedProgramId = expectedRound.ownedBy;
-      (listRounds as jest.Mock).mockRejectedValue(new Error(":("));
+
+      const dataLayerMock = {
+        getRoundsByProgramIdAndUserAddress: jest
+          .fn()
+          .mockRejectedValue(new Error(":(")),
+      } as unknown as DataLayer;
 
       render(
-        <RoundProvider>
-          <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
-        </RoundProvider>
+        <DataLayerProvider client={dataLayerMock}>
+          <RoundProvider>
+            <TestingUseRoundsComponent expectedProgramId={expectedProgramId} />
+          </RoundProvider>
+        </DataLayerProvider>
       );
 
       expect(