Added fetchData module

Author: Devorein

package.json

@@ -23,16 +23,16 @@
   "homepage": "https://github.com/Devorein/github-action-learn-section-notion#readme",
   "dependencies": {
     "@actions/core": "^1.2.7",
-    "@nishans/endpoints": "^0.0.32",
-    "@vercel/ncc": "^0.28.5",
-    "typescript": "^4.2.4"
+    "@nishans/endpoints": "^0.0.32"
   },
   "devDependencies": {
     "@nishans/types": "^0.0.35",
     "@types/jest": "^26.0.23",
     "@types/node": "^15.0.1",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
-    "ts-jest": "^26.5.5"
+    "ts-jest": "^26.5.5",
+    "@vercel/ncc": "^0.28.5",
+    "typescript": "^4.2.4"
   }
-}
+}

src/index.ts

@@ -1,62 +1,30 @@
 import * as core from '@actions/core';
 import { NotionEndpoints } from '@nishans/endpoints';
-import { ICollection, ICollectionBlock } from '@nishans/types';
+import { ICollection, TCollectionBlock } from '@nishans/types';
 import fs from 'fs';
 import { checkForSections } from './utils/checkForSections';
 import { commitFile } from './utils/commitFile';
 import { constructCategoriesMap } from './utils/constructCategoriesMap';
 import { constructNewContents } from './utils/constructNewContents';
+import { fetchData } from './utils/fetchData';
 import { getSchemaEntries } from './utils/getSchemaEntries';
 import { modifyRows } from './utils/modifyRows';
 
 async function main() {
   try {
-    const databaseId = core.getInput('database_id');
     const NOTION_TOKEN_V2 = core.getInput('token_v2');
+    const databaseId = core.getInput('database_id');
 
-    const collectionViewData = await NotionEndpoints.Queries.syncRecordValues(
-      {
-        requests: [
-          {
-            id: databaseId,
-            table: 'block',
-            version: -1
-          }
-        ]
-      },
-      {
-        token: NOTION_TOKEN_V2,
-        user_id: ''
-      }
+    const collectionView = await fetchData<TCollectionBlock>(
+      databaseId,
+      'block'
     );
-
     core.info('Fetched database');
 
-    const collectionView = collectionViewData.recordMap.block![databaseId]
-      .value as ICollectionBlock;
-
-    // If a database with the passed id doesn't exist
-    if (!collectionView) {
-      return core.setFailed(
-        `Either your NOTION_TOKEN_V2 has expired or a database with id:${databaseId} doesn't exist`
-      );
-    }
-
     const collection_id = collectionView.collection_id;
-    const collectionData = await NotionEndpoints.Queries.syncRecordValues(
-      {
-        requests: [
-          {
-            id: collection_id,
-            table: 'collection',
-            version: -1
-          }
-        ]
-      },
-      {
-        token: NOTION_TOKEN_V2,
-        user_id: ''
-      }
+    const collection = await fetchData<ICollection>(
+      collection_id,
+      'collection'
     );
 
     core.info('Fetched collection');
@@ -80,9 +48,6 @@ async function main() {
     );
 
     core.info('Fetched rows');
-
-    const collection = collectionData.recordMap.collection![collection_id]
-      .value as ICollection;
     const { schema } = collection;
     const [category_schema_entry, color_schema_entry] = getSchemaEntries(
       schema
@@ -124,11 +89,11 @@ async function main() {
       try {
         await commitFile();
       } catch (err) {
-        return core.setFailed(err.message);
+        core.setFailed(err.message);
       }
     }
   } catch (error) {
-    return core.setFailed(error.message);
+    core.setFailed(error.message);
   }
 }
 

src/utils/fetchData.ts

@@ -0,0 +1,35 @@
+import * as core from '@actions/core';
+import { NotionEndpoints } from '@nishans/endpoints';
+import { RecordMap, TData } from '@nishans/types';
+
+export const fetchData = async <T extends TData>(
+  id: string,
+  table: keyof RecordMap
+) => {
+  const NOTION_TOKEN_V2 = core.getInput('token_v2');
+  const response = await NotionEndpoints.Queries.syncRecordValues(
+    {
+      requests: [
+        {
+          id,
+          table,
+          version: -1
+        }
+      ]
+    },
+    {
+      token: NOTION_TOKEN_V2,
+      user_id: ''
+    }
+  );
+
+  const data = response.recordMap[table]![id].value as T;
+
+  if (!data) {
+    core.setFailed(
+      `Either your NOTION_TOKEN_V2 has expired or a ${table} with id:${id} doesn't exist`
+    );
+  }
+
+  return data;
+};