chore(DTFS2-6889): update durable functions package to v3 (#2887)

UK-Export-Finance · Mar 28, 2024 · 2f749a9 · 2f749a9
1 parent ef51d86
commit 2f749a9
Show file tree

Hide file tree

Showing 58 changed files with 732 additions and 449 deletions.
diff --git a/azure-functions/acbs-function/__mocks__/durable-functions.js b/azure-functions/acbs-function/__mocks__/durable-functions.js
@@ -1,9 +1,12 @@
+const actualDurableFunctions = jest.requireActual('durable-functions');
+
 const mockClient = {
   startNew: jest.fn(() => 'mockInstanceId'),
   createCheckStatusResponse: jest.fn(),
 };
 
 module.exports = {
+  ...actualDurableFunctions,
   getClient: jest.fn(() => mockClient),
 };
 

diff --git a/azure-functions/acbs-function/acbs-amend-facility-loan-record/function.json b/azure-functions/acbs-function/acbs-amend-facility-loan-record/function.json
diff --git a/azure-functions/acbs-function/acbs-amend-facility-loan-record/index.js b/azure-functions/acbs-function/acbs-amend-facility-loan-record/index.js
@@ -24,7 +24,7 @@ const df = require('durable-functions');
 const retryOptions = require('../helpers/retryOptions');
 const mappings = require('../mappings');
 
-module.exports = df.orchestrator(function* Facility(context) {
+df.app.orchestration('acbs-amend-facility-loan-record', function* Facility(context) {
   try {
     if (context.df.getInput()) {
       const { facilityId, facility, amendments, fmr } = context.df.getInput();

diff --git a/azure-functions/acbs-function/acbs-amend-facility-master-record/function.json b/azure-functions/acbs-function/acbs-amend-facility-master-record/function.json
diff --git a/azure-functions/acbs-function/acbs-amend-facility-master-record/index.js b/azure-functions/acbs-function/acbs-amend-facility-master-record/index.js
@@ -24,7 +24,7 @@ const df = require('durable-functions');
 const retryOptions = require('../helpers/retryOptions');
 const mappings = require('../mappings');
 
-module.exports = df.orchestrator(function* Facility(context) {
+df.app.orchestration('acbs-amend-facility-master-record', function* Facility(context) {
   try {
     if (context.df.getInput()) {
       const { deal, facilityId, fmr, etag, amendments } = context.df.getInput();

diff --git a/azure-functions/acbs-function/acbs-amend-facility/function.json b/azure-functions/acbs-function/acbs-amend-facility/function.json
diff --git a/azure-functions/acbs-function/acbs-amend-facility/index.js b/azure-functions/acbs-function/acbs-amend-facility/index.js
@@ -28,7 +28,7 @@ const { DEAL, FACILITY } = require('../constants');
 
 const acceptableFacilityStage = ['07'];
 
-module.exports = df.orchestrator(function* amendACBSFacility(context) {
+df.app.orchestration('acbs-amend-facility', function* amendACBSFacility(context) {
   try {
     const { amendment } = context.df.getInput();
     if (amendment) {

diff --git a/azure-functions/acbs-function/acbs-facility-bond/function.json b/azure-functions/acbs-function/acbs-facility-bond/function.json
diff --git a/azure-functions/acbs-function/acbs-facility-bond/index.js b/azure-functions/acbs-function/acbs-facility-bond/index.js
@@ -14,7 +14,7 @@ const mappings = require('../mappings');
 const CONSTANTS = require('../constants');
 const retryOptions = require('../helpers/retryOptions');
 
-module.exports = df.orchestrator(function* createACBSfacilityBond(context) {
+df.app.orchestration('acbs-facility-bond', function* createACBSfacilityBond(context) {
   try {
     const { deal, facility, dealAcbsData } = context.df.getInput();
 

diff --git a/azure-functions/acbs-function/acbs-facility-loan/function.json b/azure-functions/acbs-function/acbs-facility-loan/function.json
diff --git a/azure-functions/acbs-function/acbs-facility-loan/index.js b/azure-functions/acbs-function/acbs-facility-loan/index.js
@@ -14,7 +14,7 @@ const mappings = require('../mappings');
 const CONSTANTS = require('../constants');
 const retryOptions = require('../helpers/retryOptions');
 
-module.exports = df.orchestrator(function* createACBSfacilityBond(context) {
+df.app.orchestration('acbs-facility-loan', function* createACBSfacilityBond(context) {
   try {
     const { deal, facility, dealAcbsData } = context.df.getInput();
 

diff --git a/azure-functions/acbs-function/acbs-facility/function.json b/azure-functions/acbs-function/acbs-facility/function.json
diff --git a/azure-functions/acbs-function/acbs-facility/index.js b/azure-functions/acbs-function/acbs-facility/index.js
@@ -15,7 +15,7 @@ const mappings = require('../mappings');
 const CONSTANTS = require('../constants');
 const helpers = require('../mappings/facility/helpers');
 
-module.exports = df.orchestrator(function* createACBSfacility(context) {
+df.app.orchestration('acbs-facility', function* createACBSfacility(context) {
   const { deal, facility, dealAcbsData, acbsReference } = context.df.getInput();
   let facilityLoan;
   let facilityFee;

diff --git a/azure-functions/acbs-function/acbs-http/function.json b/azure-functions/acbs-function/acbs-http/function.json
diff --git a/azure-functions/acbs-function/acbs-http/index.api-test.js b/azure-functions/acbs-function/acbs-http/index.api-test.js
@@ -14,6 +14,6 @@ test('Http trigger should return known text', async () => {
 
   await httpFunction(context, request);
 
-  expect(df.mockClient.startNew).toHaveBeenCalledWith(request.params.functionName, undefined, request.body);
+  expect(df.mockClient.startNew).toHaveBeenCalledWith(request.params.functionName, { input: request.body });
   expect(df.mockClient.createCheckStatusResponse).toHaveBeenCalledWith(context.bindingData.req, 'mockInstanceId');
 });
diff --git a/azure-functions/acbs-function/acbs-http/index.js b/azure-functions/acbs-function/acbs-http/index.js
@@ -1,12 +1,19 @@
 const df = require('durable-functions');
+const { app } = require('@azure/functions');
 
 const acbsHttp = async (context, req) => {
   console.info('⚡️ Invoking ACBS DOF via Azure HTTP trigger');
 
   const client = df.getClient(context);
-  const instanceId = await client.startNew(req.params.functionName, undefined, req.body);
+  const instanceId = await client.startNew(req.params.functionName, { input: req.body });
 
   return client.createCheckStatusResponse(context.bindingData.req, instanceId);
 };
 
 module.exports = acbsHttp;
+
+app.http('acbs-http', {
+  route: 'orchestrators/{orchestratorName}',
+  extraInputs: [df.input.durableClient()],
+  handler: acbsHttp,
+});
diff --git a/azure-functions/acbs-function/acbs-issue-facility/function.json b/azure-functions/acbs-function/acbs-issue-facility/function.json
diff --git a/azure-functions/acbs-function/acbs-issue-facility/index.js b/azure-functions/acbs-function/acbs-issue-facility/index.js
@@ -14,7 +14,7 @@ const retryOptions = require('../helpers/retryOptions');
 const mappings = require('../mappings');
 const CONSTANTS = require('../constants');
 
-module.exports = df.orchestrator(function* updateACBSfacility(context) {
+df.app.orchestration('acbs-issue-facility', function* updateACBSfacility(context) {
   try {
     const { facilityId, facility, deal } = context.df.getInput();
 

diff --git a/azure-functions/acbs-function/acbs/function.json b/azure-functions/acbs-function/acbs/function.json
diff --git a/azure-functions/acbs-function/acbs/index.js b/azure-functions/acbs-function/acbs/index.js
@@ -14,7 +14,7 @@ const mappings = require('../mappings');
 const retryOptions = require('../helpers/retryOptions');
 const CONSTANTS = require('../constants');
 
-module.exports = df.orchestrator(function* HDeal(context) {
+df.app.orchestration('acbs', function* HDeal(context) {
   try {
     if (context.df.getInput()) {
       const { deal, bank } = context.df.getInput();

diff --git a/azure-functions/acbs-function/activity-create-code-value-transaction/function.json b/azure-functions/acbs-function/activity-create-code-value-transaction/function.json
diff --git a/azure-functions/acbs-function/activity-create-code-value-transaction/index.js b/azure-functions/acbs-function/activity-create-code-value-transaction/index.js
@@ -8,7 +8,7 @@
  *  * - run 'npm install durable-functions' from the wwwroot folder of your
  *   function app in Kudu
  */
-
+const df = require('durable-functions');
 const { getNowAsIsoString } = require('../helpers/date');
 const api = require('../api');
 const { isHttpErrorStatus } = require('../helpers/http');
@@ -23,7 +23,7 @@ const createCodeValueTransaction = async (context) => {
     const missingMandatory = findMissingMandatory(acbsCodeValueTransactionInput, mandatoryFields);
 
     if (missingMandatory.length) {
-      return Promise.resolve({ missingMandatory });
+      return { missingMandatory };
     }
 
     const submittedToACBS = getNowAsIsoString();
@@ -60,4 +60,6 @@ const createCodeValueTransaction = async (context) => {
   }
 };
 
-module.exports = createCodeValueTransaction;
+df.app.activity('create-code-value-transation', {
+  handler: createCodeValueTransaction,
+});
diff --git a/azure-functions/acbs-function/activity-create-deal-guarantee/function.json b/azure-functions/acbs-function/activity-create-deal-guarantee/function.json
diff --git a/azure-functions/acbs-function/activity-create-deal-guarantee/index.js b/azure-functions/acbs-function/activity-create-deal-guarantee/index.js
@@ -8,6 +8,7 @@
  *  * - run 'npm install durable-functions' from the wwwroot folder of your
  *   function app in Kudu
  */
+const df = require('durable-functions');
 const { getNowAsIsoString } = require('../helpers/date');
 const api = require('../api');
 const { isHttpErrorStatus } = require('../helpers/http');
@@ -22,7 +23,7 @@ const createDealGuarantee = async (context) => {
     const missingMandatory = findMissingMandatory(guarantee, mandatoryFields);
 
     if (missingMandatory.length) {
-      return Promise.resolve({ missingMandatory });
+      return { missingMandatory };
     }
 
     const submittedToACBS = getNowAsIsoString();
@@ -60,4 +61,6 @@ const createDealGuarantee = async (context) => {
   }
 };
 
-module.exports = createDealGuarantee;
+df.app.activity('create-deal-guarantee', {
+  handler: createDealGuarantee,
+});
diff --git a/azure-functions/acbs-function/activity-create-deal-investor/function.json b/azure-functions/acbs-function/activity-create-deal-investor/function.json
diff --git a/azure-functions/acbs-function/activity-create-deal-investor/index.js b/azure-functions/acbs-function/activity-create-deal-investor/index.js
@@ -8,6 +8,7 @@
  *  * - run 'npm install durable-functions' from the wwwroot folder of your
  *   function app in Kudu
  */
+const df = require('durable-functions');
 const { getNowAsIsoString } = require('../helpers/date');
 const api = require('../api');
 const { isHttpErrorStatus } = require('../helpers/http');
@@ -22,7 +23,7 @@ const createDealInvestor = async (context) => {
     const missingMandatory = findMissingMandatory(investor, mandatoryFields);
 
     if (missingMandatory.length) {
-      return Promise.resolve({ missingMandatory });
+      return { missingMandatory };
     }
 
     const submittedToACBS = getNowAsIsoString();
@@ -60,4 +61,6 @@ const createDealInvestor = async (context) => {
   }
 };
 
-module.exports = createDealInvestor;
+df.app.activity('create-deal-investor', {
+  handler: createDealInvestor,
+});
diff --git a/azure-functions/acbs-function/activity-create-deal/function.json b/azure-functions/acbs-function/activity-create-deal/function.json
diff --git a/azure-functions/acbs-function/activity-create-deal/index.js b/azure-functions/acbs-function/activity-create-deal/index.js
@@ -8,6 +8,7 @@
  *  * - run 'npm install durable-functions' from the wwwroot folder of your
  *   function app in Kudu
  */
+const df = require('durable-functions');
 const { getNowAsIsoString } = require('../helpers/date');
 const api = require('../api');
 const { isHttpErrorStatus } = require('../helpers/http');
@@ -30,7 +31,7 @@ const createDeal = async (context) => {
     const missingMandatory = findMissingMandatory(deal, mandatoryFields);
 
     if (missingMandatory.length) {
-      return Promise.resolve({ missingMandatory });
+      return { missingMandatory };
     }
 
     const submittedToACBS = getNowAsIsoString();
@@ -68,4 +69,6 @@ const createDeal = async (context) => {
   }
 };
 
-module.exports = createDeal;
+df.app.activity('create-deal', {
+  handler: createDeal,
+});
diff --git a/azure-functions/acbs-function/activity-create-facility-covenant/function.json b/azure-functions/acbs-function/activity-create-facility-covenant/function.json