Bugfix/fix participant lookup to use currency (#230)

* updated to newly released version of event-sdk

* updated dependencies and version

* fix for accept header and content-type header versions being hardcoded

* updated participant lookup to validate against the participant and participant currency table to validate that the participant is active as well as their currency account

* updated the order the sql is run in, seems to give and issue during testing

package.json

@@ -2,7 +2,7 @@
   "name": "quoting-service",
   "description": "Quoting Service hosted by a scheme",
   "license": "Apache-2.0",
-  "version": "10.5.3",
+  "version": "10.5.4",
   "author": "ModusBox",
   "contributors": [
     "James Bush <james.bush@modusbox.com>",
@@ -62,7 +62,7 @@
     "@hapi/hapi": "19.1.1",
     "@mojaloop/central-services-error-handling": "10.4.1",
     "@mojaloop/central-services-logger": "10.4.0",
-    "@mojaloop/central-services-shared": "10.5.2",
+    "@mojaloop/central-services-shared": "10.5.3",
     "@mojaloop/event-sdk": "10.4.0",
     "@mojaloop/ml-number": "8.2.0",
     "@mojaloop/sdk-standard-components": "10.3.2",

src/data/database.js

@@ -344,12 +344,12 @@ class Database {
   async getParticipant (participantName, participantType, currencyId, ledgerAccountTypeId) {
     try {
       const rows = await this.queryBuilder('participant')
+        .innerJoin('participantCurrency AS pc', 'pc.participantId', 'participant.participantId')
         .where({ 'participant.name': participantName })
         .andWhere({ 'pc.currencyId': currencyId })
         .andWhere({ 'pc.ledgerAccountTypeId': ledgerAccountTypeId })
         .andWhere({ 'pc.isActive': true })
         .andWhere({ 'participant.isActive': true })
-        .innerJoin('participantCurrency AS pc', 'pc.participantId', 'participant.participantId')
         .select(
           'participant.*',
           'pc.participantCurrencyId',

test/unit/data/database.test.js

@@ -792,7 +792,7 @@ describe('/database', () => {
         const mockList = mockKnexBuilder(
           mockKnex,
           [{ participantId: 123 }],
-          ['where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'innerJoin', 'select']
+          ['innerJoin', 'where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'select']
         )
 
         // Act
@@ -801,7 +801,7 @@ describe('/database', () => {
         // Assert
         expect(result).toBe(123)
         expect(mockList[0]).toHaveBeenCalledWith('participant')
-        expect(mockList[1]).toHaveBeenCalledWith({ 'participant.name': participantName })
+        expect(mockList[1]).toHaveBeenCalledWith('participantCurrency AS pc', 'pc.participantId', 'participant.participantId')
         expect(mockList[2]).toHaveBeenCalledTimes(1)
       })
 
@@ -814,7 +814,7 @@ describe('/database', () => {
         mockKnexBuilder(
           mockKnex,
           undefined,
-          ['where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'innerJoin', 'select']
+          ['innerJoin', 'where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'select']
         )
 
         // Act
@@ -833,7 +833,7 @@ describe('/database', () => {
         mockKnexBuilder(
           mockKnex,
           undefined,
-          ['where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'innerJoin', 'select']
+          ['innerJoin', 'where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'select']
         )
 
         // Act
@@ -851,7 +851,7 @@ describe('/database', () => {
         mockKnexBuilder(
           mockKnex,
           [],
-          ['where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'innerJoin', 'select']
+          ['innerJoin', 'where', 'andWhere', 'andWhere', 'andWhere', 'andWhere', 'select']
         )
 
         // Act