@financial-times/cp-content-pipeline-schema 2.5.3 → 2.6.0

package/src/model/CapiResponse.test.ts

@@ -75,6 +75,15 @@ describe('CAPI response', () => {
     })
   })
 
+  describe('Publish timestamp', () => {
+    test('generates a timestamp from the published date', () => {
+      const article = cloneDeep(baseCapiObject)
+      const capiResponse = new CapiResponse(article, context)
+
+      expect(capiResponse.publishedTimestamp()).toEqual(1712052009935)
+    })
+  })
+
   describe('liveBlogPosts', () => {
     test('returns a resolved array of the articles contained sorted by most recently published', async () => {
       const liveBlogPackage = cloneDeep({

package/src/model/CapiResponse.ts

@@ -364,6 +364,9 @@ export class CapiResponse {
   publishedDate() {
     return this.capiData.publishedDate
   }
+  publishedTimestamp() {
+    return new Date(this.capiData.publishedDate).getTime()
+  }
   firstPublishedDate() {
     return this.capiData.firstPublishedDate || this.capiData.publishedDate
   }
@@ -673,9 +676,7 @@ export class CapiResponse {
       this.context.addSurrogateKeys(contains.map((article) => article.id()))
 
       const liveBlogPosts = contains.sort(
-        (a, b) =>
-          new Date(b.publishedDate()).getTime() -
-          new Date(a.publishedDate()).getTime()
+        (a, b) => b.publishedTimestamp() - a.publishedTimestamp()
       )
 
       return liveBlogPosts

package/src/resolvers/content-tree/Workarounds.ts

@@ -15,6 +15,11 @@ export interface AuthorLink extends ContentTree.Parent {
   children: ContentTree.Text[]
 }
 
+export interface Cite extends ContentTree.Node {
+  type: 'cite'
+  children: ContentTree.Phrasing[]
+}
+
 /*
 Raw Image nodes only exist because of old Wordpress articles,
 and so will not be added to content-tree.
@@ -39,6 +44,10 @@ export interface RawImage extends ContentTree.Node {
   width?: number
 }
 
+export interface ContentTreePullquote extends ContentTree.Pullquote {
+  children: ContentTree.ImageSet[]
+}
+
 /*
 Whilst we are converting the bodyXML to the content-tree, we still do not have a way of
 knowing if the article should display a mainImage or not.
@@ -190,3 +199,4 @@ export type AnyNode =
   | MainImageRaw
   | RawImage
   | AuthorLink
+  | Cite

package/src/resolvers/content-tree/tagMappings.ts

@@ -119,6 +119,10 @@ const commonTagMappings: TagMappings = {
     type: 'emphasis',
     children: childrenOfTypes(phrasingTypes, traverse(), 'emphasis', context),
   }),
+  'blockquote > cite': ($el, traverse, context) => ({
+    type: 'cite',
+    children: childrenOfTypes(phrasingTypes, traverse(), 'cite', context),
+  }),
   blockquote: ($el, traverse, context) => ({
     type: 'blockquote',
     children: childrenOfTypes(phrasingTypes, traverse(), 'blockquote', context),
@@ -160,11 +164,17 @@ const commonTagMappings: TagMappings = {
     level: 'label',
     children: everyChildIsType('text', traverse(), 'heading', context),
   }),
-  'pull-quote': ($el) => ({
-    type: 'pullquote',
-    text: $el.find('pull-quote-text').text(),
-    source: $el.find('pull-quote-source').text(),
-  }),
+  'pull-quote': ($el, traverse, context) => {
+    const children = traverse()
+    const image = findChildOftype('image-set', children, 'pullquote', context)
+
+    return {
+      type: 'pullquote',
+      text: $el.find('pull-quote-text').text(),
+      source: $el.find('pull-quote-source').text(),
+      children: image ? [image] : [],
+    }
+  },
   'body > ft-content[type="http://www.ft.com/ontology/content/Video"]': (
     $el
   ) => ({

package/src/resolvers/content.ts

@@ -34,6 +34,7 @@ const contentResolvers: ContentResolvers = {
   mainImage: (parent) => parent.mainImage(),
   originatingParty: (parent) => parent.originatingParty(),
   publishedDate: (parent) => parent.publishedDate(),
+  publishedTimestamp: (parent) => parent.publishedTimestamp(),
   standfirst: (parent) => parent.standfirst(),
   teaser: (parent) => parent.teaser(),
   title: (parent) => parent.title(),