Skip to content

Commit

Permalink
refactor: functions name (#793)
Browse files Browse the repository at this point in the history
* feat: delete ecosystem members

Signed-off-by: bhavanakarwade <[email protected]>

* wip: delete ecosystem

Signed-off-by: bhavanakarwade <[email protected]>

* fix: eslint issues

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved trimmedstring issue

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: interface type

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: get organization details function

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved conflicts

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: made description field required

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: function name

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: function name

Signed-off-by: bhavanakarwade <[email protected]>

* fix: function name changes

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>
  • Loading branch information
bhavanakarwade authored and KulkarniShashank committed Sep 12, 2024
1 parent ebb4cb9 commit f905cd2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions apps/api-gateway/src/ecosystem/ecosystem.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Response> {

await this.ecosystemService.deleteEcosystemAsMember(orgId, user);
await this.ecosystemService.deleteOrgFromEcosystem(orgId, user);

const finalResponse: IResponse = {
statusCode: HttpStatus.OK,
Expand Down
4 changes: 2 additions & 2 deletions apps/api-gateway/src/ecosystem/ecosystem.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<IEcosystemDataDeletionResults> {
async deleteOrgFromEcosystem(orgId: string, userDetails: user): Promise<IEcosystemDataDeletionResults> {
const payload = { orgId, userDetails };
return this.sendNats(this.serviceProxy, 'delete-ecosystems-as-member', payload);
return this.sendNats(this.serviceProxy, 'delete-org-from-ecosystem', payload);
}

}
6 changes: 3 additions & 3 deletions apps/ecosystem/src/ecosystem.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<IEcosystemDataDeletionResults> {
@MessagePattern({ cmd: 'delete-org-from-ecosystem' })
async deleteOrgFromEcosystem(payload: { orgId: string, userDetails: user}): Promise<IEcosystemDataDeletionResults> {
const { orgId, userDetails } = payload;
return this.ecosystemService.deleteEcosystemAsMember(orgId, userDetails);
return this.ecosystemService.deleteOrgFromEcosystem(orgId, userDetails);
}
}
2 changes: 1 addition & 1 deletion apps/ecosystem/src/ecosystem.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ export class EcosystemRepository {
}
}

async deleteEcosystemAsMember(orgId: string): Promise<IEcosystemDataDeletionResults> {
async deleteMemberOrgFromEcosystem(orgId: string): Promise<IEcosystemDataDeletionResults> {
try {
return await this.prisma.$transaction(async (prisma) => {
const deletedEcosystemUsers = await prisma.ecosystem_users.deleteMany({
Expand Down
4 changes: 2 additions & 2 deletions apps/ecosystem/src/ecosystem.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2075,7 +2075,7 @@ export class EcosystemService {
return userData;
}

async deleteEcosystemAsMember(
async deleteOrgFromEcosystem(
orgId: string,
userDetails: user
): Promise<IEcosystemDataDeletionResults> {
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit f905cd2

Please sign in to comment.