refactor(db): use computed gdocs type column

owid · Apr 25, 2024 · f9f3bdd · f9f3bdd
1 parent c42927f
commit f9f3bdd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/db/db.ts b/db/db.ts
@@ -364,7 +364,7 @@ export const getPublishedGdocPosts = async (
         posts_gdocs g
     WHERE
         g.published = 1
-        AND g.content ->> '$.type' IN (:types)
+        AND g.type IN (:types)
         AND g.publishedAt <= NOW()
     ORDER BY g.publishedAt DESC`,
         {
@@ -410,7 +410,7 @@ export const getPublishedGdocPostsWithTags = async (
         gxt.tagId = t.id
     WHERE
         g.published = 1
-        AND g.content ->> '$.type' IN (:types)
+        AND g.type IN (:types)
         AND g.publishedAt <= NOW()
     GROUP BY g.id
     ORDER BY g.publishedAt DESC`,

diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
@@ -834,7 +834,7 @@ export async function getMinimalGdocPostsByIds(
                 published,
                 content ->> '$.subtitle' as subtitle,
                 content ->> '$.excerpt' as excerpt,
-                content ->> '$.type' as type,
+                type,
                 content ->> '$."featured-image"' as "featured-image"
             FROM posts_gdocs
             WHERE id in (:ids)`,

diff --git a/db/model/Gdoc/GdocFactory.ts b/db/model/Gdoc/GdocFactory.ts
@@ -199,7 +199,7 @@ export async function getAllMinimalGdocBaseObjects(
                 published,
                 content ->> '$.subtitle' as subtitle,
                 content ->> '$.excerpt' as excerpt,
-                content ->> '$.type' as type,
+                type,
                 content ->> '$."featured-image"' as "featured-image"
             FROM posts_gdocs
             WHERE published = 1
@@ -363,7 +363,7 @@ export async function getAndLoadPublishedDataInsights(
             SELECT *
             FROM posts_gdocs
             WHERE published = 1
-            AND content ->> '$.type' = ?
+            AND type = ?
             AND publishedAt <= NOW()
             ORDER BY publishedAt DESC
             ${limitOffsetClause}`,
@@ -413,7 +413,7 @@ export async function loadPublishedGdocAuthors(
             SELECT *
             FROM posts_gdocs
             WHERE published = 1
-            AND content ->> '$.type' IN (:types)`,
+            AND type IN (:types)`,
         {
             types: [OwidGdocType.Author],
         }

diff --git a/db/model/Gdoc/GdocHomepage.ts b/db/model/Gdoc/GdocHomepage.ts
@@ -45,7 +45,7 @@ export class GdocHomepage
             SELECT
                 id
             FROM posts_gdocs
-            WHERE content->>"$.type" = "${OwidGdocType.Homepage}"
+            WHERE type = "${OwidGdocType.Homepage}"
             AND published = TRUE
             AND id != ?`,
             [this.id]

diff --git a/db/model/Post.ts b/db/model/Post.ts
@@ -379,7 +379,7 @@ export const getWordpressPostReferencesByChartId = async (
                         slug from posts_gdocs pg
                     WHERE
                         pg.slug = p.slug
-                        AND pg.content ->> '$.type' <> 'fragment'
+                        AND pg.type != 'fragment'
                         AND pg.published = 1
                 )
             ORDER BY
@@ -563,7 +563,7 @@ export const getRelatedResearchAndWritingForVariable = async (
             AND cd.variableId = ?
             AND cd.property IN ('x', 'y') -- ignore cases where the indicator is size, color etc
             AND p.published = 1
-            AND p.content ->> '$.type' != 'fragment'`,
+            AND p.type != 'fragment'`,
         [variableId]
     )