add logic to fetch sub-commons with cache

daostack · Nov 21, 2023 · a30f2a4 · a30f2a4
1 parent c722fdf
commit a30f2a4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/pages/commonFeed/hooks/useCommonData/index.ts b/src/pages/commonFeed/hooks/useCommonData/index.ts
@@ -71,7 +71,7 @@ export const useCommonData = (userId?: string): Return => {
           const [parentCommons, subCommons, rootCommonGovernance] =
             await Promise.all([
               CommonService.getAllParentCommonsForCommon(common, true),
-              CommonService.getCommonsByDirectParentIds([common.id]),
+              CommonService.getCommonsByDirectParentId(common.id, true),
               rootCommonId
                 ? GovernanceService.getGovernanceByCommonId(rootCommonId, true)
                 : null,

diff --git a/src/services/Common.ts b/src/services/Common.ts
@@ -101,6 +101,26 @@ class CommonService {
       .reduce((acc, items) => [...acc, ...items], []);
   };
 
+  public getCommonsByDirectParentId = async (
+    parentCommonId: string,
+    cached = false,
+  ): Promise<Common[]> => {
+    const snapshot = await firebase
+      .firestore()
+      .collection(Collection.Daos)
+      .where("state", "==", CommonState.ACTIVE)
+      .where("directParent.commonId", "==", parentCommonId)
+      .withConverter(converter)
+      .get({ source: cached ? "cache" : "default" });
+    const commons = snapshot.docs.map((doc) => doc.data());
+
+    if (cached && commons.length === 0) {
+      return this.getCommonsByDirectParentId(parentCommonId);
+    }
+
+    return commons;
+  };
+
   public getCommonsByDirectParentIds = async (
     ids: string[],
   ): Promise<Common[]> => {