🔨 rename static method and move to GdocPost

owid · Nov 29, 2023 · 0bc9e7c · 0bc9e7c
1 parent e7f5b8a
commit 0bc9e7c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 48 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -2443,7 +2443,7 @@ apiRouter.get("/gdocs/:id", async (req, res) => {
         const publishedExplorersBySlug =
             await explorerAdminServer.getAllPublishedExplorersBySlugCached()
 
-        const gdoc = await GdocPost.getGdocFromContentSource(
+        const gdoc = await GdocPost.load(
             id,
             publishedExplorersBySlug,
             contentSource
@@ -2476,7 +2476,7 @@ apiRouter.put("/gdocs/:id", async (req, res) => {
         const publishedExplorersBySlug =
             await explorerAdminServer.getAllPublishedExplorersBySlugCached()
 
-        const initData = await GdocPost.getGdocFromContentSource(
+        const initData = await GdocPost.load(
             id,
             publishedExplorersBySlug,
             GdocsContentSource.Gdocs

diff --git a/adminSiteServer/app.tsx b/adminSiteServer/app.tsx
@@ -130,7 +130,7 @@ export class OwidAdminApp {
             const publishedExplorersBySlug =
                 await adminExplorerServer.getAllPublishedExplorersBySlugCached()
             try {
-                const gdoc = await GdocPost.getGdocFromContentSource<GdocPost>(
+                const gdoc = await GdocPost.load(
                     req.params.id,
                     publishedExplorersBySlug,
                     GdocsContentSource.Gdocs

diff --git a/baker/siteRenderers.tsx b/baker/siteRenderers.tsx
@@ -155,11 +155,10 @@ export const renderGdocsPageBySlug = async (
     const publishedExplorersBySlug =
         await explorerAdminServer.getAllPublishedExplorersBySlug()
 
-    const gdocWithAttachments =
-        await GdocPost.getGdocFromContentSource<GdocPost>(
-            gdoc.id,
-            publishedExplorersBySlug
-        )
+    const gdocWithAttachments = await GdocPost.load(
+        gdoc.id,
+        publishedExplorersBySlug
+    )
 
     return renderGdoc(gdocWithAttachments)
 }
@@ -241,7 +240,7 @@ export const renderFrontPage = async () => {
 
     let featuredWork: IndexPost[]
     try {
-        const frontPageConfigGdoc = await GdocPost.getGdocFromContentSource(
+        const frontPageConfigGdoc = await GdocPost.load(
             GDOCS_HOMEPAGE_CONFIG_DOCUMENT_ID,
             {}
         )
@@ -307,10 +306,7 @@ export const renderFrontPage = async () => {
 }
 
 export const renderDonatePage = async () => {
-    const faqsGdoc = await GdocPost.getGdocFromContentSource<GdocPost>(
-        GDOCS_DONATE_FAQS_DOCUMENT_ID,
-        {}
-    )
+    const faqsGdoc = await GdocPost.load(GDOCS_DONATE_FAQS_DOCUMENT_ID, {})
 
     return renderToHtmlPage(
         <DonatePage

diff --git a/datapage/Datapage.ts b/datapage/Datapage.ts
@@ -162,7 +162,7 @@ export const getDatapageGdoc = async (
         isPreviewing &&
         publishedExplorersBySlug &&
         OwidGoogleAuth.areGdocAuthKeysSet()
-            ? await GdocPost.getGdocFromContentSource<GdocPost>(
+            ? await GdocPost.load(
                   googleDocId,
                   publishedExplorersBySlug,
                   GdocsContentSource.Gdocs

diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
@@ -8,8 +8,6 @@ import {
 import { getUrlTarget } from "@ourworldindata/components"
 import {
     LinkedChart,
-    GdocsContentSource,
-    JsonError,
     keyBy,
     excludeNull,
     ImageMetadata,
@@ -71,8 +69,6 @@ export class GdocBase extends BaseEntity implements OwidGdocBaseInterface {
         () => new Promise(() => [])
     _filenameProperties: string[] = []
     _omittableFields: string[] = []
-    _loadSubclassAttachments: (gdoc: typeof this) => Promise<void> = () =>
-        new Promise(() => undefined)
 
     get enrichedBlockSources(): OwidEnrichedGdocBlock[][] {
         const enrichedBlockSources: OwidEnrichedGdocBlock[][] = [
@@ -607,34 +603,6 @@ export class GdocBase extends BaseEntity implements OwidGdocBaseInterface {
         this.errors = [...filenameErrors, ...linkErrors, ...subclassErrors]
     }
 
-    static async getGdocFromContentSource<T extends GdocBase>(
-        id: string,
-        publishedExplorersBySlug: Record<string, any>,
-        contentSource?: GdocsContentSource
-    ): Promise<T> {
-        const gdoc = await GdocBase.findOne({
-            where: {
-                id,
-            },
-            relations: ["tags"],
-        })
-
-        if (!gdoc) throw new JsonError(`No Google Doc with id ${id} found`)
-
-        if (contentSource === GdocsContentSource.Gdocs) {
-            await gdoc.fetchAndEnrichGdoc()
-        }
-
-        await gdoc.loadLinkedDocuments()
-        await gdoc.loadImageMetadata()
-        await gdoc.loadLinkedCharts(publishedExplorersBySlug)
-        await gdoc._loadSubclassAttachments(gdoc)
-
-        await gdoc.validate(publishedExplorersBySlug)
-
-        return gdoc as T
-    }
-
     toJSON(): Record<string, any> {
         return omit(this, [
             "_enrichSubclassContent",

diff --git a/db/model/Gdoc/GdocPost.ts b/db/model/Gdoc/GdocPost.ts
@@ -22,6 +22,8 @@ import {
     OwidEnrichedGdocBlock,
     BreadcrumbItem,
     RawBlockText,
+    GdocsContentSource,
+    JsonError,
 } from "@ourworldindata/utils"
 import { GDOCS_DETAILS_ON_DEMAND_ID } from "../../../settings/serverSettings.js"
 import {
@@ -178,8 +180,32 @@ export class GdocPost extends GdocBase implements OwidGdocInterface {
         return errors
     }
 
-    _loadSubclassAttachments: (gdoc: this) => Promise<void> = async () => {
-        await this.loadRelatedCharts()
+    static async load(
+        id: string,
+        publishedExplorersBySlug: Record<string, any>,
+        contentSource?: GdocsContentSource
+    ): Promise<GdocPost> {
+        const gdoc = await GdocPost.findOne({
+            where: {
+                id,
+            },
+            relations: ["tags"],
+        })
+
+        if (!gdoc) throw new JsonError(`No Google Doc with id ${id} found`)
+
+        if (contentSource === GdocsContentSource.Gdocs) {
+            await gdoc.fetchAndEnrichGdoc()
+        }
+
+        await gdoc.loadLinkedDocuments()
+        await gdoc.loadImageMetadata()
+        await gdoc.loadLinkedCharts(publishedExplorersBySlug)
+        await gdoc.loadRelatedCharts()
+
+        await gdoc.validate(publishedExplorersBySlug)
+
+        return gdoc
     }
 
     static async getDetailsOnDemandGdoc(): Promise<{