ffc-pay-schemes 1.1.2 → 1.1.4

package/README.md

@@ -53,7 +53,7 @@ const {
 - `getReportingDataFilter(schemeId)` returns the fields which should be added to any data filters applied in reporting checks, for a given `schemeId`.
 - `getSchemeBatchProperties(schemeId)` returns the batch processing properties for a given `schemeId`.
 - `getSchemeFromBatchFileName(fileName)` returns the supported scheme details based on the expected file mask matching the supplied `fileName`.
-- `getSchemeIdFromPillar(pillar)` returns the scheme ID for a given `pillar`.
+- `getSchemeIdFromPillar(pillar)` returns the scheme ID for a given `pillar`. Note the pillar match is case insensitive, i.e. `sfi26` and `Sfi26` will both match with `SFI26`.
 - `getSchemeIdFromSourceSystem(sourceSystem)` returns the scheme ID for a given `sourceSystem`.
 - `getSchemeIds()` returns all supported scheme IDs.
 - `getSchemeNameFromSchemeId(schemeId)` returns the scheme name for a given `schemeId`.

package/app/scheme-id/get-scheme-id-from-pillar.js

@@ -1,7 +1,9 @@
 const { getSchemes } = require('../scheme-properties/get-schemes')
 
 const getSchemeIdFromPillar = (pillar) => {
-  const matchingScheme = getSchemes().find((scheme) => scheme.pillar === pillar)
+  const matchingScheme = getSchemes().find((scheme) =>
+    String(scheme.pillar ?? '').toLowerCase() === String(pillar ?? '').toLowerCase()
+  )
   return matchingScheme?.schemeId
 }
 

package/app/scheme-properties/get-siti-agri-schemes.js

@@ -2,14 +2,28 @@ const pillars = require('../constants/pillars')
 const sitiAgriSchemeIds = require('../constants/siti-agri-schemes')
 const schemeNames = require('../constants/scheme-names')
 const sourceSystems = require('../constants/source-systems')
+const schemeIds = require('../constants/scheme-ids')
+
+const schemeKeyById = Object.entries(schemeIds).reduce((acc, [key, value]) => {
+  acc[value] = key
+  return acc
+}, {})
 
 const getSitiAgriSchemes = () =>
-  Object.keys(sitiAgriSchemeIds).map((schemeKey) => ({
-    schemeId: sitiAgriSchemeIds[schemeKey],
-    schemeName: schemeNames[schemeKey],
-    sourceSystem: sourceSystems[schemeKey],
-    pillar: pillars[schemeKey]
-  }))
+  sitiAgriSchemeIds.map((schemeId) => {
+    const schemeKey = schemeKeyById[schemeId]
+
+    if (!schemeKey) {
+      throw new Error(`No scheme metadata found for schemeId: ${schemeId}`)
+    }
+
+    return {
+      schemeId,
+      schemeName: schemeNames[schemeKey],
+      sourceSystem: sourceSystems[schemeKey],
+      pillar: pillars[schemeKey]
+    }
+  })
 
 module.exports = {
   getSitiAgriSchemes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-schemes",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Module for defining and providing details for the payment schemes supported by the Payment Hub.",
   "main": "index.js",
   "scripts": {

package/test/unit/scheme-id/get-scheme-id-from-pillar.test.js

@@ -23,6 +23,34 @@ describe('getSchemeIdFromPillar', () => {
     expect(getSchemeIdFromPillar('Example Pillar')).toBe(1)
   })
 
+  test('matches the pillar regardless of case', () => {
+    getSchemes.mockReturnValue([
+      {
+        schemeId: 2,
+        schemeName: 'Example Scheme',
+        sourceSystem: 'Example Source',
+        pillar: 'Example Pillar'
+      }
+    ])
+
+    expect(getSchemeIdFromPillar('example pillar')).toBe(2)
+    expect(getSchemeIdFromPillar('EXAMPLE PILLAR')).toBe(2)
+  })
+
+  test('treats nullish pillar values as empty strings when comparing', () => {
+    getSchemes.mockReturnValue([
+      {
+        schemeId: 3,
+        schemeName: 'Example Scheme',
+        sourceSystem: 'Example Source',
+        pillar: undefined
+      }
+    ])
+
+    expect(getSchemeIdFromPillar(undefined)).toBe(3)
+    expect(getSchemeIdFromPillar('')).toBe(3)
+  })
+
   test('returns undefined when the pillar is not found', () => {
     getSchemes.mockReturnValue([
       {

package/test/unit/scheme-properties/get-siti-agri-schemes.test.js

@@ -1,18 +1,42 @@
 const sitiAgriSchemeIds = require('../../../app/constants/siti-agri-schemes')
+const schemeIds = require('../../../app/constants/scheme-ids')
 const schemeNames = require('../../../app/constants/scheme-names')
 const sourceSystems = require('../../../app/constants/source-systems')
 const pillars = require('../../../app/constants/pillars')
 const { getSitiAgriSchemes } = require('../../../app/scheme-properties/get-siti-agri-schemes')
 
+const schemeKeyById = Object.entries(schemeIds).reduce((acc, [key, value]) => {
+  acc[value] = key
+  return acc
+}, {})
+
 describe('getSitiAgriSchemes', () => {
   test('returns one scheme object for each SITI Agri scheme id', () => {
-    const expected = Object.keys(sitiAgriSchemeIds).map((schemeKey) => ({
-      schemeId: sitiAgriSchemeIds[schemeKey],
-      schemeName: schemeNames[schemeKey],
-      sourceSystem: sourceSystems[schemeKey],
-      pillar: pillars[schemeKey]
-    }))
+    const expected = sitiAgriSchemeIds.map((schemeId) => {
+      const schemeKey = schemeKeyById[schemeId]
+
+      expect(schemeKey).toBeDefined()
+
+      return {
+        schemeId,
+        schemeName: schemeNames[schemeKey],
+        sourceSystem: sourceSystems[schemeKey],
+        pillar: pillars[schemeKey]
+      }
+    })
 
     expect(getSitiAgriSchemes()).toEqual(expected)
   })
+
+  test('returns the correct metadata for specific scheme (SFI23)', () => {
+    const schemes = getSitiAgriSchemes()
+    const sfi23 = schemes.find((scheme) => scheme.schemeId === schemeIds.SFI23)
+
+    expect(sfi23).toEqual({
+      schemeId: schemeIds.SFI23,
+      schemeName: schemeNames.SFI23,
+      sourceSystem: sourceSystems.SFI23,
+      pillar: pillars.SFI23
+    })
+  })
 })

package/test-output/cobertura-coverage.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="314" lines-covered="312" line-rate="0.9936" branches-valid="67" branches-covered="67" branch-rate="1" timestamp="1791818472377" complexity="0" version="0.1">
+<coverage lines-valid="321" lines-covered="320" line-rate="0.9968" branches-valid="73" branches-covered="72" branch-rate="0.9863" timestamp="1793200016011" complexity="0" version="0.1">
   <sources>
     <source>/home/samplackett/ffc-pay-schemes</source>
   </sources>
   <packages>
-    <package name="constants" line-rate="0.9354" branch-rate="1">
+    <package name="constants" line-rate="1" branch-rate="1">
       <classes>
-        <class name="batch-schemes.js" filename="app/constants/batch-schemes.js" line-rate="0" branch-rate="1">
-          <methods>
-          </methods>
-          <lines>
-            <line number="1" hits="0" branch="false"/>
-            <line number="3" hits="0" branch="false"/>
-          </lines>
-        </class>
         <class name="delivery-bodies.js" filename="app/constants/delivery-bodies.js" line-rate="1" branch-rate="1">
           <methods>
           </methods>
@@ -675,23 +667,24 @@
       <classes>
         <class name="get-scheme-id-from-pillar.js" filename="app/scheme-id/get-scheme-id-from-pillar.js" line-rate="1" branch-rate="1">
           <methods>
-            <method name="(anonymous_0)" hits="4" signature="()V">
+            <method name="(anonymous_0)" hits="8" signature="()V">
               <lines>
-                <line number="3" hits="4"/>
+                <line number="3" hits="8"/>
               </lines>
             </method>
-            <method name="(anonymous_1)" hits="2" signature="()V">
+            <method name="(anonymous_1)" hits="6" signature="()V">
               <lines>
-                <line number="4" hits="2"/>
+                <line number="4" hits="6"/>
               </lines>
             </method>
           </methods>
           <lines>
             <line number="1" hits="1" branch="false"/>
             <line number="3" hits="1" branch="false"/>
-            <line number="4" hits="4" branch="false"/>
-            <line number="5" hits="4" branch="false"/>
-            <line number="8" hits="1" branch="false"/>
+            <line number="4" hits="8" branch="false"/>
+            <line number="5" hits="6" branch="true" condition-coverage="100% (4/4)"/>
+            <line number="7" hits="8" branch="false"/>
+            <line number="10" hits="1" branch="false"/>
           </lines>
         </class>
         <class name="get-scheme-id-from-source-system.js" filename="app/scheme-id/get-scheme-id-from-source-system.js" line-rate="1" branch-rate="1">
@@ -804,7 +797,7 @@
         </class>
       </classes>
     </package>
-    <package name="scheme-properties" line-rate="1" branch-rate="1">
+    <package name="scheme-properties" line-rate="0.9777" branch-rate="0.9166">
       <classes>
         <class name="get-scheme-batch-properties.js" filename="app/scheme-properties/get-scheme-batch-properties.js" line-rate="1" branch-rate="1">
           <methods>
@@ -910,16 +903,21 @@
             <line number="14" hits="1" branch="false"/>
           </lines>
         </class>
-        <class name="get-siti-agri-schemes.js" filename="app/scheme-properties/get-siti-agri-schemes.js" line-rate="1" branch-rate="1">
+        <class name="get-siti-agri-schemes.js" filename="app/scheme-properties/get-siti-agri-schemes.js" line-rate="0.9333" branch-rate="0.5">
           <methods>
-            <method name="(anonymous_0)" hits="1" signature="()V">
+            <method name="(anonymous_0)" hits="18" signature="()V">
+              <lines>
+                <line number="7" hits="18"/>
+              </lines>
+            </method>
+            <method name="(anonymous_1)" hits="2" signature="()V">
               <lines>
-                <line number="6" hits="1"/>
+                <line number="12" hits="2"/>
               </lines>
             </method>
-            <method name="(anonymous_1)" hits="11" signature="()V">
+            <method name="(anonymous_2)" hits="22" signature="()V">
               <lines>
-                <line number="7" hits="11"/>
+                <line number="13" hits="22"/>
               </lines>
             </method>
           </methods>
@@ -928,9 +926,17 @@
             <line number="2" hits="1" branch="false"/>
             <line number="3" hits="1" branch="false"/>
             <line number="4" hits="1" branch="false"/>
-            <line number="6" hits="1" branch="false"/>
-            <line number="7" hits="11" branch="false"/>
-            <line number="14" hits="1" branch="false"/>
+            <line number="5" hits="1" branch="false"/>
+            <line number="7" hits="1" branch="false"/>
+            <line number="8" hits="18" branch="false"/>
+            <line number="9" hits="18" branch="false"/>
+            <line number="12" hits="1" branch="false"/>
+            <line number="13" hits="2" branch="false"/>
+            <line number="14" hits="22" branch="false"/>
+            <line number="16" hits="22" branch="true" condition-coverage="50% (1/2)"/>
+            <line number="17" hits="0" branch="false"/>
+            <line number="20" hits="22" branch="false"/>
+            <line number="28" hits="1" branch="false"/>
           </lines>
         </class>
       </classes>