From f905cd2677cc3d824b2572adca3a15ce58d19cff Mon Sep 17 00:00:00 2001 From: bhavanakarwade <137506897+bhavanakarwade@users.noreply.github.com> Date: Thu, 20 Jun 2024 11:42:04 +0530 Subject: [PATCH] refactor: functions name (#793) * feat: delete ecosystem members Signed-off-by: bhavanakarwade * wip: delete ecosystem Signed-off-by: bhavanakarwade * fix: eslint issues Signed-off-by: bhavanakarwade * fix: resolved trimmedstring issue Signed-off-by: bhavanakarwade * refactor: interface type Signed-off-by: bhavanakarwade * refactor: get organization details function Signed-off-by: bhavanakarwade * fix: resolved conflicts Signed-off-by: bhavanakarwade * refactor: made description field required Signed-off-by: bhavanakarwade * refactor: function name Signed-off-by: bhavanakarwade * refactor: function name Signed-off-by: bhavanakarwade * fix: function name changes Signed-off-by: bhavanakarwade --------- Signed-off-by: bhavanakarwade Signed-off-by: KulkarniShashank --- apps/api-gateway/src/ecosystem/ecosystem.controller.ts | 8 ++++---- apps/api-gateway/src/ecosystem/ecosystem.service.ts | 4 ++-- apps/ecosystem/src/ecosystem.controller.ts | 6 +++--- apps/ecosystem/src/ecosystem.repository.ts | 2 +- apps/ecosystem/src/ecosystem.service.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/api-gateway/src/ecosystem/ecosystem.controller.ts b/apps/api-gateway/src/ecosystem/ecosystem.controller.ts index ec7211dc2..7fbfbd348 100644 --- a/apps/api-gateway/src/ecosystem/ecosystem.controller.ts +++ b/apps/api-gateway/src/ecosystem/ecosystem.controller.ts @@ -685,19 +685,19 @@ export class EcosystemController { return res.status(HttpStatus.OK).json(finalResponse); } - @Delete('/:orgId/ecosystems') - @ApiOperation({ summary: 'Delete ecosystems', description: 'Delete ecosystems by orgId' }) + @Delete('/:orgId/member-org') + @ApiOperation({ summary: 'Delete organization from ecosystem as a ecosystem member', description: 'Delete organization from ecosystem as a ecosystem meber' }) @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto }) @UseGuards(AuthGuard('jwt'), OrgRolesGuard) @Roles(OrgRoles.OWNER) @ApiBearerAuth() - async deleteEcosystemAsMember( + async deleteOrgFromEcosystem( @Param('orgId', new ParseUUIDPipe({exceptionFactory: (): Error => { throw new BadRequestException(ResponseMessages.organisation.error.invalidOrgId); }})) orgId: string, @Res() res: Response, @User() user: user ): Promise { - await this.ecosystemService.deleteEcosystemAsMember(orgId, user); + await this.ecosystemService.deleteOrgFromEcosystem(orgId, user); const finalResponse: IResponse = { statusCode: HttpStatus.OK, diff --git a/apps/api-gateway/src/ecosystem/ecosystem.service.ts b/apps/api-gateway/src/ecosystem/ecosystem.service.ts index 6b85a7871..7ef19d760 100644 --- a/apps/api-gateway/src/ecosystem/ecosystem.service.ts +++ b/apps/api-gateway/src/ecosystem/ecosystem.service.ts @@ -207,9 +207,9 @@ export class EcosystemService extends BaseService { return this.sendNatsMessage(this.serviceProxy, 'decline-endorsement-transaction', payload); } - async deleteEcosystemAsMember(orgId: string, userDetails: user): Promise { + async deleteOrgFromEcosystem(orgId: string, userDetails: user): Promise { const payload = { orgId, userDetails }; - return this.sendNats(this.serviceProxy, 'delete-ecosystems-as-member', payload); + return this.sendNats(this.serviceProxy, 'delete-org-from-ecosystem', payload); } } \ No newline at end of file diff --git a/apps/ecosystem/src/ecosystem.controller.ts b/apps/ecosystem/src/ecosystem.controller.ts index 3b1452ef7..d9d60b7ab 100644 --- a/apps/ecosystem/src/ecosystem.controller.ts +++ b/apps/ecosystem/src/ecosystem.controller.ts @@ -237,9 +237,9 @@ export class EcosystemController { return this.ecosystemService.declineEndorsementRequestByLead(payload.ecosystemId, payload.endorsementId); } - @MessagePattern({ cmd: 'delete-ecosystems-as-member' }) - async deleteEcosystemAsMember(payload: { orgId: string, userDetails: user}): Promise { + @MessagePattern({ cmd: 'delete-org-from-ecosystem' }) + async deleteOrgFromEcosystem(payload: { orgId: string, userDetails: user}): Promise { const { orgId, userDetails } = payload; - return this.ecosystemService.deleteEcosystemAsMember(orgId, userDetails); + return this.ecosystemService.deleteOrgFromEcosystem(orgId, userDetails); } } \ No newline at end of file diff --git a/apps/ecosystem/src/ecosystem.repository.ts b/apps/ecosystem/src/ecosystem.repository.ts index 59a001675..c63750b4d 100644 --- a/apps/ecosystem/src/ecosystem.repository.ts +++ b/apps/ecosystem/src/ecosystem.repository.ts @@ -1501,7 +1501,7 @@ export class EcosystemRepository { } } - async deleteEcosystemAsMember(orgId: string): Promise { + async deleteMemberOrgFromEcosystem(orgId: string): Promise { try { return await this.prisma.$transaction(async (prisma) => { const deletedEcosystemUsers = await prisma.ecosystem_users.deleteMany({ diff --git a/apps/ecosystem/src/ecosystem.service.ts b/apps/ecosystem/src/ecosystem.service.ts index 6c6661a05..b3b040083 100644 --- a/apps/ecosystem/src/ecosystem.service.ts +++ b/apps/ecosystem/src/ecosystem.service.ts @@ -2075,7 +2075,7 @@ export class EcosystemService { return userData; } - async deleteEcosystemAsMember( + async deleteOrgFromEcosystem( orgId: string, userDetails: user ): Promise { @@ -2129,7 +2129,7 @@ export class EcosystemService { let deleteEcosystems; if (getEcosystemMemberRoleOrgIds?.includes(orgId)) { - deleteEcosystems = await this.ecosystemRepository.deleteEcosystemAsMember(orgId); + deleteEcosystems = await this.ecosystemRepository.deleteMemberOrgFromEcosystem(orgId); await this.ecosystemRepository.deleteEcosystemInvitations(orgId); await this.sendMailToEcosystemMembers(getLeadEmailId, getOrgName?.['name'], getEcosystemDetails?.name); }