@financial-times/cp-content-pipeline-schema 3.0.2 → 3.0.4

package/src/generated/index.ts

@@ -96,7 +96,7 @@ export type Article = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -169,7 +169,7 @@ export type Audio = Content & {
   /** An array of media objects containing the url, the duration, the filesize and the media type. */
   readonly media?: Maybe<ReadonlyArray<Maybe<Media>>>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -466,7 +466,7 @@ export type Content = {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -541,7 +541,7 @@ export type ContentPackage = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -1096,7 +1096,7 @@ export type LiveBlogPackage = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** The pinned article of this live blog package. */
@@ -1182,7 +1182,7 @@ export type LiveBlogPost = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -1420,7 +1420,7 @@ export type Placeholder = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -1783,7 +1783,7 @@ export type Video = Content & {
   /** An image object containing the url and the caption, to be displayed usually before the article content. */
   readonly mainImage?: Maybe<Image>;
   /** The number of milliseconds since the unix epoch the article was last changed, eg '1712140552443'. */
-  readonly modifiedTimestamp: Scalars['Float']['output'];
+  readonly modifiedTimestamp?: Maybe<Scalars['Float']['output']>;
   /** The party that originated the article, eg. 'FT'. */
   readonly originatingParty?: Maybe<Scalars['String']['output']>;
   /** A string ID used to trace content publishes through the pipeline, e.g. 'republish_tid_JNhUrBjdXo'. */
@@ -2152,7 +2152,7 @@ export type ArticleResolvers<ContextType = QueryContext, ParentType extends Reso
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2183,7 +2183,7 @@ export type AudioResolvers<ContextType = QueryContext, ParentType extends Resolv
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
   media: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Media']>>>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2342,7 +2342,7 @@ export type ContentResolvers<ContextType = QueryContext, ParentType extends Reso
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2373,7 +2373,7 @@ export type ContentPackageResolvers<ContextType = QueryContext, ParentType exten
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2698,7 +2698,7 @@ export type LiveBlogPackageResolvers<ContextType = QueryContext, ParentType exte
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   liveBlogPosts: Resolver<Maybe<ReadonlyArray<Maybe<ResolversTypes['Content']>>>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   pinnedPost: Resolver<Maybe<ResolversTypes['Content']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -2734,7 +2734,7 @@ export type LiveBlogPostResolvers<ContextType = QueryContext, ParentType extends
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   isPinned: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -2870,7 +2870,7 @@ export type PlaceholderResolvers<ContextType = QueryContext, ParentType extends
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -3085,7 +3085,7 @@ export type VideoResolvers<ContextType = QueryContext, ParentType extends Resolv
   id: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   instantAlertConcept: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   mainImage: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
-  modifiedTimestamp: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  modifiedTimestamp: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
   originatingParty: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishReference: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   publishedDate: Resolver<ResolversTypes['String'], ParentType, ContextType>;

package/src/model/CapiResponse.ts

@@ -263,11 +263,25 @@ export class CapiResponse {
   async authors(): Promise<Person[]> {
     const authors = this.annotations({ byPredicate: predicates.hasAuthor })
 
-    return Promise.all(
-      authors.map((author) =>
-        this.context.dataSources.capi.getPerson(author.uuid())
-      )
-    )
+    const getPerson = async (author: Concept) => {
+      try {
+        return await this.context.dataSources.capi.getPerson(author.uuid())
+      } catch (error) {
+        if (isError(error)) {
+          this.context.logger.warn({
+            event: 'RECOVERABLE_ERROR',
+            error: new OperationalError({
+              message: `Error fetching CAPI Person for author ${author.prefLabel()}`,
+              code: 'AUTHOR_PERSON_FETCH_ERROR',
+              cause: error,
+            }),
+          })
+        }
+        return Person.fromConcept(author, this.context)
+      }
+    }
+
+    return Promise.all(authors.map(getPerson))
   }
 
   async primaryAuthor(): Promise<Person | null> {
@@ -365,7 +379,9 @@ export class CapiResponse {
   }
 
   modifiedTimestamp() {
-    return new Date(this.capiData.lastModified).getTime()
+    return this.capiData.lastModified
+      ? new Date(this.capiData.lastModified).getTime()
+      : null
   }
 
   publishReference() {

package/src/model/Person.ts

@@ -7,6 +7,7 @@ import { CapiPerson } from './schemas/capi/internal-content'
 import flattenFormattedZodIssues from '../helpers/flatten-formatted-zod-errors'
 import { PersonHeadshotArgs } from '../generated'
 import { uuidFromUrl } from '../helpers/metadata'
+import { Concept } from './Concept'
 
 export class Person {
   #systemCode: string
@@ -39,6 +40,24 @@ export class Person {
     return new Person(data as CapiPerson, context)
   }
 
+  // The concepts returned in the annotations contain *most* of the fields
+  // returned by the Person API so we can use one to create a simple Person.
+  // Useful as a fallback if the Person API fails.
+  static fromConcept(concept: Concept, context: QueryContext): Person {
+    const personShim: CapiPerson = {
+      id: concept.id(),
+      apiUrl: concept.apiUrl(),
+      prefLabel: concept.prefLabel(),
+      types: concept.types(),
+      directType: concept.directType(),
+      // there's no labels equivalent in Concept but we don't use this field
+      // anyway
+      labels: [],
+    }
+
+    return new Person(personShim, context)
+  }
+
   constructor(private person: CapiPerson, private context: QueryContext) {
     this.#systemCode = context.systemCode ?? 'cp-content-pipeline'
   }

package/src/model/Topper.ts

@@ -11,6 +11,8 @@ import imageServiceUrl from '../helpers/imageService'
 import { LeadFlourish } from './LeadFlourish'
 import type { TopperWithHeadshotHeadshotArgs } from '../generated'
 import { predicates } from './Concept'
+import { OperationalError } from '@dotcom-reliability-kit/errors'
+import isError from '../helpers/isError'
 
 type TopperType =
   | 'DeepPortraitTopper'
@@ -346,7 +348,22 @@ export class Topper {
     }
 
     if (this.capiResponse.isOpinion()) {
-      return (await this.capiResponse.primaryAuthor())?.headshot(args) ?? null
+      try {
+        const primaryAuthor = await this.capiResponse.primaryAuthor()
+        return primaryAuthor?.headshot(args) ?? null
+      } catch (error) {
+        if (isError(error)) {
+          this.context.logger.warn({
+            event: 'RECOVERABLE_ERROR',
+            error: new OperationalError({
+              message: 'Error fetching CAPI Person for headshot URL for topper',
+              code: 'HEADSHOT_PERSON_FETCH_ERROR',
+              cause: error,
+            }),
+          })
+        }
+        return null
+      }
     }
 
     return null

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

@@ -195,7 +195,7 @@ export const baseMetadataSchema = z.object({
   publishedDate: z.string(),
   firstPublishedDate: z.string(),
   publishReference: z.string().optional(),
-  lastModified: z.string(),
+  lastModified: z.string().optional(),
   realtime: z.boolean(),
   editorialDesk: z.string().optional(),
   accessLevel: z