Revert 5 latest commits

This reverts down to commit 85c2912, inclusive.

db/model/Gdoc/GdocAuthor.ts

@@ -9,7 +9,6 @@ import {
     DEFAULT_GDOC_FEATURED_IMAGE,
     OwidGdocBaseInterface,
     excludeNullish,
-    defaults,
 } from "@ourworldindata/utils"
 import { GdocBase } from "./GdocBase.js"
 import { htmlToEnrichedTextBlock } from "./htmlToEnriched.js"
@@ -28,30 +27,7 @@ export class GdocAuthor extends GdocBase implements OwidGdocAuthorInterface {
 
     static create(obj: OwidGdocBaseInterface): GdocAuthor {
         const gdoc = new GdocAuthor()
-
-        // We need to prevent obj methods from overriding GdocAuthor methods.
-        // This happens when createGdocAndInsertIntoDb() passes a GdocBase
-        // instance to loadGdocFromGdocBase(), instead of a simple object. In
-        // this case, simply assigning obj to gdoc would override GdocAuthor
-        // methods with GdocBase methods, in particular the
-        // _enrichedSubclassContent. When creating a new author,
-        // _enrichedSubclassContent would run from the base GdocBase class
-        // instead of the GdocAuthor subclass, and the socials block would not
-        // be shaped as an ArchieML block, thus throwing an error.
-
-        // A first approach to avoid this would be to use Object.assign(), while
-        // omitting functions:
-        // Object.assign(gdoc, omitBy(obj, isFunction))
-
-        // However this approach still lets the parent class override properties
-        // of the subclass, which can be conceptually surprising.
-
-        // So instead, we choose to only override the properties and methods
-        // that are not defined in the subclass. Note that methods are also
-        // technically overriden if not defined on the subclass, although we can
-        // ignore it as this is redundant with inheritance mechanisms.
-        defaults(gdoc, obj)
-
+        Object.assign(gdoc, obj)
         return gdoc
     }
     protected typeSpecificFilenames(): string[] {

db/model/Gdoc/GdocDataInsight.ts

@@ -7,7 +7,6 @@ import {
     OwidGdocMinimalPostInterface,
     OwidGdocBaseInterface,
     excludeNullish,
-    defaults,
 } from "@ourworldindata/utils"
 import { GdocBase } from "./GdocBase.js"
 import * as db from "../../../db/db.js"
@@ -28,7 +27,7 @@ export class GdocDataInsight
 
     static create(obj: OwidGdocBaseInterface): GdocDataInsight {
         const gdoc = new GdocDataInsight()
-        defaults(gdoc, obj) // see GdocAuthor.ts for rationale
+        Object.assign(gdoc, obj)
         return gdoc
     }
 

db/model/Gdoc/GdocFactory.ts

@@ -93,10 +93,11 @@ export async function createGdocAndInsertIntoDb(
     knex: KnexReadWriteTransaction,
     id: string
 ): Promise<OwidGdoc> {
-    // Fetch the data from Google Docs.
+    // Fetch the data from Google Docs and save it to the database
     // We have to fetch it here because we need to know the type of the Gdoc in load()
     const base = new GdocBase(id)
     await base.fetchAndEnrichGdoc()
+    await upsertGdoc(knex, base)
 
     // Load its metadata and state so that subclass parsing & validation is also done.
     // This involves a second call to the DB and Google, which makes me sad, but it'll do for now.
@@ -105,13 +106,9 @@ export async function createGdocAndInsertIntoDb(
         base,
         GdocsContentSource.Gdocs
     )
-    // Save the enriched Gdoc to the database (including subclass-specific
-    // enrichments, cf. _enrichSubclassContent()). Otherwise subclass
-    // enrichments are not present on the Gdoc* subclass when loading from the
-    // DB (GdocsContentSource.Internal), since subclass enrichements are only
-    // done while fetching the live gdocs (GdocsContentSource.Gdocs) in
-    // loadFromGdocBase().
-    await upsertGdoc(knex, gdoc)
+
+    // 2024-03-12 Daniel: We used to save here before the knex refactor but I think that was redundant?
+    // await gdoc.save()
 
     return gdoc
 }

db/model/Gdoc/GdocHomepage.ts

@@ -5,7 +5,6 @@ import {
     OwidGdocHomepageInterface,
     OwidGdocMinimalPostInterface,
     OwidGdocType,
-    defaults,
 } from "@ourworldindata/utils"
 import { GdocBase } from "./GdocBase.js"
 import * as db from "../../db.js"
@@ -29,7 +28,7 @@ export class GdocHomepage
 
     static create(obj: OwidGdocBaseInterface): GdocHomepage {
         const gdoc = new GdocHomepage()
-        defaults(gdoc, obj) // see GdocAuthor.ts for rationale
+        Object.assign(gdoc, obj)
         return gdoc
     }
 

db/model/Gdoc/GdocPost.ts

@@ -12,7 +12,6 @@ import {
     OwidGdocMinimalPostInterface,
     OwidGdocBaseInterface,
     excludeNullish,
-    defaults,
 } from "@ourworldindata/utils"
 import { GDOCS_DETAILS_ON_DEMAND_ID } from "../../../settings/serverSettings.js"
 import {
@@ -38,7 +37,7 @@ export class GdocPost extends GdocBase implements OwidGdocPostInterface {
     }
     static create(obj: OwidGdocBaseInterface): GdocPost {
         const gdoc = new GdocPost()
-        defaults(gdoc, obj) // see GdocAuthor.ts for rationale
+        Object.assign(gdoc, obj)
         return gdoc
     }
     linkedDocuments: Record<string, OwidGdocMinimalPostInterface> = {}

packages/@ourworldindata/utils/src/Util.ts

@@ -7,7 +7,6 @@ import {
     compact,
     countBy,
     debounce,
-    defaults,
     difference,
     drop,
     dropRightWhile,
@@ -80,7 +79,6 @@ export {
     compact,
     countBy,
     debounce,
-    defaults,
     difference,
     drop,
     dropRightWhile,

packages/@ourworldindata/utils/src/index.ts

@@ -151,7 +151,6 @@ export {
     compact,
     countBy,
     debounce,
-    defaults,
     difference,
     drop,
     dropRightWhile,