From 23d16aa6f9428e953b89078ccbcf35e0a6120af5 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 14 May 2025 11:17:35 +0300 Subject: [PATCH 1/5] Add isUserMerchant flag into user info --- workers/loc.api/service.report.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workers/loc.api/service.report.js b/workers/loc.api/service.report.js index 78b16b42..d6171020 100644 --- a/workers/loc.api/service.report.js +++ b/workers/loc.api/service.report.js @@ -182,7 +182,8 @@ class ReportService extends Api { username, timezone, email, - id + id, + isUserMerchant } = await this._getUserInfo(args) if (!email) { @@ -195,7 +196,8 @@ class ReportService extends Api { email, id, isSubAccount: false, - _id: null // to have the same data structure as in framework mode + _id: null, // to have the same data structure as in framework mode + isUserMerchant: !!isUserMerchant } }, 'verifyUser', args, cb) } From 829fabde28dc8f5feb12ac904ba8bf2e1bd7b2ed Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 14 May 2025 11:19:00 +0300 Subject: [PATCH 2/5] Extend mocked user_info data --- test/helpers/mock-data.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/helpers/mock-data.js b/test/helpers/mock-data.js index d833c2d4..1511daac 100644 --- a/test/helpers/mock-data.js +++ b/test/helpers/mock-data.js @@ -67,7 +67,22 @@ module.exports = new Map([ null, null, null, - 'Kyiv' + 'Kyiv', + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + 0, + 0 ] ], [ From 75c8ea211ff7f1c4a6e60d2a5ef60e789d21dfc2 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 14 May 2025 11:20:20 +0300 Subject: [PATCH 3/5] Add test coverage for user isUserMerchant flag --- test/1-api.spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/1-api.spec.js b/test/1-api.spec.js index 00ef9516..7fc68770 100644 --- a/test/1-api.spec.js +++ b/test/1-api.spec.js @@ -91,6 +91,7 @@ describe('API', () => { assert.isString(res.body.result.email) assert.isNumber(res.body.result.id) assert.isBoolean(res.body.result.isSubAccount) + assert.isBoolean(res.body.result.isUserMerchant) assert.strictEqual(res.body.result.email, 'fake@email.fake') assert.propertyVal(res.body, 'id', 5) }) @@ -170,6 +171,7 @@ describe('API', () => { assert.isString(res.body.result.email) assert.isNumber(res.body.result.id) assert.isBoolean(res.body.result.isSubAccount) + assert.isBoolean(res.body.result.isUserMerchant) assert.strictEqual(res.body.result.email, 'fake@email.fake') assert.propertyVal(res.body, 'id', 5) }) From 5d1348a35deeead39964084be3b495de9e4c7d55 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 20 May 2025 13:39:01 +0300 Subject: [PATCH 4/5] Update bfx-api-node-models in package-lock --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b285da8..05826976 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1006,9 +1006,9 @@ } }, "node_modules/bfx-api-node-models": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bfx-api-node-models/-/bfx-api-node-models-2.0.1.tgz", - "integrity": "sha512-F/3Agyu/fkamphNJuP2B29HJk+HNRhkDQjWreJ7mueXNPgJEmtncptp+3qIOtLHZXwOmu643vPkqORElgAY8VQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bfx-api-node-models/-/bfx-api-node-models-2.1.0.tgz", + "integrity": "sha512-S4C6xS6x/Vlds+8HOJFm+hG+LUzk1xnlUomHvMCHLf/96/J+B1iP3NMMt2D22jryvEgezE8tFptgN81CZWgK9Q==", "license": "MIT", "dependencies": { "bfx-api-node-util": "^1.0.10", From f02ac99b60067a0fbcfe01a953de3eb3e1c7d36f Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Mon, 26 May 2025 08:53:37 +0300 Subject: [PATCH 5/5] Bump version up to 4.12.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05826976..649cbd13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bfx-report", - "version": "4.12.2", + "version": "4.12.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bfx-report", - "version": "4.12.2", + "version": "4.12.3", "license": "Apache-2.0", "dependencies": { "ajv": "8.6.3", diff --git a/package.json b/package.json index db8036c6..3959a3c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bfx-report", - "version": "4.12.2", + "version": "4.12.3", "description": "Reporting tool", "main": "worker.js", "license": "Apache-2.0",