Fix some type issues in backend.

guardian · Aug 19, 2020 · 1aa14d5 · 1aa14d5
1 parent 2b48768
commit 1aa14d5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/projects/backend/controllers/fronts.ts b/projects/backend/controllers/fronts.ts
@@ -4,7 +4,7 @@ import { getFront } from '../fronts'
 import { hasFailed } from '../utils/try'
 import { isPreview } from '../preview'
 import { IssuePublicationIdentifier } from '../common'
-import { decodeVersionOrPreview } from '../utils/issue'
+import { decodeVersionOrPreview, getEditionOrFallback } from '../utils/issue'
 
 export const frontController = (req: Request, res: Response) => {
     const frontId: string = req.params[0]
@@ -13,7 +13,7 @@ export const frontController = (req: Request, res: Response) => {
         req.params.version,
         isPreview,
     )
-    const edition = req.params.edition
+    const edition = getEditionOrFallback(req.params.edition)
     const [date, updater] = lastModified()
     console.log(`Request for ${req.url} fetching front ${frontId}`)
     const issue: IssuePublicationIdentifier = {

diff --git a/projects/backend/controllers/image.ts b/projects/backend/controllers/image.ts
@@ -1,8 +1,17 @@
 import { Request, Response } from 'express'
-import { imageSizes, ImageUse, imageUses } from '../../Apps/common/src/index'
+import {
+    imageSizes,
+    ImageUse,
+    imageUses,
+    ImageSize,
+} from '../../Apps/common/src/index'
 import { Image, ImageRole, imageRoles } from '../common'
 import { getImageURL } from '../image'
 
+const getSize = (size: string | undefined): ImageSize | undefined => {
+    return imageSizes.find(_ => _ == size)
+}
+
 const getUse = (use: string | undefined): ImageUse | undefined => {
     const imageUse = imageUses.find(_ => _ == use)
     return imageUse
@@ -19,20 +28,21 @@ const getUse = (use: string | undefined): ImageUse | undefined => {
  */
 export const imageController = (req: Request, res: Response) => {
     const source = req.params.source
-    const size = req.params.size
+    const size = getSize(req.params.size)
     const lastPathParam: string = req.params[0]
     const use = getUse(req.params.use) || 'full-size'
     const role: ImageRole =
         imageRoles.find(r => r === req.query.role) || 'inline'
     const img: Image = { source, path: lastPathParam, role }
 
-    if (!imageSizes.includes(size)) {
+    if (!size) {
         res.status(500)
         res.send('Invalid size')
+    } else {
+        const redirect = getImageURL(img, size, use)
+        console.log(
+            `Getting image redirect for ${source} ${size} ${lastPathParam} role : ${role} redirect: ${redirect}`,
+        )
+        res.redirect(redirect)
     }
-    const redirect = getImageURL(img, size, use)
-    console.log(
-        `Getting image redirect for ${source} ${size} ${lastPathParam} role : ${role} redirect: ${redirect}`,
-    )
-    res.redirect(redirect)
 }
diff --git a/projects/backend/controllers/issue.ts b/projects/backend/controllers/issue.ts
@@ -25,7 +25,7 @@ export const issueController = (req: Request, res: Response) => {
         req.params.version,
         isPreviewStage,
     )
-    const edition = req.params.edition
+    const edition = getEditionOrFallback(req.params.edition)
     const issue: IssuePublicationIdentifier = {
         issueDate,
         version,
@@ -121,7 +121,9 @@ export const getIssuesSummary = async (
 
 export const issuesSummaryController = (req: Request, res: Response) => {
     const issueEdition = req.params.edition
-    const pageSize = req.query.pageSize && parseInt(req.query.pageSize, 10)
+    const pageSize =
+        (req.query.pageSize && parseInt(req.query.pageSize.toString(), 10)) ||
+        undefined
     getIssuesSummary(issueEdition, isPreviewStage, pageSize)
         .then(data => {
             if (hasFailed(data)) {

diff --git a/projects/backend/jest-matchers.ts b/projects/backend/jest-matchers.ts
@@ -5,12 +5,14 @@ expect.extend({
         if (hasFailed(received)) {
             return {
                 pass: true,
-                message: `expected ${received} not to have failed, however it failed with ${received.error}`,
+                message: () =>
+                    `expected ${received} not to have failed, however it failed with ${received.error}`,
             }
         }
         return {
             pass: false,
-            message: `expected ${received} to have failed, however it passed`,
+            message: () =>
+                `expected ${received} to have failed, however it passed`,
         }
     },
 })