Add FDMR filter (#167)

DEFRA · Nov 10, 2023 · ddb956b · ddb956b
1 parent fe44a5c
commit ddb956b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/app/processing/get-completed-payment-requests-filter.js b/app/processing/get-completed-payment-requests-filter.js
@@ -1,5 +1,5 @@
 const db = require('../data')
-const { BPS, CS } = require('../constants/schemes')
+const { BPS, CS, FDMR } = require('../constants/schemes')
 
 const getCompletedPaymentRequestsFilter = (paymentRequest) => {
   const defaultFilter = {
@@ -16,6 +16,13 @@ const getCompletedPaymentRequestsFilter = (paymentRequest) => {
         frn: paymentRequest.frn,
         marketingYear: paymentRequest.marketingYear
       }
+    case FDMR:
+      return {
+        ...defaultFilter,
+        schemeId: paymentRequest.schemeId,
+        frn: paymentRequest.frn,
+        agreementNumber: paymentRequest.agreementNumber
+      }
     case CS:
       return {
         ...defaultFilter,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-processing",
-  "version": "2.52.47",
+  "version": "2.52.48",
   "description": "Payment Hub processing service",
   "homepage": "https://github.com/DEFRA/ffc-pay-processing",
   "main": "app/index.js",

diff --git a/test/unit/processing/get-completed-payment-request-filter.test.js b/test/unit/processing/get-completed-payment-request-filter.test.js
@@ -1,7 +1,7 @@
 jest.mock('../../../app/data')
 const db = require('../../../app/data')
 
-const { SFI, BPS, CS } = require('../../../app/constants/schemes')
+const { SFI, BPS, CS, FDMR } = require('../../../app/constants/schemes')
 
 const { getCompletedPaymentRequestsFilter } = require('../../../app/processing/get-completed-payment-requests-filter')
 
@@ -69,6 +69,31 @@ describe('get completed payment requests filter', () => {
     })
   })
 
+  test('should return FDMR filter if FDMR', () => {
+    paymentRequest.schemeId = FDMR
+    const filter = getCompletedPaymentRequestsFilter(paymentRequest)
+    expect(filter).toMatchObject({
+      paymentRequestNumber: { [db.Sequelize.Op.lt]: paymentRequest.paymentRequestNumber },
+      invalid: false,
+      schemeId: paymentRequest.schemeId,
+      frn: paymentRequest.frn,
+      agreementNumber: paymentRequest.agreementNumber
+    })
+  })
+
+  test('should return FDMR filter with all existing payment requests if manually injected payment and FDMR', () => {
+    paymentRequest.schemeId = FDMR
+    paymentRequest.paymentRequestNumber = 0
+    const filter = getCompletedPaymentRequestsFilter(paymentRequest)
+    expect(filter).toMatchObject({
+      paymentRequestNumber: { [db.Sequelize.Op.not]: null },
+      invalid: false,
+      schemeId: paymentRequest.schemeId,
+      frn: paymentRequest.frn,
+      agreementNumber: paymentRequest.agreementNumber
+    })
+  })
+
   test('should return CS filter if CS', () => {
     paymentRequest.schemeId = CS
     const filter = getCompletedPaymentRequestsFilter(paymentRequest)