refactor(wp): add parsePostWpApiSnapshot function

owid · Feb 19, 2024 · e93d1ba · e93d1ba
1 parent 35e8687
commit e93d1ba
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/db/model/Post.ts b/db/model/Post.ts
@@ -3,6 +3,7 @@ import {
     DbRawPost,
     DbEnrichedPost,
     parsePostRow,
+    parsePostWpApiSnapshot,
     FullPost,
     JsonError,
     CategoryWithEntries,
@@ -154,11 +155,12 @@ export const getPostsFromSnapshots = async (
     postTypes: string[] = [WP_PostType.Post, WP_PostType.Page],
     filterFunc?: FilterFnPostRestApi
 ): Promise<PostRestApi[]> => {
-    const rawPosts: DbRawPost[] = (
+    const rawPosts: Pick<DbRawPost, "wpApiSnapshot">[] = (
         await db.knexInstance().raw(
             `
-                SELECT * FROM ${postsTable}
-                WHERE status = "publish"
+                SELECT wpApiSnapshot FROM ${postsTable}
+                WHERE wpApiSnapshot IS NOT NULL
+                AND status = "publish"
                 AND type IN (?)
                 ORDER BY wpApiSnapshot->>'$.date' DESC;
             `,
@@ -167,9 +169,9 @@ export const getPostsFromSnapshots = async (
     )[0]
 
     const posts = rawPosts
-        .map(parsePostRow)
         .map((p) => p.wpApiSnapshot)
-        .filter((p) => p !== null) as PostRestApi[]
+        .filter((snapshot) => snapshot !== null)
+        .map((snapshot) => parsePostWpApiSnapshot(snapshot!))
 
     // Published pages excluded from public views
     const excludedSlugs = [BLOG_SLUG]

diff --git a/packages/@ourworldindata/types/src/dbTypes/Posts.ts b/packages/@ourworldindata/types/src/dbTypes/Posts.ts
@@ -66,6 +66,10 @@ export function parsePostArchieml(archieml: string): any {
     return JSON.parse(archieml)
 }
 
+export function parsePostWpApiSnapshot(wpApiSnapshot: string): PostRestApi {
+    return JSON.parse(wpApiSnapshot)
+}
+
 export function parsePostRow(postRow: DbRawPost): DbEnrichedPost {
     return {
         ...postRow,
@@ -78,7 +82,7 @@ export function parsePostRow(postRow: DbRawPost): DbEnrichedPost {
             ? JSON.parse(postRow.archieml_update_statistics)
             : null,
         wpApiSnapshot: postRow.wpApiSnapshot
-            ? JSON.parse(postRow.wpApiSnapshot)
+            ? parsePostWpApiSnapshot(postRow.wpApiSnapshot)
             : null,
     }
 }

diff --git a/packages/@ourworldindata/types/src/index.ts b/packages/@ourworldindata/types/src/index.ts
@@ -138,6 +138,7 @@ export {
     WP_ColumnStyle,
     WP_PostType,
     type PostRestApi,
+    type BlockGraphQlApi,
     type FilterFnPostRestApi,
     type FormattingOptions,
     SubNavId,
@@ -499,6 +500,7 @@ export {
     parsePostFormattingOptions,
     parsePostAuthors,
     parsePostRow,
+    parsePostWpApiSnapshot,
     serializePostRow,
     parsePostArchieml,
     snapshotIsPostRestApi,