danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change the role to roles and many to many

Browse Source
This commit is contained in:
mahyargdz
2025-02-16 16:58:51 +03:30
parent 9cdd7ef28e
commit ad673613d9
32 changed files with 264 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/danak-services/danak-services.controller.ts
+1 -1
View File
@@ -106,7 +106,7 @@ export class DanakServicesController {
@AuthGuards()
@Roles(RoleEnum.USER, RoleEnum.ADMIN)
@Get(":id")
getDanakServiceById(@Param() paramDto: ParamDto, @UserDec("role") userRole: RoleEnum) {
getDanakServiceById(@Param() paramDto: ParamDto, @UserDec("roles") userRole: RoleEnum[]) {
return this.danakServicesService.getDanakServiceByIdWithSubs(paramDto.id, userRole);
}
src/modules/danak-services/providers/danak-services.service.ts
+3 -2
View File
@@ -173,9 +173,10 @@ export class DanakServicesService {
}
/******************************************** */
async getDanakServiceByIdWithSubs(serviceId: string, role: RoleEnum) {
async getDanakServiceByIdWithSubs(serviceId: string, roles: RoleEnum[]) {
const hasAccess = roles.includes(RoleEnum.ADMIN);
const danakService = await this.danakServicesRepository.findOne({
where: { id: serviceId, ...(role !== RoleEnum.ADMIN && { isActive: true, subscriptionPlans: { isActive: true } }) },
where: { id: serviceId, ...(hasAccess && { isActive: true, subscriptionPlans: { isActive: true } }) },
relations: { images: true, subscriptionPlans: true },
});
if (!danakService) throw new BadRequestException(ServiceMessage.SERVICE_NOT_FOUND_BY_ID);