refactor: the whole role and permission flow

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
@@ -6,7 +6,6 @@ import { QueryRunner } from "typeorm";
import { InvoiceMessage } from "../../../common/enums/message.enum";
import { DiscountRepository } from "../../discounts/repositories/discount.repository";
import { SubscriptionPlan } from "../../subscriptions/entities/subscription.entity";
import { RoleEnum } from "../../users/enums/role.enum";
import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { ApplyDiscountDto } from "../DTO/apply-discount-invoice.dto";
import { CreateInvoiceDto } from "../DTO/create-invoice.dto";
@@ -126,10 +125,10 @@ export class InvoicesService {
}
//*********************************** */
async getInvoiceById(invoiceId: string, roles: RoleEnum[], userId: string) {
async getInvoiceById(invoiceId: string, isAdmin: boolean, userId: string) {
let invoice: Invoice | null;
if (roles.includes(RoleEnum.ADMIN)) {
if (isAdmin) {
invoice = await this.invoiceRepository.findOne({
where: { id: invoiceId },
relations: { items: { subscriptionPlan: true }, user: true },