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

refactor: the whole role and permission flow

Browse Source
This commit is contained in:
mahyargdz
2025-02-17 13:54:34 +03:30
parent ad673613d9
commit 763b6b49d9
42 changed files with 479 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/danak-services/danak-services.controller.ts
+12 -16
View File
@@ -8,10 +8,10 @@ import { DanakServicesSearchQueryDto } from "./DTO/danak-services-search-query.d
import { DanakServicesService } from "./providers/danak-services.service";
import { AuthGuards } from "../../common/decorators/auth-guard.decorator";
import { Pagination } from "../../common/decorators/pagination.decorator";
import { Roles } from "../../common/decorators/roles.decorator";
import { PermissionsDec } from "../../common/decorators/permission.decorator";
import { UserDec } from "../../common/decorators/user.decorator";
import { ParamDto } from "../../common/DTO/param.dto";
import { RoleEnum } from "../users/enums/role.enum";
import { PermissionEnum } from "../users/enums/permission.enum";
@Controller("danak-services")
@ApiTags("Danak-Services")
@@ -20,7 +20,7 @@ export class DanakServicesController {
//------------------------ service categories ------------------------
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "Create a new service category => admin route" })
@Post("categories")
createCategory(@Body() createDto: CreateCategoryDto) {
@@ -28,7 +28,7 @@ export class DanakServicesController {
}
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "Get all service categories => admin route" })
@Get("categories")
getCategories(@Query() queryDto: CategorySearchQueryDto) {
@@ -36,7 +36,7 @@ export class DanakServicesController {
}
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "Get all service categories => admin route" })
@Pagination()
@Get("categories/list")
@@ -45,7 +45,6 @@ export class DanakServicesController {
}
@AuthGuards()
@Roles(RoleEnum.USER, RoleEnum.ADMIN)
@ApiOperation({ summary: "Get all service categories user side" })
@Get("categories/public")
getCategoriesUserSide() {
@@ -53,7 +52,6 @@ export class DanakServicesController {
}
@AuthGuards()
@Roles(RoleEnum.USER, RoleEnum.ADMIN)
@ApiOperation({ summary: "get category services with category id" })
@Get("categories/:id/services")
getCategoryServices(@Param() paramDto: ParamDto) {
@@ -61,7 +59,7 @@ export class DanakServicesController {
}
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "toggle status of categories => admin route" })
@HttpCode(HttpStatus.OK)
@Post("categories/toggle-status/:id")
@@ -70,7 +68,7 @@ export class DanakServicesController {
}
//-------------------- service management --------------------------
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "create new danak services => admin route" })
@Post()
createService(@Body() createDto: CreateServiceDto) {
@@ -78,15 +76,15 @@ export class DanakServicesController {
}
@AuthGuards()
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "get all danak services ==> admin route" })
@Roles(RoleEnum.ADMIN)
@Get()
getServices(@Query() queryDto: DanakServicesSearchQueryDto) {
return this.danakServicesService.getServicesList(queryDto);
}
@AuthGuards()
@Roles(RoleEnum.ADMIN)
@PermissionsDec(PermissionEnum.SERVICES)
@ApiOperation({ summary: "toggle status of danak service => admin route" })
@HttpCode(HttpStatus.OK)
@Post("toggle-status/:id")
@@ -96,7 +94,6 @@ export class DanakServicesController {
@ApiOperation({ summary: "get services for user side" })
@AuthGuards()
@Roles(RoleEnum.USER)
@Get("suggested")
getDanakSuggestServices() {
return this.danakServicesService.getDanakSuggestServices();
@@ -104,14 +101,13 @@ export class DanakServicesController {
@ApiOperation({ summary: "get danak service by id" })
@AuthGuards()
@Roles(RoleEnum.USER, RoleEnum.ADMIN)
@Get(":id")
getDanakServiceById(@Param() paramDto: ParamDto, @UserDec("roles") userRole: RoleEnum[]) {
return this.danakServicesService.getDanakServiceByIdWithSubs(paramDto.id, userRole);
getDanakServiceById(@Param() paramDto: ParamDto, @UserDec("isAdmin") isAdmin: boolean) {
return this.danakServicesService.getDanakServiceByIdWithSubs(paramDto.id, isAdmin);
}
// @AuthGuards()
// @Roles(RoleEnum.USER)
//
// @ApiOperation({ summary: "get all user purchased danak services" })
// @Get("user-services")
// getUserServices(@UserDec() user: User) {
src/modules/danak-services/providers/danak-services.service.ts
+2 -4
View File
@@ -3,7 +3,6 @@ import { FindOptionsWhere, In, IsNull } from "typeorm";
import { ParamDto } from "../../../common/DTO/param.dto";
import { CategoryMessage, CommonMessage, ServiceMessage } from "../../../common/enums/message.enum";
import { RoleEnum } from "../../users/enums/role.enum";
import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { CategoryListSearchQueryDto, CategorySearchQueryDto } from "../DTO/category-search-query.dto";
import { CreateCategoryDto } from "../DTO/create-category.dto";
@@ -173,10 +172,9 @@ export class DanakServicesService {
}
/******************************************** */
async getDanakServiceByIdWithSubs(serviceId: string, roles: RoleEnum[]) {
const hasAccess = roles.includes(RoleEnum.ADMIN);
async getDanakServiceByIdWithSubs(serviceId: string, isAdmin: boolean) {
const danakService = await this.danakServicesRepository.findOne({
where: { id: serviceId, ...(hasAccess && { isActive: true, subscriptionPlans: { isActive: true } }) },
where: { id: serviceId, ...(isAdmin && { isActive: true, subscriptionPlans: { isActive: true } }) },
relations: { images: true, subscriptionPlans: true },
});
if (!danakService) throw new BadRequestException(ServiceMessage.SERVICE_NOT_FOUND_BY_ID);