@financial-times/cp-content-pipeline-schema 1.3.0 → 1.3.1

package/src/model/Concept.test.ts

@@ -88,11 +88,9 @@ describe('Concept model', () => {
   })
 
   describe('headshot()', () => {
-    it('throws an error if the concept is not for an author', async () => {
+    it('returns null if the concept is not for an author', async () => {
       const model = new Concept(topic, context)
-      await expect(model.headshot()).rejects.toThrowError(
-        'Cannot request headshot for a non-Author concept'
-      )
+      expect(await model.headshot()).toEqual(null)
     })
 
     it('returns the headshot for an author', async () => {

package/src/model/Concept.ts

@@ -5,6 +5,7 @@ import imageServiceUrl from '../helpers/imageService'
 import isError from '../helpers/isError'
 import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
 import conceptIds from '@financial-times/n-concept-ids'
+import decorateHeadshotUrl, { UUID_REGEX } from '../helpers/decorateHeadshotUrl'
 
 const CAPI_ID_PREFIX = /^https?:\/\/(?:www|api)\.ft\.com\/things?\//
 const BASE_URL = 'https://www.ft.com/stream/'
@@ -165,26 +166,30 @@ export class Concept {
   }
 
   async headshot(args?: HeadshotArguments) {
-    if (!this.isAuthor()) {
-      throw new Error('Cannot request headshot for a non-Author concept')
-    }
+    const uuid = this.apiUrl().match(UUID_REGEX)?.[0]
+
+    if (!this.isAuthor() || !uuid) return null
 
     try {
-      const peopleData = await this.context.dataSources.capi.getPerson(
-        this.uuid()
-      )
-
-      if (!peopleData || !peopleData._imageUrl) return null
-
-      return imageServiceUrl({
-        url: peopleData._imageUrl,
-        systemCode: this.#systemCode,
-        width: args?.width || 150,
-        dpr: args?.dpr ?? undefined,
-      })
-    } catch (err) {
+      const person = await this.context.dataSources.capi.getPerson(uuid)
+      const url = decorateHeadshotUrl(person)
+
+      return url
+        ? imageServiceUrl({
+            url,
+            systemCode: this.#systemCode,
+            width: args?.width || 150,
+            dpr: args?.dpr ?? undefined,
+          })
+        : null
+    } catch (error) {
+      if (isError(error)) {
+        logRecoverableError({
+          logger: this.context.logger,
+          error,
+        })
+      }
       return null
-      //TODO: log operational error here
     }
   }
 }

package/src/model/Picture.ts

@@ -30,6 +30,9 @@ export class Picture {
     const images = this.images()
     const standard =
       images.find((image) => image.format() === 'standard-inline') ?? images[0]
+
+    // this assert will never fail, as a Picture model won't be constructed if
+    // the imageset is empty. it's here for Typescript's benefit
     assertDefined(
       standard,
       'Picture must contain at least one image to display'

package/src/model/Topper.ts

@@ -132,10 +132,6 @@ export class Topper {
   }
 
   backgroundColour(): TopperBackgroundColourValues {
-    if (this.capiResponse.isAlphaville()) {
-      return 'matisse'
-    }
-
     if (
       this.capiResponse.type() === 'ContentPackage' &&
       this.capiResponse.design()
@@ -158,6 +154,10 @@ export class Topper {
       return this.capiResponse.isContainedInPackage() ? 'wheat' : 'sky'
     }
 
+    if (this.capiResponse.isAlphaville()) {
+      return 'matisse'
+    }
+
     if (type === 'PodcastTopper') {
       return 'slate'
     }
@@ -254,11 +254,11 @@ export class Topper {
   }
 
   columnist() {
-    if (this.capiResponse.isColumn()) {
-      return this.capiResponse.getAuthors()[0] ?? null
-    }
+    const authors = this.capiResponse.getAuthors()
+    const isOpinionOrColumn =
+      this.type() === 'OpinionTopper' || this.capiResponse.isColumn()
 
-    return null
+    return isOpinionOrColumn && authors.length ? authors[0] : null
   }
 
   brandConcept() {
@@ -279,14 +279,28 @@ export class Topper {
     return this.capiResponse.design()
   }
 
-  headshot(args: HeadshotArguments) {
-    const headshot = this.capiResponse.mainImage()
-    if (!headshot) {
+  async headshot(args: HeadshotArguments) {
+    let headshotUrl: string | undefined
+
+    if (this.capiResponse.isPodcast()) {
+      headshotUrl = this.capiResponse.mainImage()?.url()
+    }
+
+    if (this.capiResponse.isOpinion()) {
+      const authors = this.capiResponse.getAuthors()
+      const headshotUrls: (string | null)[] = await Promise.all(
+        authors.map(async (author) => await author.headshot(args))
+      ).then((res) => res.filter(Boolean))
+
+      headshotUrl = headshotUrls[0] ?? undefined
+    }
+
+    if (!headshotUrl) {
       return null
     }
 
     return imageServiceUrl({
-      url: headshot.url(),
+      url: headshotUrl,
       systemCode: this.#systemCode,
       width: args.width ?? undefined,
       dpr: args.dpr ?? undefined,

package/src/model/schemas/capi/base-schema.ts

@@ -7,6 +7,7 @@ const Concept = z.object({
   prefLabel: z.string(),
   type: z.string().optional(),
   types: z.string().array(),
+  headshot: z.string().optional(),
 })
 
 export const Annotation = Concept.extend({

package/src/resolvers/content-tree/references/ImageSet.ts

@@ -14,7 +14,7 @@ export const ImageSet = {
           uuidFromUrl(embed.id) === uuidFromUrl(parent.reference.id)
       )
 
-    return imageSet && imageSet.members
+    return imageSet && imageSet.members && imageSet.members.length > 0
       ? new Picture(imageSet, isLiveBlog, context)
       : null
   },

package/src/resolvers/topper.ts

@@ -16,6 +16,7 @@ const resolvers = {
     backgroundColour: (topper) => topper.backgroundColour(),
     displayConcept: (topper) => topper.displayConcept(),
     followButtonVariant: (topper) => topper.followButtonVariant(),
+    genreConcept: (topper) => topper.genreConcept(),
   },
 
   TopperWithImages: {
@@ -38,9 +39,7 @@ const resolvers = {
   },
 
   OpinionTopper: {
-    async headshot(topper, args) {
-      return topper.columnist()?.headshot(args) || null
-    },
+    headshot: (topper, args) => topper.headshot(args),
     columnist: (topper) => topper.columnist(),
   },