🐝 simplify, comment and cleanup

owid · Dec 6, 2024 · e04cb1e · e04cb1e
1 parent 5341641
commit e04cb1e
Show file tree

Hide file tree

Showing 4 changed files with 204 additions and 174 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -109,6 +109,7 @@ import {
     DbPlainChartView,
     ChartViewsTableName,
     DbInsertChartView,
+    PostsGdocsComponentsTableName,
     CHART_VIEW_PROPS_TO_PERSIST,
     CHART_VIEW_PROPS_TO_OMIT,
 } from "@ourworldindata/types"
@@ -177,7 +178,6 @@ import {
     addImagesToContentGraph,
     updateGdocContentOnly,
     upsertGdoc,
-    updateDerivedGdocPostsComponents,
 } from "../db/model/Gdoc/GdocFactory.js"
 import { match } from "ts-pattern"
 import { GdocDataInsight } from "../db/model/Gdoc/GdocDataInsight.js"
@@ -2781,11 +2781,6 @@ postRouteWithRWTransaction(
             gdoc.createdAt = new Date()
             gdoc.publishedAt = post.published_at
             await upsertGdoc(trx, gdoc)
-            await updateDerivedGdocPostsComponents(
-                trx,
-                gdoc.id,
-                gdoc.content.body
-            )
             await setTagsForGdoc(trx, gdocId, tags)
         }
         return { googleDocsId: gdocId }
@@ -2987,11 +2982,7 @@ putRouteWithRWTransaction(apiRouter, "/gdocs/:id", async (req, res, trx) => {
     )
 
     await upsertGdoc(trx, nextGdoc)
-    await updateDerivedGdocPostsComponents(
-        trx,
-        nextGdoc.id,
-        nextGdoc.content.body
-    )
+
     await indexAndBakeGdocIfNeccesary(trx, res.locals.user, prevGdoc, nextGdoc)
 
     return nextGdoc
@@ -3047,6 +3038,10 @@ deleteRouteWithRWTransaction(apiRouter, "/gdocs/:id", async (req, res, trx) => {
     await trx.table(PostsGdocsLinksTableName).where({ sourceId: id }).delete()
     await trx.table(PostsGdocsXImagesTableName).where({ gdocId: id }).delete()
     await trx.table(PostsGdocsTableName).where({ id }).delete()
+    await trx
+        .table(PostsGdocsComponentsTableName)
+        .where({ gdocId: id })
+        .delete()
     if (gdoc.published && checkIsGdocPostExcludingFragments(gdoc)) {
         await removeIndividualGdocPostFromIndex(gdoc)
     }

diff --git a/db/migration/1732626230267-addPostsGdocsComponentsTable.ts b/db/migration/1732626230267-addPostsGdocsComponentsTable.ts
@@ -11,7 +11,7 @@ CREATE TABLE posts_gdocs_components (
     config JSON,
     parent VARCHAR(1024),
     path VARCHAR(1024),
-    FOREIGN KEY (gdocId) REFERENCES posts_gdocs(id),
+    FOREIGN KEY (gdocId) REFERENCES posts_gdocs(id) ON DELETE CASCADE ON UPDATE CASCADE,
     INDEX idx_gdocId (gdocId)
 ) ENGINE=InnoDB;
         `)

diff --git a/db/model/Gdoc/GdocFactory.ts b/db/model/Gdoc/GdocFactory.ts
@@ -128,7 +128,7 @@ export async function createGdocAndInsertIntoDb(
     // while fetching the live gdocs (GdocsContentSource.Gdocs) in
     // loadGdocFromGdocBase().
     await upsertGdoc(knex, gdoc)
-    await updateDerivedGdocPostsComponents(knex, gdoc.id, gdoc.content.body)
+
     return gdoc
 }
 
@@ -616,7 +616,9 @@ export async function upsertGdoc(
             .onConflict("id")
             .merge()
         sql = query.toSQL()
-        return query
+        const indices = await query
+        await updateDerivedGdocPostsComponents(knex, gdoc.id, gdoc.content.body)
+        return indices
     } catch (e) {
         console.error(`Error occured in sql: ${sql}`, e)
         throw e