chore: [AB#12988] consolidate webflow sync helpers & helpers2

Author: jphechter

web/src/scripts/webflow/fundingSync.mjs

@@ -7,8 +7,8 @@ import {
   contentToStrings,
   getHtml,
   resolveApiPromises,
+  wait,
 } from "./helpers.mjs";
-import { wait } from "./helpers2.mjs";
 import { createItem, deleteItem, getAllItems, getCollection, modifyItem } from "./methods.mjs";
 import { allIndustryId, getCurrentSectors, syncSectors } from "./sectorSync.mjs";
 import { certificationCollectionId, fundingCollectionId } from "./webflowIds.mjs";
@@ -184,7 +184,7 @@ const getFundingFromMd = (i, sectors) => {
   })?.id;
   if (fundingType === undefined) {
     throw new Error(
-      `Funding Types for funding type ${i.fundingType} are mis-matched in ${i.id}. Please check with Webflow.`
+      `Funding Types for funding type ${i.fundingType} are mis-matched in ${i.id}. Please check with Webflow.`,
     );
   }
   const agency = agencyMap[i.agency[0]]?.id;
@@ -193,15 +193,15 @@ const getFundingFromMd = (i, sectors) => {
         You will have to create the agency in Webflow, then call the collection details endpoint
         with the fundingCollectionId to get the ID of the option, then adding it to agencyMap. */
     throw new Error(
-      `Agency Types for agency ${i.agency[0]} are mis-matched in ${i.id}. Please check with Webflow.`
+      `Agency Types for agency ${i.agency[0]} are mis-matched in ${i.id}. Please check with Webflow.`,
     );
   }
   const status = fundingStatusMap.find((v) => {
     return v.slug === i.status;
   })?.id;
   if (status === undefined) {
     throw new Error(
-      `Funding Status Types for funding status type ${i.status} are mis-matched in ${i.id}. Please check with Webflow.`
+      `Funding Status Types for funding status type ${i.status} are mis-matched in ${i.id}. Please check with Webflow.`,
     );
   }
 
@@ -210,7 +210,7 @@ const getFundingFromMd = (i, sectors) => {
       (cert) =>
         fundingCertificationsMap.find((v) => {
           return v.slug === cert;
-        })?.id
+        })?.id,
     ) ?? [];
 
   return {
@@ -225,7 +225,8 @@ const getFundingFromMd = (i, sectors) => {
     "last-updated": new Date(Date.now()).toISOString(),
     "funding-status": status,
     "funding-type": fundingType,
-    "industry-reference": industryReferenceArray.length > 0 ? industryReferenceArray : [allIndustryId],
+    "industry-reference":
+      industryReferenceArray.length > 0 ? industryReferenceArray : [allIndustryId],
   };
 };
 
@@ -246,7 +247,7 @@ const getNewFundings = async () => {
   const currentIdArray = new Set(
     current.map((sec) => {
       return sec.fieldData.slug;
-    })
+    }),
   );
   return getFilteredFundings()
     .filter((i) => {
@@ -292,7 +293,7 @@ const updateFundings = async () => {
       fundings.find((i) => {
         return i.id === item.fieldData.slug;
       }),
-      sectors
+      sectors,
     );
     console.info(`Attempting to modify ${funding.slug}`);
     try {

web/src/scripts/webflow/helpers.mjs

@@ -6,7 +6,6 @@ import remarkGfm from "remark-gfm";
 import remarkParse from "remark-parse";
 import remarkRehype from "remark-rehype";
 import { unified } from "unified";
-import { wait } from "./helpers2.mjs";
 
 const RATE_LIMIT_WAIT_SECONDS = 20;
 
@@ -115,3 +114,9 @@ export const getHtml = (arrayOfStrings, start, stop) => {
     .join(" ")
     .trim();
 };
+
+export const wait = (milliseconds = 10000) => {
+  return new Promise((resolve) => {
+    return setTimeout(resolve, milliseconds);
+  });
+};

web/src/scripts/webflow/helpers2.mjs

@@ -17,8 +17,8 @@ import {
   contentToStrings,
   getHtml,
   resolveApiPromises,
+  wait,
 } from "./helpers.mjs";
-import { wait } from "./helpers2.mjs";
 import { LicenseClassificationLookup } from "./licenseClassifications.mjs";
 import { createItem, deleteItem, getAllItems, modifyItem } from "./methods.mjs";
 import { licenseCollectionId } from "./webflowIds.mjs";

web/src/scripts/webflow/licenseSync.mjs

@@ -4,12 +4,12 @@ import fs from "fs";
 import orderBy from "lodash";
 import path from "path";
 import { fileURLToPath } from "url";
-import { wait } from "./helpers2.mjs";
+import { wait } from "./helpers.mjs";
 import { createItem, deleteItem, getAllItems, modifyItem } from "./methods.mjs";
 import { allIndustryId, sectorCollectionId } from "./webflowIds.mjs";
 
 const sectorDir = path.resolve(
-  `${path.dirname(fileURLToPath(import.meta.url))}/../../../../content/src/mappings`
+  `${path.dirname(fileURLToPath(import.meta.url))}/../../../../content/src/mappings`,
 );
 const getSectors = () => {
   return JSON.parse(fs.readFileSync(path.join(sectorDir, "sectors.json"), "utf8")).arrayOfSectors;
@@ -24,7 +24,7 @@ const getOverlappingSectorsFunc = (currentSectors) => {
     return new Set(
       getSectors().map((item) => {
         return item.id;
-      })
+      }),
     ).has(item.fieldData.slug);
   });
 };
@@ -37,7 +37,7 @@ const getUpdatedSectors = async () => {
   const sectorNames = new Set(
     getSectors().map((item) => {
       return item.name;
-    })
+    }),
   );
   const overlappingSectors = await getOverlappingSectors();
 

web/src/scripts/webflow/sectorSync.mjs

@@ -13,7 +13,6 @@ import {
   updateFundings,
 } from "./fundingSync.mjs";
 import { catchRateLimitErrorAndRetry } from "./helpers.mjs";
-import { wait } from "./helpers2.mjs";
 import {
   allIndustryId,
   createNewSectors,
@@ -268,12 +267,6 @@ jest.mock("fs", () => {
   };
 });
 
-jest.mock("./helpers2.mjs", () => {
-  return {
-    wait: jest.fn(),
-  };
-});
-
 describe("webflow syncing", () => {
   const dateNow = Date.now();
   const currentDate = new Date(dateNow);
@@ -801,15 +794,25 @@ describe("webflow syncing", () => {
 
         beforeEach(() => {
           mockRetryFunc = jest.fn();
+          jest.useRealTimers();
         });
 
         it("should retry function after waiting if rate limit error occurs", async () => {
+          jest.useFakeTimers();
+
+          const setTimeoutSpy = jest.spyOn(globalThis, "setTimeout");
           const error = { response: { status: 429 } };
 
-          await catchRateLimitErrorAndRetry(error, mockRetryFunc, "arg1", "arg2");
+          catchRateLimitErrorAndRetry(error, mockRetryFunc, "arg1", "arg2");
+          await jest.advanceTimersByTimeAsync(65000);
+
+          expect(setTimeoutSpy).toHaveBeenCalled();
+          const lastCall = setTimeoutSpy.mock.calls.at(-1);
+          expect(lastCall[1]).toBe(65000);
 
           expect(mockRetryFunc).toHaveBeenCalledWith("arg1", "arg2");
-          expect(wait).toHaveBeenCalledWith(65000);
+
+          setTimeoutSpy.mockRestore();
         });
 
         it("should throw error if non-rate limit error occurs", async () => {