Merge pull request #770 from DEFRA/feat/df-907-form-id

feat/df-907: Allows searching on form id

Author: jbarnsley10

src/api/forms/repositories/aggregation/form-metadata-aggregation.js

@@ -1,4 +1,5 @@
 import { FormStatus } from '@defra/forms-model'
+import { ObjectId } from 'mongodb'
 
 import { escapeRegExp } from '~/src/helpers/string-utils.js'
 
@@ -12,8 +13,12 @@ export function buildFilterConditions(options) {
   const conditions = {}
 
   if (title) {
-    const regex = new RegExp(escapeRegExp(title), 'i')
-    conditions.title = { $regex: regex }
+    if (ObjectId.isValid(title)) {
+      conditions._id = { $eq: new ObjectId(title) }
+    } else {
+      const regex = new RegExp(escapeRegExp(title), 'i')
+      conditions.title = { $regex: regex }
+    }
   }
 
   if (author) {

src/api/forms/repositories/aggregation/form-metadata-aggregation.test.js

@@ -1,4 +1,5 @@
 import { FormStatus } from '@defra/forms-model'
+import { ObjectId } from 'mongodb'
 
 import {
   addDateFieldStage,
@@ -36,6 +37,15 @@ describe('Form metadata aggregation', () => {
           title: { $regex: /Test Form/i }
         })
       })
+
+      it('should create object id filter if a form id is supplied', () => {
+        const result = buildFilterConditions({
+          title: '691db72966b1bdc98fa3e72a'
+        })
+        expect(result).toEqual({
+          _id: { $eq: new ObjectId('691db72966b1bdc98fa3e72a') }
+        })
+      })
     })
 
     describe('with author filter', () => {