diff --git a/audit-resolve.json b/audit-resolve.json index 3a242174..541b53e9 100644 --- a/audit-resolve.json +++ b/audit-resolve.json @@ -1,9 +1,8 @@ { "decisions": { "1500|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": { - "decision": "ignore", - "madeAt": 1613503685058, - "expiresAt": 1616095674581 + "decision": "postpone", + "madeAt": 1620065930143 } }, "rules": {}, diff --git a/docker/central-ledger/default.json b/docker/central-ledger/default.json index 8490d341..b53a972b 100644 --- a/docker/central-ledger/default.json +++ b/docker/central-ledger/default.json @@ -46,11 +46,6 @@ "API": { "DISABLED": false }, - "CRON": { - "DISABLED": false, - "TIMEXP": "*/10 * * * * *", - "TIMEZONE": "UTC" - }, "TIMEOUT": { "DISABLED": false, "TIMEXP": "*/15 * * * * *", @@ -89,6 +84,7 @@ "MAX_BYTE_SIZE": 10000000, "EXPIRES_IN_MS": 1000 }, + "API_DOC_ENDPOINTS_ENABLED": true, "KAFKA": { "TOPIC_TEMPLATES": { "PARTICIPANT_TOPIC_TEMPLATE": { @@ -170,6 +166,29 @@ "auto.offset.reset": "earliest" } } + }, + "GET": { + "config": { + "options": { + "mode": 2, + "batchSize": 1, + "pollFrequency": 10, + "recursiveTimeout": 100, + "messageCharset": "utf8", + "messageAsJSON": true, + "sync": true, + "consumeTimeout": 1000 + }, + "rdkafkaConf": { + "client.id": "cl-con-bulk-get", + "group.id": "cl-group-bulk-get", + "metadata.broker.list": "kafka:9092", + "socket.keepalive.enable": true + }, + "topicConf": { + "auto.offset.reset": "earliest" + } + } } }, "TRANSFER": { diff --git a/package-lock.json b/package-lock.json index c28a72ff..7ba90076 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "quoting-service", - "version": "12.0.0", + "version": "12.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 66d8dce6..0e1b4455 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "quoting-service", "description": "Quoting Service hosted by a scheme", "license": "Apache-2.0", - "version": "12.0.0", + "version": "12.0.1", "author": "ModusBox", "contributors": [ "Georgi Georgiev ", diff --git a/src/data/database.js b/src/data/database.js index 1bb32b1b..defec62d 100644 --- a/src/data/database.js +++ b/src/data/database.js @@ -470,13 +470,9 @@ class Database { refs.transferParticipantRoleTypeId = enumVals[3] refs.ledgerEntryTypeId = enumVals[4] - // todo: possibly push this subIdType lookup onto the array that gets awaited async... - // otherwise requests that have a subIdType will be a little slower due to the extra wait time - // TODO: this will not work as the partyIdentifierType table only caters for the 8 main partyTypes - // discuss adding a partyIdSubType database table to perform this lookup against if (party.partyIdInfo.partySubIdOrType) { - // TODO: review method signature - refs.partySubIdOrTypeId = await this.getPartyIdentifierType(party.partyIdInfo.partySubIdOrType) + // subIdOrTypeId value need not be one in the partyIdentifierType list as per the specification. + refs.partySubIdOrTypeId = party.partyIdInfo.partySubIdOrType } // insert a new quote party diff --git a/test/unit/data/database.test.js b/test/unit/data/database.test.js index 099d4c1a..ac371536 100644 --- a/test/unit/data/database.test.js +++ b/test/unit/data/database.test.js @@ -1132,7 +1132,6 @@ describe('/database', () => { } database.getPartyIdentifierType = jest.fn() .mockResolvedValueOnce('testPartyIdentifierTypeId') - .mockResolvedValueOnce('testPartySubIdOrTypeId') const mockList = mockKnexBuilder( mockKnex, ['12345'], @@ -1143,7 +1142,7 @@ describe('/database', () => { partyTypeId: 'testPartyTypeId', partyIdentifierTypeId: 'testPartyIdentifierTypeId', partyIdentifierValue: 'testPartyIdentifier', - partySubIdOrTypeId: 'testPartySubIdOrTypeId', + partySubIdOrTypeId: 'testSubId', fspId: 'payeeFsp', participantId: 'testParticipantId', merchantClassificationCode: '0',