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/tickets/providers/tickets.service.ts
+7 -8
View File
@@ -4,7 +4,6 @@ import { DataSource, Not } from "typeorm";
import { ParamDto } from "../../../common/DTO/param.dto";
import { CommonMessage, TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum";
import { User } from "../../users/entities/user.entity";
import { RoleEnum } from "../../users/enums/role.enum";
import { UsersService } from "../../users/providers/users.service";
import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { CreateTicketCategoryDto } from "../DTO/create-ticket-category.dto";
@@ -181,7 +180,7 @@ export class TicketsService {
//******************************** */
async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, roles: RoleEnum[]) {
async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, isAdmin: boolean) {
const queryRunner = this.dataSource.createQueryRunner();
await queryRunner.connect();
await queryRunner.startTransaction();
@@ -189,7 +188,7 @@ export class TicketsService {
try {
let ticket: null | Ticket = null;
if (roles.includes(RoleEnum.ADMIN)) {
if (isAdmin) {
ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId });
} else {
ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId, user: { id: userId } });
@@ -204,7 +203,7 @@ export class TicketsService {
const ticketMessage = queryRunner.manager.create(TicketMessage, { ...createDto, author: user, ticket });
if (roles.includes(RoleEnum.ADMIN) && ticket.status === TicketStatus.PENDING) {
if (isAdmin && ticket.status === TicketStatus.PENDING) {
ticket.status = TicketStatus.ANSWERED;
}
@@ -234,11 +233,11 @@ export class TicketsService {
//******************************** */
async getTicketMessages(ticketId: string, userId: string, roles: RoleEnum[]) {
async getTicketMessages(ticketId: string, userId: string, isAdmin: boolean) {
let ticket: null | Ticket = null;
//
if (roles.includes(RoleEnum.ADMIN)) {
if (isAdmin) {
ticket = await this.ticketsRepository.findTicketById(ticketId);
} else {
ticket = await this.ticketsRepository.findTicketById(ticketId, userId);
@@ -254,10 +253,10 @@ export class TicketsService {
//******************************** */
async closeTicketByUser(ticketId: string, userId: string, roles: RoleEnum[]) {
async closeTicketByUser(ticketId: string, userId: string, isAdmin: boolean) {
let ticket: null | Ticket = null;
if (roles.includes(RoleEnum.ADMIN)) {
if (isAdmin) {
ticket = await this.ticketsRepository.findTicketById(ticketId);
} else {
ticket = await this.ticketsRepository.findTicketById(ticketId, userId);