@financial-times/cp-content-pipeline-schema 2.14.0 → 2.14.2

package/src/model/CapiResponse.ts

@@ -7,7 +7,7 @@ import type {
 import conceptIds from '@financial-times/n-concept-ids'
 import metadata from '@financial-times/n-display-metadata'
 import cloneDeep from 'clone-deep'
-import { OperationalError } from '@dotcom-reliability-kit/errors'
+import { BaseError, OperationalError } from '@dotcom-reliability-kit/errors'
 
 import type { QueryContext } from '..'
 import sortBy from 'lodash.sortby'
@@ -127,24 +127,28 @@ function flattenFormattedZodIssues(
 }
 
 function getContentType(
-  content: { type?: string; types: string[] },
+  content: BaselineContent,
   validate?: true
 ): LiteralUnionScalarValues<typeof ContentType>
 function getContentType(
-  content: { type?: string; types: string[] },
+  content: BaselineContent,
   validate: false
 ): LiteralUnionScalarValues<typeof ContentType> | string
-function getContentType(
-  content: { type?: string; types: string[] },
-  validate = true
-) {
+function getContentType(content: BaselineContent, validate = true) {
   const TYPE_REGEX = /https?:\/\/www.ft.com\/ontology\/content\//
   const useType =
     'type' in content && content.type ? content.type : content.types[0]
   const type = useType?.replace(TYPE_REGEX, '')
 
   if (validate && !validLiteralUnionValue(type, ContentType.values)) {
-    throw new Error('Content type is invalid: ' + useType)
+    // if we get a request for a content type we can't (and shouldn't)
+    // handle, such as Image, there's nothing else we can do, so throw
+    throw new BaseError({
+      message: `Content type is invalid: ${useType}`,
+      code: 'UNEXPECTED_CONTENT_TYPE',
+      type: useType,
+      id: content.id,
+    })
   }
 
   return type
@@ -156,6 +160,8 @@ const baselineContentSchema = z.object({
   types: z.array(z.string()),
 })
 
+type BaselineContent = z.infer<typeof baselineContentSchema>
+
 export class CapiResponse {
   constructor(
     private capiData: ContentTypeSchemas,

package/src/resolvers/core.ts

@@ -17,16 +17,25 @@ const resolvers = {
       try {
         return await context.dataSources.capi.getContent(args.uuid)
       } catch (error) {
-        if (
-          error instanceof BaseError &&
-          error.data.upstreamStatusCode === 404
-        ) {
-          throw new HttpError({
-            code: 'CONTENT_NOT_FOUND',
-            message: `Content ${args.uuid} not found in Content API`,
-            statusCode: 404,
-            relatesToSystems: ['up-ica'],
-          })
+        if (error instanceof BaseError) {
+          if (error.data.upstreamStatusCode === 404) {
+            throw new HttpError({
+              code: 'CONTENT_NOT_FOUND',
+              message: 'Content not found in Content API',
+              cause: error,
+              uuid: args.uuid,
+              statusCode: 404,
+              relatesToSystems: ['up-ica'],
+            })
+          }
+          if (error.code === 'UNEXPECTED_CONTENT_TYPE') {
+            throw new HttpError({
+              code: error.code,
+              cause: error,
+              message: `Requested a content type we don't handle`,
+              statusCode: 404,
+            })
+          }
         }
 
         throw error