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/tickets/providers/tickets.service.ts
+7 -11
View File
@@ -3,7 +3,6 @@ import { DataSource, Not } from "typeorm";
import { ParamDto } from "../../../common/DTO/param.dto";
import { CommonMessage, TicketMessageEnum, UserMessage } from "../../../common/enums/message.enum";
import { Role } from "../../users/entities/role.entity";
import { User } from "../../users/entities/user.entity";
import { RoleEnum } from "../../users/enums/role.enum";
import { UsersService } from "../../users/providers/users.service";
@@ -182,16 +181,15 @@ export class TicketsService {
//******************************** */
async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, role: Role) {
async createTicketMessage(ticketId: string, createDto: CreateTicketMessageDto, userId: string, roles: RoleEnum[]) {
const queryRunner = this.dataSource.createQueryRunner();
await queryRunner.connect();
await queryRunner.startTransaction();
try {
const userRole = role as unknown as RoleEnum;
let ticket: null | Ticket = null;
if (userRole === RoleEnum.ADMIN) {
if (roles.includes(RoleEnum.ADMIN)) {
ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId });
} else {
ticket = await queryRunner.manager.findOneBy(Ticket, { id: ticketId, user: { id: userId } });
@@ -206,7 +204,7 @@ export class TicketsService {
const ticketMessage = queryRunner.manager.create(TicketMessage, { ...createDto, author: user, ticket });
if (userRole === RoleEnum.ADMIN && ticket.status === TicketStatus.PENDING) {
if (roles.includes(RoleEnum.ADMIN) && ticket.status === TicketStatus.PENDING) {
ticket.status = TicketStatus.ANSWERED;
}
@@ -236,12 +234,11 @@ export class TicketsService {
//******************************** */
async getTicketMessages(ticketId: string, userId: string, role: Role) {
const userRole = role as unknown as RoleEnum;
async getTicketMessages(ticketId: string, userId: string, roles: RoleEnum[]) {
let ticket: null | Ticket = null;
//
if (userRole === RoleEnum.ADMIN) {
if (roles.includes(RoleEnum.ADMIN)) {
ticket = await this.ticketsRepository.findTicketById(ticketId);
} else {
ticket = await this.ticketsRepository.findTicketById(ticketId, userId);
@@ -257,11 +254,10 @@ export class TicketsService {
//******************************** */
async closeTicketByUser(ticketId: string, userId: string, role: Role) {
const userRole = role as unknown as RoleEnum;
async closeTicketByUser(ticketId: string, userId: string, roles: RoleEnum[]) {
let ticket: null | Ticket = null;
if (userRole === RoleEnum.ADMIN) {
if (roles.includes(RoleEnum.ADMIN)) {
ticket = await this.ticketsRepository.findTicketById(ticketId);
} else {
ticket = await this.ticketsRepository.findTicketById(ticketId, userId);