ffc-pay-schemes 1.0.15 → 1.1.1

package/README.md

@@ -62,6 +62,7 @@ const {
 - `getSourceSystems()` returns all supported source systems.
 - `isFRPS(schemeId)` returns `true` if the scheme ID comes from FRPS, or `false` if not.
 - `isSitiAgri(schemeId)` returns `true` if the scheme ID comes from Siti Agri, or `false` if not.
+- `getSitiAgriSchemeIds()` returns all Siti Agri scheme IDs.
 - `isValidSchemeId(schemeId)` returns `true` if the scheme ID is recognised, or `false` if not, including converting the scheme ID to a numeric value first if required.
 - `schemeDoesNotRequirePPAs(schemeId)` returns `true` if Payment Hub does not support Post Payment Adjustments (PPAs) for a given `schemeId`; otherwise, it returns `false`.
 - `schemeProvidesAccountingValues(schemeId)` returns `true` if a given `schemeId` provides accounting values within its payment requests; otherwise, it returns `false`.
@@ -99,12 +100,57 @@ The following services are intended to be used with the ffc-pay-schemes package:
 - ffc-pay-injection
 - ffc-pay-processing
 - ffc-pay-request-editor
+- ffc-pay-responses
 - ffc-pay-submission
 - ffc-pay-tracking
 - ffc-pay-web
 
 In the event a new payment scheme is added to the package, all of the above services must be bumped to the latest package version to ensure that Payment Hub can process associated payments.
 
+## Scheme onboarding process
+
+See the linked PR for an example of how to onboard a payment scheme with batch files to the ffc-pay-schemes package:
+
+<https://github.com/DEFRA/ffc-pay-schemes/pull/16>
+
+The below breakdown details all steps required for a general scheme onboarding:
+
+- Add the scheme's pillar name to `app/constants/pillars.js` - this allows the pillar to be recognised for manual payments in `ffc-pay-injection`
+- Add the manual source name for the scheme to `app/constants/manual-sources.js` - this defines the `source` name to use in D365 journals for manual payments for the scheme, created by `ffc-pay-submission`
+- Add the scheme batch properties to `app/constants/scheme-batch-properties.js` - this defines the naming convention for D365 journals for the scheme, created by `ffc-pay-submission`
+- Add the new scheme ID to `app/constants/scheme-ids.js` - this is the glue that holds payment processing together
+- Add the scheme name to `app/constants/scheme-names.js` - this is how the scheme will be referred to in all frontend services, and in system logs
+- Add the default scheme properties to `app/constants/schemes.js` - this is the primary driver for scheme defaults as read by `ffc-pay-enrichment`
+- Add the source system to `app/constants/source-systems.js` - this is how the scheme will be recognised by `ffc-pay-enrichment`, and allow the scheme ID to be determined
+- Add the scheme ID to the correct function in `app/create-invoice-number/index.js` - this is how the D365 formatted invoice number will be calculated in `ffc-pay-enrichment`
+- Add the scheme ID to the mapping in `app/get-account-code-map/index.js` - this is how account codes will be assigned to invoice lines with different description codes in `ffc-pay-processing` - this is only usually called for PPAs, but for good practice it should be determined for all schemes
+
+For all schemes supporting batch file ingestion:
+
+- Add details of the file mask to `app/constants/file-masks.js` - this should be the file mask as read by `ffc-pay-batch-processor`, and allows the service to recognise the file to be processed.
+- Add the file mask to the default scheme properties in `app/constants/schemes.js` - this is referenced by `ffc-pay-batch-processor`
+- Add the position of the sequence number within the payment file to `app/constants/sequence-positions.js` - as used by `ffc-pay-batch-processor` to determine the correct sequence number of the file for processing
+
+> Remember that ffc-pay-gateway must still be updated with the inbound file path, server name, and other configuration. See <https://github.com/DEFRA/ffc-pay-gateway/pull/78> for an example.
+
+For all schemes delivered via FRPS:
+
+- Add the scheme ID to `app/constants/frps-schemes.js` - this allows services to understand if it has been delivered by FRPS, helping with numerous helpers for FRPS specific behaviours
+
+For all schemes delivered via Siti Agri:
+
+- Add the scheme ID to `app/constants/siti-agri-schemes.js` - this allows services to understand if it has been delivered by Siti Agri, helping with numerous helpers for Siti Agri specific behaviours
+
+For all schemes which do not support PPAs:
+
+- Add the scheme ID to `app/constants/schemes-not-requiring-ppas.js` - this tells `ffc-pay-processing` not to calculate PPAs
+
+For all schemes which provide accounting values:
+
+- Add the scheme ID to `app/constants/schemes-providing-account-values.js` - this tells `ffc-pay-enrichment` to mark the payment request as providing accounting values, and enables correct value reporting in Payment Hub reports
+
+Completing all of these steps as required should allow Payment Hub to support payments for a new payment scheme, assuming there are no specific behaviours that differ from a general payment scheme.
+
 ## Licence
 
 THIS INFORMATION IS LICENSED UNDER THE CONDITIONS OF THE OPEN GOVERNMENT
@@ -126,4 +172,4 @@ public sector to license the use and re-use of their information under a common
 open licence.
 
 It is designed to encourage use and re-use of information freely and flexibly,
-with only a few conditions.
+with only a few conditions.

package/app/constants/file-masks.js

@@ -10,5 +10,6 @@ module.exports = {
   SFI23: /^SITISFIA\d{4}_AP_\d*.dat$/,
   DELINKED: /^SITIDP\d{4}_AP_\d*.dat$/,
   SFI_EXPANDED: /^ESFIO\d{4}_AP_\d*.dat$/,
-  COHT_CAPITAL: /^SITICOHTC\d{4}_AP_\d*.dat$/
+  COHT_CAPITAL: /^SITICOHTC\d{4}_AP_\d*.dat$/,
+  SFI26: /^SITISFI26\d{4}_AP_\d*.dat$/
 }

package/app/constants/manual-sources.js

@@ -35,7 +35,8 @@ const {
   COHT_CAPITAL,
   COHT_REVENUE,
   FPTT,
-  WMP
+  WMP,
+  SFI26
 } = require('./pillars')
 
 module.exports = {
@@ -75,5 +76,6 @@ module.exports = {
   [COHT_CAPITAL]: 'PMAN_COHTC',
   [COHT_REVENUE]: 'PMAN_COHTR',
   [FPTT]: 'PMAN_FPTT',
-  [WMP]: 'PMAN_WMP'
+  [WMP]: 'PMAN_WMP',
+  [SFI26]: 'PMAN_SFI26'
 }

package/app/constants/pillars.js

@@ -36,5 +36,6 @@ module.exports = {
   COHT_REVENUE: 'COHTR',
   COHT_CAPITAL: 'COHTC',
   FPTT: 'FPTT',
-  WMP: 'WMP'
+  WMP: 'WMP',
+  SFI26: 'SFI26'
 }

package/app/constants/scheme-batch-properties.js

@@ -102,5 +102,11 @@ module.exports = Object.freeze([
     prefix: 'FFCFALS_WMP',
     suffix: ' (FALS_WMP)',
     source: 'FALS_WMP'
+  },
+  {
+    schemeId: schemeIds.SFI26,
+    prefix: 'FFCSITISFI26',
+    suffix: ' (SITISFI26)',
+    source: 'SITISFI26'
   }
 ])

package/app/constants/scheme-ids.js

@@ -15,5 +15,6 @@ module.exports = {
   COHT_REVENUE: 15,
   COHT_CAPITAL: 16,
   FPTT: 17,
-  WMP: 18
+  WMP: 18,
+  SFI26: 19
 }

package/app/constants/scheme-names.js

@@ -1,19 +1,20 @@
 module.exports = {
-  SFI: 'Sustainable Farming Incentive 22',
-  SFI_PILOT: 'Sustainable Farming Incentive Pilot',
+  SFI: 'SFI-22',
+  SFI_PILOT: 'SFI-P',
   LUMP_SUMS: 'Lump Sums',
-  VET_VISITS: 'Annual Health and Welfare Review',
-  CS: 'Countryside Stewardship',
-  BPS: 'Basic Payment Scheme',
-  MANUAL: 'Manual Injection',
-  ES: 'Environmental Stewardship',
-  FC: 'Forestry Commission',
-  IMPS: 'Internal Market Payment Scheme',
-  SFI23: 'Sustainable Farming Incentive 23',
+  VET_VISITS: 'Vet Visits (AHWR)',
+  CS: 'CS',
+  BPS: 'BPS',
+  MANUAL: 'Manual Payments (Injection)',
+  ES: 'Genesis (ES)',
+  FC: 'GLOS (FC)',
+  IMPS: 'IMPS',
+  SFI23: 'SFI-23',
   DELINKED: 'Delinked Payments',
-  SFI_EXPANDED: 'Sustainable Farming Incentive Expanded Offer',
-  COHT_REVENUE: 'Combined Offer Higher Tier (Revenue)',
-  COHT_CAPITAL: 'Combined Offer Higher Tier (Capital)',
-  FPTT: 'Farm Payments Technical Test',
-  WMP: 'Woodland Management Plan'
+  SFI_EXPANDED: 'SFI-EO',
+  COHT_REVENUE: 'CS-HT (Revenue)',
+  COHT_CAPITAL: 'CS-HT (Capital)',
+  FPTT: 'FPTT',
+  WMP: 'WMP',
+  SFI26: 'SFI-26'
 }

package/app/constants/schemes.js

@@ -136,5 +136,13 @@ module.exports = Object.freeze([
     pillar: pillars.WMP,
     deliveryBody: RP10,
     fundCode: DRD10
+  },
+  {
+    schemeId: schemeIds.SFI26,
+    sourceSystem: sourceSystems.SFI26,
+    pillar: pillars.SFI26,
+    deliveryBody: RP00,
+    fundCode: DRD10,
+    fileMask: fileMasks.SFI26
   }
 ])

package/app/constants/sequence-positions.js

@@ -9,5 +9,6 @@ module.exports = {
   SFI23: 8,
   DELINKED: 6,
   SFI_EXPANDED: 5,
-  COHT_CAPITAL: 9
+  COHT_CAPITAL: 9,
+  SFI26: 9
 }

package/app/constants/siti-agri-schemes.js

@@ -1,3 +1,3 @@
-const { SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL } = require('../constants/scheme-ids')
+const { SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL, SFI26 } = require('../constants/scheme-ids')
 
-module.exports = [SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL]
+module.exports = [SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL, SFI26]

package/app/constants/source-systems.js

@@ -15,5 +15,6 @@ module.exports = {
   COHT_REVENUE: 'COHTR',
   COHT_CAPITAL: 'COHTC',
   FPTT: 'FPTT',
-  WMP: 'WMP'
+  WMP: 'WMP',
+  SFI26: 'SFI26'
 }

package/app/create-invoice-number/index.js

@@ -1,5 +1,5 @@
 const { MANUAL: MANUAL_SOURCE } = require('../constants/source-systems')
-const { MANUAL, FC, FPTT, WMP, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL, SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, ES, IMPS } = require('../constants/scheme-ids')
+const { MANUAL, FC, FPTT, WMP, DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL, SFI, SFI_PILOT, LUMP_SUMS, CS, BPS, SFI23, ES, IMPS, SFI26 } = require('../constants/scheme-ids')
 const { createStandardSchemeInvoiceNumber } = require('./create-standard-scheme-invoice-number')
 const { createSitiAgriInvoiceNumber } = require('./create-siti-agri-invoice-number')
 const { createESInvoiceNumber } = require('./create-es-invoice-number')
@@ -12,7 +12,7 @@ const createInvoiceNumber = (paymentRequest) => {
     if (schemesWithAcceptedInvoiceNumbers.has(paymentRequest.schemeId) || paymentRequest?.sourceSystem === MANUAL_SOURCE) {
       return paymentRequest.invoiceNumber
     }
-    const standardSchemeInvoices = new Set([DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL])
+    const standardSchemeInvoices = new Set([DELINKED, SFI_EXPANDED, COHT_REVENUE, COHT_CAPITAL, SFI26])
     if (standardSchemeInvoices.has(paymentRequest.schemeId)) {
       return createStandardSchemeInvoiceNumber(paymentRequest)
     }

package/app/get-account-code-map/index.js

@@ -11,7 +11,8 @@ const {
   COHT_REVENUE,
   COHT_CAPITAL,
   FPTT,
-  WMP
+  WMP,
+  SFI26
 } = require('../constants/scheme-ids')
 
 const defaultMap = require('./default-map')
@@ -36,7 +37,8 @@ const schemeMap = new Map([
   [COHT_REVENUE, defaultMap],
   [COHT_CAPITAL, cohtcMap],
   [FPTT, sfiFrpsMap],
-  [WMP, sfiFrpsMap]
+  [WMP, sfiFrpsMap],
+  [SFI26, sfiFrpsMap]
 ])
 
 const getAccountCodeMap = (schemeId) => {

package/app/helpers/get-siti-agri-scheme-ids.js

@@ -0,0 +1,9 @@
+const sitiAgriSchemes = require('../constants/siti-agri-schemes')
+
+const getSitiAgriSchemeIds = () => {
+  return sitiAgriSchemes
+}
+
+module.exports = {
+  getSitiAgriSchemeIds
+}

package/index.js

@@ -15,6 +15,7 @@ const { getSchemeNameFromSchemeId } = require('./app/scheme-name/get-scheme-name
 const { getSchemeNames } = require('./app/scheme-name/get-scheme-names')
 const { getSchemeProperties } = require('./app/scheme-properties/get-scheme-properties')
 const { getSchemes } = require('./app/scheme-properties/get-schemes')
+const { getSitiAgriSchemeIds } = require('./app/helpers/get-siti-agri-scheme-ids')
 const { getSourceSystemFromSchemeId } = require('./app/source-system/get-source-system-from-scheme-id')
 const { getSourceSystems } = require('./app/source-system/get-source-systems')
 const { isFRPS } = require('./app/helpers/is-frps')
@@ -41,6 +42,7 @@ module.exports = {
   getSchemeNames,
   getSchemeProperties,
   getSchemes,
+  getSitiAgriSchemeIds,
   getSourceSystemFromSchemeId,
   getSourceSystems,
   isFRPS,

package/jest.config.js

@@ -2,7 +2,8 @@ module.exports = {
   collectCoverage: true,
   collectCoverageFrom: [
     '**/*.js',
-    '!**/*.test.js'
+    '!**/*.test.js',
+    '!index.js'
   ],
   coverageDirectory: 'test-output',
   coverageReporters: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-schemes",
-  "version": "1.0.15",
+  "version": "1.1.1",
   "description": "Module for defining and providing details for the payment schemes supported by the Payment Hub.",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,8 @@
   },
   "author": "Defra DDTS",
   "contributors": [
-    "Sam Plackett samuel.plackett@atos.ai"
+    "Sam Plackett samuel.plackett@atos.ai",
+    "Leigh Godson leigh.godson@atos.ai"
   ],
   "license": "OGL-UK-3.0",
   "bugs": {

package/sonar-project.properties

@@ -1,3 +1,3 @@
-sonar.javascript.exclusions=**/jest.config.js,**/jest.setup.js,**/__mocks__/**,**/node_modules/**,**/test/**,**/test-output/**,**/eslint.config.js,index.js
+sonar.exclusions=**/test/**,**/test-output/**,**/*.test.js,*snyk_report.html,*snyk_report.css,README.md,**/jest.config.js,**/jest.setup.js,**/eslint.config.js
+sonar.coverage.exclusions=index.js
 sonar.javascript.lcov.reportPaths=test-output/lcov.info
-sonar.exclusions=/test/**,**/*.test.js,*snyk_report.html,*snyk_report.css,README.md

package/test/unit/helpers/get-batch-sequence-from-file-name.test.js

@@ -4,10 +4,6 @@ jest.mock('../../../app/constants/scheme-ids', () => ({
   FPTT: 18
 }))
 
-jest.mock('../../../app/constants/sequence-positions', () => ({
-  SFI: 6
-}))
-
 const {
   getBatchSequenceFromFileName
 } = require('../../../app/helpers/get-batch-sequence-from-file-name')
@@ -16,7 +12,7 @@ const schemeIds = require('../../../app/constants/scheme-ids')
 
 describe('getBatchSequenceFromFileName', () => {
   test('returns the sequence using the scheme sequence position', () => {
-    const fileName = 'prefix12345678.csv'
+    const fileName = 'prefix012345678.csv'
 
     expect(
       getBatchSequenceFromFileName(schemeIds.SFI, fileName)

package/test/unit/helpers/get-siti-agri-scheme-ids.test.js

@@ -0,0 +1,8 @@
+const sitiAgriSchemes = require('../../../app/constants/siti-agri-schemes')
+const { getSitiAgriSchemeIds } = require('../../../app/helpers/get-siti-agri-scheme-ids')
+
+describe('getSitiAgriSchemeIds', () => {
+  test('returns the Siti Agri scheme IDs', () => {
+    expect(getSitiAgriSchemeIds()).toEqual(sitiAgriSchemes)
+  })
+})