law-common 1.2.58-beta.9 → 2.1.0

package/dist/src/api/index.d.ts

@@ -52,3 +52,9 @@ export * from "./interface/permission.entity.api";
 export * from "./interface/role.permission.mapping.create.dto.interface";
 export * from "./interface/role.permission.mapping.entity.api";
 export * from "./interface/role.permission.mapping.update.dto.interface";
+export * from "./interface/role.permission.mapping.response";
+export * from "./interface/role.permission.mapping.delete.dto.interface";
+export * from "./interface/billing.transaction.create.dto.interface";
+export * from "./interface/billing.transaction.update.dto.interface";
+export * from "./interface/billing.transaction.entity.response";
+export * from "./interface/billing.flow.update.dto";

package/dist/src/api/index.js

@@ -68,3 +68,9 @@ __exportStar(require("./interface/permission.entity.api"), exports);
 __exportStar(require("./interface/role.permission.mapping.create.dto.interface"), exports);
 __exportStar(require("./interface/role.permission.mapping.entity.api"), exports);
 __exportStar(require("./interface/role.permission.mapping.update.dto.interface"), exports);
+__exportStar(require("./interface/role.permission.mapping.response"), exports);
+__exportStar(require("./interface/role.permission.mapping.delete.dto.interface"), exports);
+__exportStar(require("./interface/billing.transaction.create.dto.interface"), exports);
+__exportStar(require("./interface/billing.transaction.update.dto.interface"), exports);
+__exportStar(require("./interface/billing.transaction.entity.response"), exports);
+__exportStar(require("./interface/billing.flow.update.dto"), exports);

package/dist/src/api/interface/billing.create.dto.interface.d.ts

@@ -6,6 +6,7 @@ export interface IBillingCreateDto {
     totalAmount: number;
     totalMinutes: number;
     invoiceNumber?: number;
+    writeOffAmount?: number;
     timesheets: IBillingTimesheetsDto;
 }
 export interface IBillingTimesheetUnchagedDto {

package/dist/src/api/interface/billing.entity.response.d.ts

@@ -1,4 +1,4 @@
-import { IAuditColumnEntity, IBillingTimesheetDetail, PaymentStatusEnum, StatusEnum } from "../../entities";
+import { IAuditColumnEntity, IBillingTimesheetDetail, PaymentStatusEnum, BillingStatusEnum } from "../../entities";
 import { IBillingApiEntity } from "./billing.entity.api";
 import { IBillingTimesheetApiEntity } from "./billing.timesheet.entity.api";
 export interface IBillingEntityResponse extends IAuditColumnEntity {
@@ -11,7 +11,7 @@ export interface IBillingEntityResponse extends IAuditColumnEntity {
     invoiceNumber?: number;
     paymentStatus: PaymentStatusEnum;
     billingTimesheets: IBillingTimesheetDetail[];
-    status?: StatusEnum;
+    status?: BillingStatusEnum;
     writeoffAmount?: number;
 }
 export type IBillingEntityGet = {
@@ -19,6 +19,23 @@ export type IBillingEntityGet = {
     billingTimesheets: IBillingTimesheetApiEntity[];
 };
 export type IBillingEntityUpdateGet = {
+    id: number;
+    startDate: string;
+    endDate: string;
+    projectId: number;
+    totalAmount: number;
+    totalMinutes: number;
+    paymentStatus: PaymentStatusEnum;
+    status: BillingStatusEnum;
+    invoiceNumber?: number;
+    writeoffAmount: number;
+    totalAmountPaid: number;
+    tdsAmount: number;
+    creditNoteAmount: number;
+    createdOn: string;
+    updatedOn: string;
+    createdBy: number;
+    updatedBy: number;
     timesheets: IBillingTimesheetApiEntity[];
 };
 export type IBillingEntityGetArray = IBillingEntityGet[];

package/dist/src/api/interface/billing.flow.update.dto.d.ts

@@ -0,0 +1,4 @@
+import { BillingActionsEnum } from "../../entities";
+export interface IBillingFlowUpdateDto {
+    action: BillingActionsEnum;
+}

package/dist/src/api/interface/billing.flow.update.dto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/billing.transaction.create.dto.interface.d.ts

@@ -0,0 +1,3 @@
+import { IBillingTransactionEntity, IEntityCreateDto } from "../../entities";
+export interface IBillingTransactionCreateDto extends IEntityCreateDto<IBillingTransactionEntity> {
+}

package/dist/src/api/interface/billing.transaction.create.dto.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/billing.transaction.entity.response.d.ts

@@ -0,0 +1,8 @@
+import { IApiEntity, IBillingTransactionEntity } from "../../entities";
+import { IBillingApiEntity } from "./billing.entity.api";
+export type IBillingTransactionApiEntity = IApiEntity<IBillingTransactionEntity>;
+export type IBillingTransactionApiEntityArray = IBillingTransactionApiEntity[];
+export type IBillingTransactionEntityGet = {
+    billingTransaction: IBillingTransactionApiEntity;
+    billing: IBillingApiEntity;
+};

package/dist/src/api/interface/billing.transaction.entity.response.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/billing.transaction.update.dto.interface.d.ts

@@ -0,0 +1,3 @@
+import { IBillingTransactionEntity, IEntityUpdateDto } from "../../entities";
+export interface IBillingTransactionUpdateDto extends IEntityUpdateDto<IBillingTransactionEntity> {
+}

package/dist/src/api/interface/billing.transaction.update.dto.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/billing.update.dto.interface.d.ts

@@ -1,4 +1,4 @@
-import { BillingImpactEnum, BillingTimesheetStatusEnum, IBillingEntity, IBillingTimesheetEntity, IEntityUpdateDto } from "../../entities";
+import { BillingImpactEnum, BillingActionsEnum, BillingTimesheetStatusEnum, IBillingEntity, IBillingTimesheetEntity, IEntityUpdateDto } from "../../entities";
 export interface IBillingUpdateDto extends IEntityUpdateDto<IBillingEntity> {
 }
 export interface IBillingTimesheetUpdateDto extends IEntityUpdateDto<IBillingTimesheetEntity> {
@@ -15,6 +15,7 @@ export interface IBillingTimesheetDeleteDto extends Partial<IBillingTimesheetEnt
     id: number;
     changedStatus: BillingTimesheetStatusEnum;
 }
-export interface IUpdateBillingDto {
+export interface IUpdateBillingDto extends IBillingUpdateDto {
+    action?: BillingActionsEnum;
     timesheets?: IBillingTimesheetUpdateDto[];
 }

package/dist/src/api/interface/role.permission.mapping.delete.dto.interface.d.ts

@@ -0,0 +1,3 @@
+import { IRolePermissionsMappingCreateDto } from "./role.permission.mapping.create.dto.interface";
+export interface IRolePermissionMappingDeleteDto extends IRolePermissionsMappingCreateDto {
+}

package/dist/src/api/interface/role.permission.mapping.delete.dto.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/api/interface/role.permission.mapping.response.d.ts

@@ -0,0 +1,5 @@
+export type IRolePermissionMappingResponse = {
+    [permissionName: string]: {
+        roles: string[];
+    };
+};

package/dist/src/api/interface/role.permission.mapping.response.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/entities/enums/billing.status.enum.d.ts

@@ -1,9 +1,28 @@
-export declare enum StatusEnum {
-    PENDING = "PENDING",
-    CLIENT_REVIEW = "CLIENT_REVIEW",
-    APPROVED = "APPROVED",
-    PAYMENT_PENDING = "PAYMENT_PENDING",
-    PAYMENT_DONE = "PAYMENT_DONE",
-    CLIENT_REVISION = "CLIENT_REVISION",
-    CANCELLED = "CANCELLED"
+export declare enum BillingStatusEnum {
+    PENDING_APPROVAL = "PENDING_APPROVAL",
+    REQUEST_CHANGES = "REQUEST_CHANGES",
+    CHANGES_SAVED = "CHANGES_SAVED",
+    INTERNAL_APPROVED = "INTERNAL_APPROVED",
+    PENDING_CLIENT_REVIEW = "PENDING_CLIENT_REVIEW",
+    CLIENT_REVISION_APPROVAL = "CLIENT_REVISION_APPROVAL",
+    CANCELLED = "CANCELLED",
+    REJECT_CLIENT_REVISION = "REJECT_CLIENT_REVISION",
+    INVOICE_SENT = "INVOICE_SENT",
+    PENDING_PAYMENT = "PENDING_PAYMENT",
+    PAYMENT_DONE = "PAYMENT_DONE"
+}
+export declare enum BillingActionsEnum {
+    APPROVE = "approve",
+    REJECT = "reject",
+    EDIT = "edit",
+    REQUEST_FOR_CHANGES = "requestForChanges",
+    SENT_FOR_APPROVAL = "sentForApproval",
+    SEND_FOR_CLIENT_REVIEW = "sendForClientReview",
+    CLIENT_REVISION = "clientRevision",
+    SEND_INVOICE = "sendInvoice",
+    APPROVAL = "approval",
+    UPDATE_PAYMENT = "updatePayment",
+    CREDIT_NOTE = "creditNote",
+    WRITE_OFF = "writeOff",
+    TDS = "tds"
 }

package/dist/src/entities/enums/billing.status.enum.js

@@ -1,13 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatusEnum = void 0;
-var StatusEnum;
-(function (StatusEnum) {
-    StatusEnum["PENDING"] = "PENDING";
-    StatusEnum["CLIENT_REVIEW"] = "CLIENT_REVIEW";
-    StatusEnum["APPROVED"] = "APPROVED";
-    StatusEnum["PAYMENT_PENDING"] = "PAYMENT_PENDING";
-    StatusEnum["PAYMENT_DONE"] = "PAYMENT_DONE";
-    StatusEnum["CLIENT_REVISION"] = "CLIENT_REVISION";
-    StatusEnum["CANCELLED"] = "CANCELLED";
-})(StatusEnum || (exports.StatusEnum = StatusEnum = {}));
+exports.BillingActionsEnum = exports.BillingStatusEnum = void 0;
+var BillingStatusEnum;
+(function (BillingStatusEnum) {
+    BillingStatusEnum["PENDING_APPROVAL"] = "PENDING_APPROVAL";
+    BillingStatusEnum["REQUEST_CHANGES"] = "REQUEST_CHANGES";
+    BillingStatusEnum["CHANGES_SAVED"] = "CHANGES_SAVED";
+    BillingStatusEnum["INTERNAL_APPROVED"] = "INTERNAL_APPROVED";
+    BillingStatusEnum["PENDING_CLIENT_REVIEW"] = "PENDING_CLIENT_REVIEW";
+    BillingStatusEnum["CLIENT_REVISION_APPROVAL"] = "CLIENT_REVISION_APPROVAL";
+    BillingStatusEnum["CANCELLED"] = "CANCELLED";
+    BillingStatusEnum["REJECT_CLIENT_REVISION"] = "REJECT_CLIENT_REVISION";
+    BillingStatusEnum["INVOICE_SENT"] = "INVOICE_SENT";
+    BillingStatusEnum["PENDING_PAYMENT"] = "PENDING_PAYMENT";
+    BillingStatusEnum["PAYMENT_DONE"] = "PAYMENT_DONE";
+})(BillingStatusEnum || (exports.BillingStatusEnum = BillingStatusEnum = {}));
+var BillingActionsEnum;
+(function (BillingActionsEnum) {
+    BillingActionsEnum["APPROVE"] = "approve";
+    BillingActionsEnum["REJECT"] = "reject";
+    BillingActionsEnum["EDIT"] = "edit";
+    BillingActionsEnum["REQUEST_FOR_CHANGES"] = "requestForChanges";
+    BillingActionsEnum["SENT_FOR_APPROVAL"] = "sentForApproval";
+    BillingActionsEnum["SEND_FOR_CLIENT_REVIEW"] = "sendForClientReview";
+    BillingActionsEnum["CLIENT_REVISION"] = "clientRevision";
+    BillingActionsEnum["SEND_INVOICE"] = "sendInvoice";
+    BillingActionsEnum["APPROVAL"] = "approval";
+    BillingActionsEnum["UPDATE_PAYMENT"] = "updatePayment";
+    BillingActionsEnum["CREDIT_NOTE"] = "creditNote";
+    BillingActionsEnum["WRITE_OFF"] = "writeOff";
+    BillingActionsEnum["TDS"] = "tds";
+})(BillingActionsEnum || (exports.BillingActionsEnum = BillingActionsEnum = {}));

package/dist/src/entities/enums/billing.transaction.enum.d.ts

@@ -0,0 +1,10 @@
+export declare enum BillingTransactionType {
+    TDS = "TDS",
+    WRITE_OFF = "WRITE_OFF",
+    CREDIT_NOTE = "CREDIT_NOTE",
+    PAYMENT = "PAYMENT"
+}
+export declare namespace BillingTransactionType {
+    function getNames(): string[];
+    function parse(value: string): BillingTransactionType;
+}

package/dist/src/entities/enums/billing.transaction.enum.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BillingTransactionType = void 0;
+var BillingTransactionType;
+(function (BillingTransactionType) {
+    BillingTransactionType["TDS"] = "TDS";
+    BillingTransactionType["WRITE_OFF"] = "WRITE_OFF";
+    BillingTransactionType["CREDIT_NOTE"] = "CREDIT_NOTE";
+    BillingTransactionType["PAYMENT"] = "PAYMENT";
+})(BillingTransactionType || (exports.BillingTransactionType = BillingTransactionType = {}));
+(function (BillingTransactionType) {
+    function getNames() {
+        return Object.values(BillingTransactionType).filter((value) => typeof value === "string");
+    }
+    BillingTransactionType.getNames = getNames;
+    function parse(value) {
+        if (Object.values(BillingTransactionType).includes(value)) {
+            return value;
+        }
+        throw new Error("Invalid Billing Transaction Type");
+    }
+    BillingTransactionType.parse = parse;
+})(BillingTransactionType || (exports.BillingTransactionType = BillingTransactionType = {}));

package/dist/src/entities/enums/user.entity.enum.d.ts

@@ -14,6 +14,7 @@ export declare enum UserRoleEnum {
 }
 export declare namespace UserRoleEnum {
     function getNames(): string[];
+    function parse(value: string): UserRoleEnum;
 }
 export declare namespace UserStatusEnum {
     function getNames(): string[];

package/dist/src/entities/enums/user.entity.enum.js

@@ -22,6 +22,13 @@ var UserRoleEnum;
         return Object.values(UserRoleEnum).filter((value) => typeof value === "string");
     }
     UserRoleEnum.getNames = getNames;
+    function parse(value) {
+        if (Object.values(UserRoleEnum).includes(value)) {
+            return value;
+        }
+        throw new Error("Invalid user role");
+    }
+    UserRoleEnum.parse = parse;
 })(UserRoleEnum || (exports.UserRoleEnum = UserRoleEnum = {}));
 (function (UserStatusEnum) {
     function getNames() {

package/dist/src/entities/index.d.ts

@@ -32,3 +32,5 @@ export * from "./interface/client_affiliate_entity.interface";
 export * from "./interface/role.entity.interface";
 export * from "./interface/permission.entity.interface";
 export * from "./interface/role.permission.mapping.entity.interface";
+export * from "./interface/billing_transaction.entity.interface";
+export * from "./enums/billing.transaction.enum";

package/dist/src/entities/index.js

@@ -48,3 +48,5 @@ __exportStar(require("./interface/client_affiliate_entity.interface"), exports);
 __exportStar(require("./interface/role.entity.interface"), exports);
 __exportStar(require("./interface/permission.entity.interface"), exports);
 __exportStar(require("./interface/role.permission.mapping.entity.interface"), exports);
+__exportStar(require("./interface/billing_transaction.entity.interface"), exports);
+__exportStar(require("./enums/billing.transaction.enum"), exports);

package/dist/src/entities/interface/billing.entity.interface.d.ts

@@ -1,5 +1,5 @@
 import { BillingImpactEnum } from "../enums/billing.impact.enum";
-import { StatusEnum } from "../enums/billing.status.enum";
+import { BillingStatusEnum } from "../enums/billing.status.enum";
 import { BillingTimesheetStatusEnum } from "../enums/billing.timesheet.change.status.enum";
 import { PaymentStatusEnum } from "../enums/payment_status.enum";
 import { IAuditColumnEntity } from "./audit-column.entity.interface";
@@ -13,8 +13,11 @@ export interface IBillingEntity extends IAuditColumnEntity {
     totalMinutes: number;
     invoiceNumber?: number;
     paymentStatus: PaymentStatusEnum;
-    status: StatusEnum;
+    status: BillingStatusEnum;
     writeoffAmount: number;
+    totalAmountPaid: number;
+    tdsAmount: number;
+    creditNoteAmount: number;
 }
 export interface IBillingTimesheetEntity extends IAuditColumnEntity {
     id: number;

package/dist/src/entities/interface/billing_transaction.entity.interface.d.ts

@@ -0,0 +1,11 @@
+import { BillingTransactionType } from "../enums/billing.transaction.enum";
+import { IAuditColumnEntity } from "./audit-column.entity.interface";
+import { IEntityFilterData } from "./entity.utils.interface";
+export interface IBillingTransactionEntity extends IAuditColumnEntity {
+    id: number;
+    billingId: number;
+    type: BillingTransactionType;
+    amount: number;
+    details: string;
+}
+export type IBillingTransactionEntityFilterData = IEntityFilterData<IBillingTransactionEntity>;

package/dist/src/entities/interface/billing_transaction.entity.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/entities/interface/project.entity.interface.d.ts

@@ -53,3 +53,5 @@ export interface IProjectUserMappingEntity extends IAuditColumnEntity {
     userId: number;
     role: UserRoleEnum;
 }
+export interface IProjectUserMappingCreateDto extends IEntityCreateDto<IProjectUserMappingEntity> {
+}

package/dist/src/entities/interface/user.entity.interface.d.ts

@@ -36,5 +36,6 @@ export interface IUserEntity extends IAuditColumnEntity {
     secondEmergencyContactName?: string;
     secondaryEmergencyContactNo?: string;
     secondaryEmergencyContactRelation?: string;
+    permissions?: string[];
 }
 export type IUserEntityFilterData = IEntityFilterData<IUserEntity>;

package/dist/src/utils/helper.fn.util.d.ts

@@ -1,3 +1,4 @@
+import { IEntityFilterData } from "../entities";
 export declare function groupByFunction<T, K>(list: T[], keyGetter: (input: T) => K): Map<K, T[]>;
 export declare function groupByOneToOneFunction<T, K>(list: T[], keyGetter: (input: T) => K): Map<K, T>;
 export declare function convertMapToObject<K, T>(map: Map<K, T>): {
@@ -81,9 +82,36 @@ export declare function arrayIntersectionWith<T>(source: T[], target: T[], compa
  */
 export declare function arrayUnion<T>(source: T[], target: T[]): T[];
 export declare function sumArray<T>(array: T[], key: keyof T): number;
+/**
+ * Compares existing and incoming arrays and returns the added, deleted, and present elements.
+ *
+ * @template T - The type of elements in the arrays.
+ * @param {T[]} existing - The existing array.
+ * @param {T[]} incoming - The incoming array.
+ * @returns {{ added: T[]; deleted: T[]; present: T[] }} An object containing arrays of added, deleted, and present elements.
+ *
+ * @example
+ * const existing = [1, 2, 3];
+ * const incoming = [2, 3, 4];
+ * const result = newRemoved(existing, incoming);
+ * console.log(result); // Output: { added: [4], deleted: [1], present: [2, 3, 4] }
+ */
 export declare function newRemoved<T>(existing: T[], incoming: T[]): {
     added: T[];
     deleted: T[];
     present: T[];
 };
 export declare function getEnumNames(enumType: object): string[];
+export declare function getFilterByPermission<T>(permissionFilterConfig: {
+    [key: string]: IEntityFilterData<T>;
+}, propertyName: keyof T, userPermission: string, filterDto: IEntityFilterData<T>, emptyValue?: any): {
+    [x: string]: any;
+};
+export declare function getFilterByPermissionFn<T>(permissionFilterConfig: {
+    [key: string]: () => Promise<IEntityFilterData<T>>;
+}, propertyName: keyof T, userPermission: string, filterDto: IEntityFilterData<T>, emptyValue?: any): Promise<{
+    [x: string]: any;
+}>;
+export declare function getPropertyFilterByPermissionFn<T>(permissionFilterConfig: {
+    [key: string]: () => Promise<IEntityFilterData<T>>;
+}, propertyNames: (keyof T)[], userPermission: string, filterDto: IEntityFilterData<T>, emptyValue?: any): Promise<IEntityFilterData<T>>;

package/dist/src/utils/helper.fn.util.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.groupByFunction = groupByFunction;
 exports.groupByOneToOneFunction = groupByOneToOneFunction;
@@ -12,6 +21,9 @@ exports.arrayUnion = arrayUnion;
 exports.sumArray = sumArray;
 exports.newRemoved = newRemoved;
 exports.getEnumNames = getEnumNames;
+exports.getFilterByPermission = getFilterByPermission;
+exports.getFilterByPermissionFn = getFilterByPermissionFn;
+exports.getPropertyFilterByPermissionFn = getPropertyFilterByPermissionFn;
 function groupByFunction(list, keyGetter) {
     const map = new Map();
     list.forEach((item) => {
@@ -138,6 +150,20 @@ function arrayUnion(source, target) {
 function sumArray(array, key) {
     return array.reduce((acc, item) => acc + Number(item[key]), 0);
 }
+/**
+ * Compares existing and incoming arrays and returns the added, deleted, and present elements.
+ *
+ * @template T - The type of elements in the arrays.
+ * @param {T[]} existing - The existing array.
+ * @param {T[]} incoming - The incoming array.
+ * @returns {{ added: T[]; deleted: T[]; present: T[] }} An object containing arrays of added, deleted, and present elements.
+ *
+ * @example
+ * const existing = [1, 2, 3];
+ * const incoming = [2, 3, 4];
+ * const result = newRemoved(existing, incoming);
+ * console.log(result); // Output: { added: [4], deleted: [1], present: [2, 3, 4] }
+ */
 function newRemoved(existing, incoming) {
     existing = existing || [];
     incoming = incoming || [];
@@ -149,3 +175,57 @@ function newRemoved(existing, incoming) {
 function getEnumNames(enumType) {
     return Object.values(enumType).filter((value) => typeof value === "string");
 }
+function getFilterByPermission(permissionFilterConfig, propertyName, userPermission, filterDto, emptyValue = []) {
+    const dtoFilter = filterDto[propertyName];
+    const permissionFilter = permissionFilterConfig[userPermission][propertyName];
+    const isDtoFilterIdPresent = dtoFilter && dtoFilter.length > 0;
+    const isPermissionFilterIdPresent = permissionFilter && permissionFilter.length > 0;
+    return {
+        [propertyName]: isPermissionFilterIdPresent
+            ? isDtoFilterIdPresent
+                ? arrayIntersection(permissionFilter, dtoFilter).length > 0
+                    ? arrayIntersection(permissionFilter, dtoFilter)
+                    : emptyValue
+                : permissionFilter
+            : dtoFilter,
+    };
+}
+function getFilterByPermissionFn(permissionFilterConfig_1, propertyName_1, userPermission_1, filterDto_1) {
+    return __awaiter(this, arguments, void 0, function* (permissionFilterConfig, propertyName, userPermission, filterDto, emptyValue = []) {
+        const filterData = yield permissionFilterConfig[userPermission]();
+        const dtoFilter = filterDto[propertyName];
+        const permissionFilter = filterData[propertyName];
+        const isDtoFilterIdPresent = dtoFilter && dtoFilter.length > 0;
+        const isPermissionFilterIdPresent = permissionFilter && permissionFilter.length > 0;
+        return {
+            [propertyName]: isPermissionFilterIdPresent
+                ? isDtoFilterIdPresent
+                    ? arrayIntersection(permissionFilter, dtoFilter).length > 0
+                        ? arrayIntersection(permissionFilter, dtoFilter)
+                        : emptyValue
+                    : permissionFilter
+                : dtoFilter,
+        };
+    });
+}
+function getPropertyFilterByPermissionFn(permissionFilterConfig_1, propertyNames_1, userPermission_1, filterDto_1) {
+    return __awaiter(this, arguments, void 0, function* (permissionFilterConfig, propertyNames, userPermission, filterDto, emptyValue = []) {
+        const filterData = yield permissionFilterConfig[userPermission]();
+        const result = {};
+        for (const propertyName of propertyNames) {
+            const dtoFilter = filterDto[propertyName];
+            const permissionFilter = filterData[propertyName];
+            const isDtoFilterIdPresent = dtoFilter && dtoFilter.length > 0;
+            const isPermissionFilterIdPresent = permissionFilter && permissionFilter.length > 0;
+            result[propertyName] =
+                isPermissionFilterIdPresent
+                    ? isDtoFilterIdPresent
+                        ? arrayIntersection(permissionFilter, dtoFilter).length > 0
+                            ? arrayIntersection(permissionFilter, dtoFilter)
+                            : emptyValue
+                        : permissionFilter
+                    : dtoFilter;
+        }
+        return result;
+    });
+}

package/package.json

@@ -1,34 +1,35 @@
-{
-  "name": "law-common",
-  "version": "1.2.58-beta.9",
-  "description": "",
-  "main": "dist/index.js",
-  "files": [
-    "dist/**/*"
-  ],
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "npm run clean && tsc",
-    "publish:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
-    "publish:patch": "npm version patch && git push && npm run build && npm publish",
-    "publish:minor": "npm version minor && git push && npm run build && npm publish",
-    "link": "npm run build && npm link",
-    "test": "jest"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.13",
-    "@types/node": "^22.6.1",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
-  },
-  "dependencies": {
-    "@types/express": "^5.0.0",
-    "@types/multer": "^1.4.12",
-    "date-fns": "^4.1.0"
-  }
-}
+{
+ "name": "law-common",
+ "version": "2.1.0",
+ "description": "",
+ "main": "dist/index.js",
+ "files": [
+  "dist/**/*"
+ ],
+ "scripts": {
+  "clean": "rm -rf dist",
+  "build": "npm run clean && tsc",
+  "publish:beta": "npm version prerelease --preid beta && git push && npm run build && npm publish --tag beta",
+  "publish:patch": "npm version patch && git push && npm run build && npm publish",
+  "publish:minor": "npm version minor && git push && npm run build && npm publish",
+  "publish:major": "npm version major && git push && npm run build && npm publish",
+  "link": "npm run build && npm link",
+  "test": "jest"
+ },
+ "keywords": [],
+ "author": "",
+ "license": "ISC",
+ "devDependencies": {
+  "@types/jest": "^29.5.13",
+  "@types/node": "^22.6.1",
+  "jest": "^29.7.0",
+  "ts-jest": "^29.2.5",
+  "ts-node": "^10.9.2",
+  "typescript": "^5.6.2"
+ },
+ "dependencies": {
+  "@types/express": "^5.0.0",
+  "@types/multer": "^1.4.12",
+  "date-fns": "^4.1.0"
+ }
+}