collection fixes from Splitbee repo

Author: janzheng

.ruby-version

@@ -0,0 +1 @@
+2.5.3

package.json

@@ -1,13 +1,13 @@
 {
   "name": "notion-api-worker",
-  "version": "0.1.0",
+  "version": "0.1.",
   "main": "dist/index.js",
   "license": "MIT",
   "scripts": {
     "build": "webpack",
     "dev": "wrangler dev",
     "preview": "wrangler preview",
-    "deploy": "wrangler publish -e production"
+    "deploy": "wrangler publish"
   },
   "dependencies": {
     "tiny-request-router": "^1.2.2"

src/api/notion.ts

@@ -56,14 +56,24 @@ export const fetchPageById = async (pageId: string, notionToken?: string) => {
 };
 
 const queryCollectionBody = {
-  query: { aggregations: [{ property: "title", aggregator: "count" }] },
   loader: {
-    type: "table",
-    limit: 999,
+    type: "reducer",
+    reducers: {
+      collection_group_results: {
+        type: "results",
+        limit: 999,
+        loadContentCover: true,
+      },
+      "table:uncategorized:title:count": {
+        type: "aggregation",
+        aggregation: {
+          property: "title",
+          aggregator: "count",
+        },
+      },
+    },
     searchQuery: "",
     userTimeZone: "Europe/Vienna",
-    userLocale: "en",
-    loadContentCover: true,
   },
 };
 
@@ -75,8 +85,12 @@ export const fetchTableData = async (
   const table = await fetchNotionData<CollectionData>({
     resource: "queryCollection",
     body: {
-      collectionId,
-      collectionViewId,
+      collection: {
+        id: collectionId,
+      },
+      collectionView: {
+        id: collectionViewId,
+      },
       ...queryCollectionBody,
     },
     notionToken,

src/api/types.ts

@@ -165,7 +165,9 @@ export interface CollectionData {
     };
   };
   result: {
-    blockIds: string[];
+    reducerResults: {
+      collection_group_results: { blockIds: string[] };
+    };
   };
 }
 

src/index.ts

@@ -20,6 +20,8 @@ const corsHeaders = {
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Headers": "*",
   "Access-Control-Allow-Methods": "GET, HEAD, POST, OPTIONS",
+  // "Cache-Control":`public, s-maxage=${30}, max-age=${60*60*0.1}, stale-while-revalidate=${60*4}`, 
+  "Cache-Control":`public, s-maxage=${10}, max-age=${10}, stale-while-revalidate=${10}`, 
 };
 
 const router = new Router<Handler>();
@@ -86,6 +88,7 @@ const handleRequest = async (fetchEvent: FetchEvent): Promise<Response> => {
     return res;
   };
 
+  // console.log('responding ...')
   if (response) {
     fetchEvent.waitUntil(getResponseAndPersist());
     return response;

src/response.ts

@@ -11,6 +11,8 @@ export const createResponse = (
       "Access-Control-Allow-Origin": "*",
       "Access-Control-Allow-Methods": "GET, OPTIONS",
       "Content-Type": "application/json",
+      // "Cache-Control":`public, s-maxage=${30}, max-age=${60*60*0.1}, stale-while-revalidate=${60*4}`, 
+      "Cache-Control":`public, s-maxage=${10}, max-age=${10}, stale-while-revalidate=${10}`, 
       ...headers,
     },
   });

src/routes/page.ts

@@ -22,9 +22,12 @@ export async function pageRoute(req: HandlerRequest) {
       const block = allBlocks[blockId];
       const content = block.value && block.value.content;
 
-      return content && block.value.type !== "page"
-        ? content.filter((id: string) => !allBlocks[id])
-        : [];
+      if (!content || (block.value.type === "page" && blockId !== pageId!)) {
+        // skips pages other than the requested page
+        return [];
+      }
+
+      return content.filter((id: string) => !allBlocks[id]);
     });
 
     if (!pendingBlocks.length) {
@@ -68,6 +71,8 @@ export async function pageRoute(req: HandlerRequest) {
         (k) => collPage.recordMap.collection_view[k]
       )[0];
 
+      // console.log('>>>>> page getting table data')
+
       const { rows, schema } = await getTableData(
         coll,
         collView.value.id,

src/routes/table.ts

@@ -23,7 +23,16 @@ export const getTableData = async (
   const collectionRows = collection.value.schema;
   const collectionColKeys = Object.keys(collectionRows);
 
-  const tableArr: RowType[] = table.result.blockIds.map(
+  // console.log('>>>>> table block ids?!', table.result)
+
+  type Row = { id: string; [key: string]: RowContentType };
+
+  const rows: Row[] = [];
+
+  if(!table.result) // no tables
+    return { rows, schema: collectionRows };
+
+  const tableArr: RowType[] = table.result.reducerResults.collection_group_results.blockIds.map(
     (id: string) => table.recordMap.block[id]
   );
 
@@ -32,9 +41,6 @@ export const getTableData = async (
       b.value && b.value.properties && b.value.parent_id === collection.value.id
   );
 
-  type Row = { id: string; [key: string]: RowContentType };
-
-  const rows: Row[] = [];
 
   for (const td of tableData) {
     let row: Row = { id: td.value.id };