Merge pull request #3811 from owid/larsyencken/add-author-pages-to-si…

…temap Add author pages to sitemap
owid · Aug 2, 2024 · 15b8fa5 · 15b8fa5
2 parents bacc2c3 + f02d01f
commit 15b8fa5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/baker/sitemap.ts b/baker/sitemap.ts
@@ -17,6 +17,7 @@ import { EXPLORERS_ROUTE_FOLDER } from "../explorer/ExplorerConstants.js"
 import { ExplorerProgram } from "../explorer/ExplorerProgram.js"
 import { getPostsFromSnapshots } from "../db/model/Post.js"
 import { calculateDataInsightIndexPageCount } from "../db/model/Gdoc/gdocUtils.js"
+import { getMinimalAuthors } from "../db/model/Gdoc/GdocAuthor.js"
 
 interface SitemapUrl {
     loc: string
@@ -74,6 +75,7 @@ export const makeSitemap = async (
         (postrow) => !alreadyPublishedViaGdocsSlugsSet.has(postrow.slug)
     )
     const gdocPosts = await db.getPublishedGdocPosts(knex)
+    const authorPages = await getMinimalAuthors(knex)
 
     const publishedDataInsights = await db.getPublishedDataInsights(knex)
     const dataInsightFeedPageCount = calculateDataInsightIndexPageCount(
@@ -140,6 +142,12 @@ export const makeSitemap = async (
             }))
         )
         .concat(explorers.flatMap(explorerToSitemapUrl))
+        .concat(
+            authorPages.map((a) => ({
+                loc: urljoin(BAKED_BASE_URL, "team", a.slug),
+                lastmod: dayjs(a.updatedAt).format("YYYY-MM-DD"),
+            }))
+        )
 
     const sitemap = `<?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">

diff --git a/db/model/Gdoc/GdocAuthor.ts b/db/model/Gdoc/GdocAuthor.ts
@@ -170,7 +170,9 @@ export async function getMinimalAuthors(
             SELECT
                 slug,
                 content->>'$.title' as name,
-                content->>'$."featured-image"' as featuredImage
+                content->>'$."featured-image"' as featuredImage,
+                -- updatedAt is often set to the unix epoch instead of null
+                COALESCE(NULLIF(updatedAt, '1970-01-01'), createdAt) updatedAt
             FROM posts_gdocs
             WHERE type = 'author'
             AND published = 1`

diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
@@ -911,7 +911,9 @@ export async function getMinimalAuthorsByNames(
            SELECT
                slug,
                content->>'$.title' AS name,
-               content->>'$."featured-image"' AS featuredImage
+               content->>'$."featured-image"' AS featuredImage,
+               -- updatedAt is often set to the unix epoch instead of null
+               COALESCE(NULLIF(updatedAt, '1970-01-01'), createdAt) updatedAt
            FROM posts_gdocs
            WHERE type = 'author'
            AND content->>'$.title' in (:names)

diff --git a/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts b/packages/@ourworldindata/types/src/gdocTypes/Gdoc.ts
@@ -32,6 +32,7 @@ export interface LinkedAuthor {
     name: string
     slug: string
     featuredImage: string | null
+    updatedAt: Date
 }
 
 // A minimal object containing metadata needed for rendering prominent links etc in the client