Fix DB transaction leaks. Update unit tests (#220)

- Fixed DB transaction/connection leaks
- Updated unit tests
- Bumped version

package.json

@@ -2,7 +2,7 @@
   "name": "quoting-service",
   "description": "Quoting Service hosted by a scheme",
   "license": "Apache-2.0",
-  "version": "10.3.1",
+  "version": "10.3.2",
   "author": "ModusBox",
   "contributors": [
     "James Bush <james.bush@modusbox.com>",
@@ -65,7 +65,7 @@
     "@mojaloop/central-services-shared": "10.2.1",
     "@mojaloop/event-sdk": "9.5.2",
     "@mojaloop/ml-number": "8.2.0",
-    "@mojaloop/sdk-standard-components": "10.2.4",
+    "@mojaloop/sdk-standard-components": "10.3.0",
     "axios": "0.19.2",
     "blipp": "4.0.1",
     "eslint-config-standard": "14.1.1",
@@ -88,7 +88,7 @@
     "jest-junit": "10.0.0",
     "npm-audit-resolver": "2.2.0",
     "npm-check-updates": "6.0.1",
-    "nyc": "15.0.1",
+    "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",
     "sinon": "9.0.2",

src/model/quotes.js

@@ -211,9 +211,6 @@ class QuotesModel {
       await this.validateQuoteRequest(fspiopSource, fspiopDestination, quoteRequest)
 
       if (!envConfig.simpleRoutingMode) {
-        // do everything in a db txn so we can rollback multiple operations if something goes wrong
-        txn = await this.db.newTransaction()
-
         // check if this is a resend or an erroneous duplicate
         const dupe = await this.checkDuplicateQuoteRequest(quoteRequest)
 
@@ -234,6 +231,9 @@ class QuotesModel {
             handledRuleEvents.quoteRequest, span)
         }
 
+        // do everything in a db txn so we can rollback multiple operations if something goes wrong
+        txn = await this.db.newTransaction()
+
         // todo: validation
 
         // if we get here we need to create a duplicate check row
@@ -475,9 +475,6 @@ class QuotesModel {
       // accumulate enum ids
       const refs = {}
       if (!envConfig.simpleRoutingMode) {
-        // do everything in a transaction so we can rollback multiple operations if something goes wrong
-        txn = await this.db.newTransaction()
-
         // check if this is a resend or an erroneous duplicate
         const dupe = await this.checkDuplicateQuoteResponse(quoteId, quoteUpdateRequest)
         this.writeLog(`Check duplicate for quoteId ${quoteId} update returned: ${util.inspect(dupe)}`)
@@ -495,6 +492,9 @@ class QuotesModel {
           return this.handleQuoteUpdateResend(headers, quoteId, quoteUpdateRequest, span)
         }
 
+        // do everything in a transaction so we can rollback multiple operations if something goes wrong
+        txn = await this.db.newTransaction()
+
         // todo: validation
 
         // create the quote response row in the db

test/unit/model/quotes.test.js

@@ -1397,9 +1397,9 @@ describe('QuotesModel', () => {
       try {
         await quotesModel.handleQuoteUpdate(mockData.headers, mockData.quoteId, mockData.quoteUpdate, mockSpan)
       } catch (err) {
-        expect(quotesModel.db.newTransaction.mock.calls.length).toBe(1)
+        expect(quotesModel.db.newTransaction.mock.calls.length).toBe(0)
         expect(quotesModel.checkDuplicateQuoteResponse).toBeCalledWith(mockData.quoteId, mockData.quoteUpdate)
-        expect(mockTransaction.rollback.mock.calls.length).toBe(1)
+        expect(mockTransaction.rollback.mock.calls.length).toBe(0)
         expect(mockSpan.error.mock.calls[0][0]).toEqual(err)
         expect(mockSpan.finish.mock.calls[0][0]).toEqual(err.message)
         expect(err instanceof ErrorHandler.Factory.FSPIOPError).toBeTruthy()
@@ -1415,7 +1415,7 @@ describe('QuotesModel', () => {
 
       const refs = await quotesModel.handleQuoteUpdate(mockData.headers, mockData.quoteId, mockData.quoteUpdate, mockSpan)
 
-      expect(quotesModel.db.newTransaction.mock.calls.length).toBe(1)
+      expect(quotesModel.db.newTransaction.mock.calls.length).toBe(0)
       expect(quotesModel.checkDuplicateQuoteResponse).toBeCalledWith(mockData.quoteId, mockData.quoteUpdate)
       const args = [mockData.headers, mockData.quoteId, mockData.quoteUpdate, mockSpan]
       expect(quotesModel.handleQuoteUpdateResend).toBeCalledWith(...args)
@@ -1575,8 +1575,8 @@ describe('QuotesModel', () => {
         .rejects
         .toHaveProperty('apiErrorCode.code', ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.code)
 
-      expect(quotesModel.db.newTransaction.mock.calls.length).toBe(1)
-      expect(mockTransaction.rollback.mock.calls.length).toBe(1)
+      expect(quotesModel.db.newTransaction.mock.calls.length).toBe(0)
+      expect(mockTransaction.rollback.mock.calls.length).toBe(0)
     })
   })
   describe('forwardQuoteUpdate', () => {