Feature/535 Settlement Transfer Abort Impl

src/domain/settlement/index.js

@@ -81,6 +81,9 @@ module.exports = {
         return {
           id: settlement.settlementId,
           state: settlement.state,
+          reason: settlement.reason,
+          createdDate: settlement.createdDate,
+          changedDate: settlement.changedDate,
           settlementWindows: settlementWindowsList,
           participants
         }
@@ -94,6 +97,7 @@ module.exports = {
   },
 
   putById: SettlementModel.putById,
+  abortById: SettlementModel.abortById,
 
   getSettlementsByParams: async function (params, enums, options = {}) {
     // 7 filters - at least one should be used
@@ -188,15 +192,15 @@ module.exports = {
       // validate windows state
       const settlementWindows = await SettlementWindowModel.getByListOfIds(idList, enums.settlementWindowStates)
       if (settlementWindows.length && settlementWindows.length !== idList.length) {
-        let err = new Error('2001')
+        let err = new Error('Not all provided windows were found')
         throw err
       }
 
       for (let settlementWindow of settlementWindows) {
         let { state } = settlementWindow
         if (state !== enums.settlementWindowStates.CLOSED &&
             state !== enums.settlementWindowStates.ABORTED) {
-          let err = new Error('2001')
+          let err = new Error('At least one settlement window is not CLOSED/ABORTED')
           throw err
         }
       }
@@ -208,6 +212,9 @@ module.exports = {
       return {
         id: settlement.settlementId,
         state: settlement.state,
+        reason: settlement.reason,
+        createdDate: settlement.createdDate,
+        changedDate: settlement.changedDate,
         settlementWindows: settlementWindowsList,
         participants
       }

src/handlers/settlements/{id}.js

@@ -72,9 +72,15 @@ module.exports = {
      * responses: 200, 400, 401, 404, 415, default
      */
 
-  put: async function updateSettlementById (request, h) {
+  put: async function updateSettlementById (request) {
     const settlementId = request.params.id
     try {
+      const p = request.payload
+      if (p.participants && (p.state || p.reason || p.externalReference)) {
+        throw new Error('No other properties are allowed when participants is provided')
+      } else if ((p.state && !p.reason) || (!p.state && p.reason)) {
+        throw new Error('State and reason are mandatory')
+      }
       const Enums = {
         ledgerAccountTypes: await request.server.methods.enums('ledgerAccountTypes'),
         ledgerEntryTypes: await request.server.methods.enums('ledgerEntryTypes'),
@@ -84,7 +90,13 @@ module.exports = {
         transferParticipantRoleTypes: await request.server.methods.enums('transferParticipantRoleTypes'),
         transferStates: await request.server.methods.enums('transferStates')
       }
-      return await settlement.putById(settlementId, request.payload, Enums)
+      if (p.participants) {
+        return await settlement.putById(settlementId, request.payload, Enums)
+      } else if (p.state && p.state === Enums.settlementStates.ABORTED) {
+        return await settlement.abortById(settlementId, request.payload, Enums)
+      } else {
+        throw new Error('Invalid request payload input')
+      }
     } catch (e) {
       request.server.log('error', e)
       return Boom.badRequest(e)

src/interface/swagger.json

@@ -875,6 +875,18 @@
         "SettlementUpdatebySettlementIdPayload": {
             "type": "object",
             "properties": {
+                "state": {
+                    "type": "string",
+                    "enum": [
+                        "ABORTED"
+                    ]
+                },
+                "reason": {
+                    "type": "string"
+                },
+                "externalReference": {
+                    "type": "string"
+                },
                 "participants": {
                     "type": "array",
                     "items": {

src/lib/config.js

@@ -6,5 +6,5 @@ module.exports = {
   DATABASE_URI: RC.DATABASE_URI,
   TRANSFER_VALIDITY_SECONDS: RC.TRANSFER_VALIDITY_SECONDS,
   HUB_ID: RC.HUB_PARTICIPANT.ID,
-  HUB_NAME: RC.HUB_PARTICIPANT.NAME,
+  HUB_NAME: RC.HUB_PARTICIPANT.NAME
 }