From 0300805e43a5f444c86723bde4d9a0daef65a13a Mon Sep 17 00:00:00 2001 From: Yannick1712 Date: Tue, 5 Oct 2021 15:30:01 +0200 Subject: [PATCH 1/5] Update userData: fix getManyNameChecks --- src/userData/userData.controller.ts | 4 ++-- src/userData/userData.service.ts | 36 +++++++++++++++-------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/userData/userData.controller.ts b/src/userData/userData.controller.ts index b013bf58ff..ec98ff8fbd 100644 --- a/src/userData/userData.controller.ts +++ b/src/userData/userData.controller.ts @@ -40,8 +40,8 @@ export class UserDataController { @ApiExcludeEndpoint() @UseGuards(AuthGuard(), new RoleGuard(UserRole.ADMIN)) getNameChecks( - @Query('startUserId') startUserId: number, - @Query('endUserId') endUserId: number, + @Query('startUserId') startUserId: string, + @Query('endUserId') endUserId: string, ): Promise { return this.userDataService.getManyCheckStatus(startUserId, endUserId); } diff --git a/src/userData/userData.service.ts b/src/userData/userData.service.ts index c3cf520a1f..86f8afbab5 100644 --- a/src/userData/userData.service.ts +++ b/src/userData/userData.service.ts @@ -94,25 +94,27 @@ export class UserDataService { return resultNameCheck.risks[0].categoryKey; } - async getManyCheckStatus(startUserDataId: number, endUserDataId: number): Promise { + async getManyCheckStatus(startUserDataId: string, endUserDataId: string): Promise { const userDataChecks: UserDataChecks[] = []; - for (let a = startUserDataId; a <= endUserDataId; a++) { + for (let a = Number.parseInt(startUserDataId); a <= Number.parseInt(endUserDataId); a++) { const userData = await this.userDataRepo.findOne({ where: { id: a }, relations: ['bankDatas'] }); - if (userData.bankDatas.length > 0) { - const customer = await this.getCustomer(a); - userDataChecks.push({ - userDataId: a.toString(), - customerId: customer.customer.id.toString(), - kycFileReference: userData.kycFile?.id.toString() ?? '', - nameCheckRisk: customer.checkResult.risks[0].categoryKey, - }); - } else { - userDataChecks.push({ - userDataId: a.toString(), - customerId: '', - kycFileReference: '', - nameCheckRisk: '', - }); + if (userData) { + if (userData.bankDatas.length > 0) { + const customer = await this.getCustomer(a); + userDataChecks.push({ + userDataId: a.toString(), + customerId: customer.customer.id.toString(), + kycFileReference: userData.kycFile?.id.toString() ?? '', + nameCheckRisk: customer.checkResult.risks[0].categoryKey, + }); + } else { + userDataChecks.push({ + userDataId: a.toString(), + customerId: '', + kycFileReference: '', + nameCheckRisk: '', + }); + } } } return userDataChecks; From ea2bad05985c4d1dd110fa84b15e28945c0e16a6 Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Tue, 5 Oct 2021 17:50:58 +0200 Subject: [PATCH 2/5] Add activationDate --- src/userData/userData.service.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/userData/userData.service.ts b/src/userData/userData.service.ts index 86f8afbab5..2f9bf64e87 100644 --- a/src/userData/userData.service.ts +++ b/src/userData/userData.service.ts @@ -11,6 +11,7 @@ export interface UserDataChecks { customerId?: string; kycFileReference?: string; nameCheckRisk: string; + activationDate: Date; } export interface CustomerDataDetailed { @@ -104,15 +105,22 @@ export class UserDataService { userDataChecks.push({ userDataId: a.toString(), customerId: customer.customer.id.toString(), - kycFileReference: userData.kycFile?.id.toString() ?? '', + kycFileReference: userData.kycFile?.id.toString() ?? null, nameCheckRisk: customer.checkResult.risks[0].categoryKey, + activationDate: new Date( + Number.parseInt(customer.customer.activationDate.year), + Number.parseInt(customer.customer.activationDate.month) - 1, + Number.parseInt(customer.customer.activationDate.day), + 2, + ), }); } else { userDataChecks.push({ userDataId: a.toString(), - customerId: '', - kycFileReference: '', - nameCheckRisk: '', + customerId: null, + kycFileReference: null, + nameCheckRisk: null, + activationDate: null, }); } } From e723d5cb09b092957d38e42c2a1dd90d4932c8c1 Mon Sep 17 00:00:00 2001 From: Kolibri1990 <66674482+Kolibri1990@users.noreply.github.com> Date: Tue, 5 Oct 2021 17:51:54 +0200 Subject: [PATCH 3/5] Change route nameCheck to kycData --- src/userData/userData.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/userData/userData.controller.ts b/src/userData/userData.controller.ts index ec98ff8fbd..6da84ba8a4 100644 --- a/src/userData/userData.controller.ts +++ b/src/userData/userData.controller.ts @@ -35,7 +35,7 @@ export class UserDataController { return this.userDataService.updateUserData(userData); } - @Get('nameCheck') + @Get('kycData') @ApiBearerAuth() @ApiExcludeEndpoint() @UseGuards(AuthGuard(), new RoleGuard(UserRole.ADMIN)) From 9285d0e0f7f5db5cfb1e511ca664c71ad92538b5 Mon Sep 17 00:00:00 2001 From: David May Date: Tue, 5 Oct 2021 18:05:47 +0200 Subject: [PATCH 4/5] Refactoring --- src/userData/userData.controller.ts | 2 +- src/userData/userData.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/userData/userData.controller.ts b/src/userData/userData.controller.ts index 6da84ba8a4..b8dca22acb 100644 --- a/src/userData/userData.controller.ts +++ b/src/userData/userData.controller.ts @@ -43,7 +43,7 @@ export class UserDataController { @Query('startUserId') startUserId: string, @Query('endUserId') endUserId: string, ): Promise { - return this.userDataService.getManyCheckStatus(startUserId, endUserId); + return this.userDataService.getManyCheckStatus(+startUserId, +endUserId); } @Get(':id') diff --git a/src/userData/userData.service.ts b/src/userData/userData.service.ts index 2f9bf64e87..e9cf0ab0ba 100644 --- a/src/userData/userData.service.ts +++ b/src/userData/userData.service.ts @@ -95,9 +95,9 @@ export class UserDataService { return resultNameCheck.risks[0].categoryKey; } - async getManyCheckStatus(startUserDataId: string, endUserDataId: string): Promise { + async getManyCheckStatus(startUserDataId: number, endUserDataId: number): Promise { const userDataChecks: UserDataChecks[] = []; - for (let a = Number.parseInt(startUserDataId); a <= Number.parseInt(endUserDataId); a++) { + for (let a = startUserDataId; a <= endUserDataId; a++) { const userData = await this.userDataRepo.findOne({ where: { id: a }, relations: ['bankDatas'] }); if (userData) { if (userData.bankDatas.length > 0) { From 12fc80d9ffb3473f888e26ed9261b0a3dd946d4a Mon Sep 17 00:00:00 2001 From: David May Date: Tue, 5 Oct 2021 18:08:48 +0200 Subject: [PATCH 5/5] Variable rename --- src/userData/userData.service.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/userData/userData.service.ts b/src/userData/userData.service.ts index e9cf0ab0ba..ef67961072 100644 --- a/src/userData/userData.service.ts +++ b/src/userData/userData.service.ts @@ -97,13 +97,13 @@ export class UserDataService { async getManyCheckStatus(startUserDataId: number, endUserDataId: number): Promise { const userDataChecks: UserDataChecks[] = []; - for (let a = startUserDataId; a <= endUserDataId; a++) { - const userData = await this.userDataRepo.findOne({ where: { id: a }, relations: ['bankDatas'] }); + for (let userDataId = startUserDataId; userDataId <= endUserDataId; userDataId++) { + const userData = await this.userDataRepo.findOne({ where: { id: userDataId }, relations: ['bankDatas'] }); if (userData) { if (userData.bankDatas.length > 0) { - const customer = await this.getCustomer(a); + const customer = await this.getCustomer(userDataId); userDataChecks.push({ - userDataId: a.toString(), + userDataId: userDataId.toString(), customerId: customer.customer.id.toString(), kycFileReference: userData.kycFile?.id.toString() ?? null, nameCheckRisk: customer.checkResult.risks[0].categoryKey, @@ -116,7 +116,7 @@ export class UserDataService { }); } else { userDataChecks.push({ - userDataId: a.toString(), + userDataId: userDataId.toString(), customerId: null, kycFileReference: null, nameCheckRisk: null,