@duvdu-v1/duvdu 1.1.290 → 1.1.293

package/build/middlewares/redis-connection.js

@@ -41,7 +41,7 @@ const getRedisConfig = () => {
             if (times > 3)
                 return null;
             return Math.min(times * 100, 3000);
-        }
+        },
     };
 };
 // Get Redis client info to monitor connections

package/build/models/Ticket.model.js

@@ -25,8 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ticket = void 0;
 const mongoose_1 = __importStar(require("mongoose"));
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 const ticketSchema = new mongoose_1.default.Schema({
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     userId: {
         type: mongoose_1.default.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,

package/build/models/all-contracts.model.d.ts

@@ -24,6 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { Types } from 'mongoose';
 import { Iuser } from '../types/User';
+export declare const generateTicketNumber: () => string;
 export interface Icontract {
     id: string;
     customer: Types.ObjectId | Iuser;
@@ -32,6 +33,7 @@ export interface Icontract {
     ref: string;
     cycle: string;
     coupons: Types.ObjectId[];
+    ticketNumber: string;
 }
 export declare const Contracts: import("mongoose").Model<Icontract, {}, {}, {}, import("mongoose").Document<unknown, {}, Icontract> & Icontract & {
     _id: Types.ObjectId;

package/build/models/all-contracts.model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContractReports = exports.Contracts = void 0;
+exports.ContractReports = exports.Contracts = exports.generateTicketNumber = void 0;
 const mongoose_1 = require("mongoose");
 const model_names_1 = require("../types/model-names");
 // Function to generate simple unique ticket number
@@ -8,6 +8,7 @@ const generateTicketNumber = () => {
     const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
     return `TKT${random}`;
 };
+exports.generateTicketNumber = generateTicketNumber;
 exports.Contracts = (0, mongoose_1.model)(model_names_1.MODELS.allContracts, new mongoose_1.Schema({
     customer: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
@@ -15,22 +16,25 @@ exports.Contracts = (0, mongoose_1.model)(model_names_1.MODELS.allContracts, new
     ref: String,
     cycle: { type: String, default: null },
     coupons: [{ type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.coupon }],
+    ticketNumber: { type: String, default: null },
 }, { timestamps: true, collection: model_names_1.MODELS.allContracts }));
 exports.ContractReports = (0, mongoose_1.model)(model_names_1.MODELS.contractReports, new mongoose_1.Schema({
-    ticketNumber: { type: String, default: generateTicketNumber, unique: true },
+    ticketNumber: { type: String, default: exports.generateTicketNumber, unique: true },
     reporter: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     contract: { type: mongoose_1.Schema.Types.ObjectId, refPath: 'ref' },
     ref: String,
     desc: { type: String, default: null },
     attachments: [String],
-    state: [{
+    state: [
+        {
             addedBy: {
                 type: mongoose_1.Schema.Types.ObjectId,
                 ref: model_names_1.MODELS.user,
                 default: null,
             },
             feedback: { type: String, default: null },
-        }],
+        },
+    ],
     isClosed: {
         type: Boolean,
         default: false,

package/build/models/messages.model.js

@@ -51,7 +51,7 @@ exports.Message = (0, mongoose_1.model)(model_names_1.MODELS.messages, new mongo
         transform(doc, ret) {
             // Handle media array - transform URLs for each media item
             if (ret.media && Array.isArray(ret.media)) {
-                ret.media = ret.media.map(mediaItem => {
+                ret.media = ret.media.map((mediaItem) => {
                     if (mediaItem === null || mediaItem === void 0 ? void 0 : mediaItem.url) {
                         return Object.assign(Object.assign({}, mediaItem), { url: process.env.BUCKET_HOST + '/' + mediaItem.url });
                     }

package/build/models/portfolio-post.model.d.ts

@@ -31,6 +31,7 @@ export declare enum InviteStatus {
 }
 export interface IprojectCycle {
     user: Types.ObjectId | Iuser;
+    ticketNumber: string;
     category: Types.ObjectId | Iuser;
     subCategory: {
         ar: string;

package/build/models/portfolio-post.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectCycle = exports.InviteStatus = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 var InviteStatus;
 (function (InviteStatus) {
@@ -11,6 +12,7 @@ var InviteStatus;
 })(InviteStatus || (exports.InviteStatus = InviteStatus = {}));
 exports.ProjectCycle = (0, mongoose_1.model)(model_names_1.MODELS.portfolioPost, new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category },
     subCategory: {
         ar: { type: String, default: null },

package/build/models/producer_contracts.model.d.ts

@@ -33,6 +33,7 @@ export declare enum ContractStatus {
     complaint = "complaint"
 }
 export interface IproducerContarct {
+    ticketNumber: string;
     producer: Types.ObjectId | Iuser;
     sp: Types.ObjectId | Iuser;
     user: Types.ObjectId | Iuser;

package/build/models/producer_contracts.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProducerContract = exports.ContractStatus = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 var ContractStatus;
 (function (ContractStatus) {
@@ -13,6 +14,7 @@ var ContractStatus;
     ContractStatus["complaint"] = "complaint";
 })(ContractStatus || (exports.ContractStatus = ContractStatus = {}));
 exports.ProducerContract = (0, mongoose_1.model)(model_names_1.MODELS.producerContract, new mongoose_1.Schema({
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     producer: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },

package/build/models/projectContract.model.d.ts

@@ -39,6 +39,7 @@ export declare enum ProjectContractStatus {
 }
 export interface IprojectContract {
     sp: Types.ObjectId | Iuser;
+    ticketNumber: string;
     customer: Types.ObjectId | Iuser;
     project: Types.ObjectId | IprojectCycle;
     tools: {

package/build/models/projectContract.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectContract = exports.ProjectContractStatus = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const copyright_contract_model_1 = require("./copyright-contract.model");
 const model_names_1 = require("../types/model-names");
 var ProjectContractStatus;
@@ -18,6 +19,7 @@ var ProjectContractStatus;
 })(ProjectContractStatus || (exports.ProjectContractStatus = ProjectContractStatus = {}));
 exports.ProjectContract = (0, mongoose_1.model)(model_names_1.MODELS.projectContract, new mongoose_1.Schema({
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     customer: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     project: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.portfolioPost },
     tools: [
@@ -77,3 +79,4 @@ exports.ProjectContract = (0, mongoose_1.model)(model_names_1.MODELS.projectCont
         user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user, default: null },
     },
 }, { timestamps: true, collection: model_names_1.MODELS.projectContract }));
+// i need here add ticket number to the project contract by default

package/build/models/rental-contracts.model.d.ts

@@ -36,6 +36,7 @@ export declare enum RentalContractStatus {
 }
 export interface IrentalContract {
     id: string;
+    ticketNumber: string;
     customer: Types.ObjectId | Iuser;
     sp: Types.ObjectId | Iuser;
     project: Types.ObjectId | Irental;

package/build/models/rental-contracts.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RentalContracts = exports.RentalContractStatus = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 var RentalContractStatus;
 (function (RentalContractStatus) {
@@ -14,6 +15,7 @@ var RentalContractStatus;
     RentalContractStatus["complaint"] = "complaint";
 })(RentalContractStatus || (exports.RentalContractStatus = RentalContractStatus = {}));
 exports.RentalContracts = (0, mongoose_1.model)(model_names_1.MODELS.rentalContract, new mongoose_1.Schema({
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     customer: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     project: { type: mongoose_1.Schema.Types.ObjectId, ref: 'rentals' },

package/build/models/rental.model.d.ts

@@ -34,6 +34,7 @@ export declare enum RentalUnits {
 }
 export interface Irental {
     id: string;
+    ticketNumber: string;
     user: Types.ObjectId | Iuser;
     category: Types.ObjectId | Icategory;
     subCategory: {

package/build/models/rental.model.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rentals = exports.RentalUnits = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 var RentalUnits;
 (function (RentalUnits) {
@@ -13,6 +14,7 @@ var RentalUnits;
 })(RentalUnits || (exports.RentalUnits = RentalUnits = {}));
 exports.Rentals = (0, mongoose_1.model)('rentals', new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category },
     subCategory: { ar: String, en: String, _id: String },
     tags: [{ ar: String, en: String }],

package/build/models/report.model.d.ts

@@ -25,6 +25,7 @@
 import { Types } from 'mongoose';
 import { Iuser } from '../types/User';
 export interface Ireport {
+    ticketNumber: string;
     sourceUser: Types.ObjectId | Iuser;
     project: Types.ObjectId;
     desc: string;

package/build/models/report.model.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Report = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
 exports.Report = (0, mongoose_1.model)(model_names_1.MODELS.report, new mongoose_1.Schema({
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     sourceUser: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,

package/build/models/teamProject.model.d.ts

@@ -28,6 +28,7 @@ import { Icategory } from '../types/Category';
 import { Iuser } from '../types/User';
 export interface ITeamProject {
     user: Types.ObjectId | Iuser;
+    ticketNumber: string;
     cover: string;
     title: string;
     desc: string;

package/build/models/teamProject.model.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamProject = void 0;
 const mongoose_1 = require("mongoose");
+const all_contracts_model_1 = require("./all-contracts.model");
 const cycles_1 = require("../types/cycles");
 const model_names_1 = require("../types/model-names");
 exports.TeamProject = (0, mongoose_1.model)(model_names_1.MODELS.teamProject, new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
     cover: { type: String, default: null },
     title: { type: String, default: null },
     desc: { type: String, default: null },

package/build/types/Permissions.d.ts

@@ -25,6 +25,11 @@ export declare enum PERMISSIONS {
     listComplaints = "list-complaints",
     updateComplaint = "update-complaint",
     closeComplaint = "close-complaint",
+    listContracts = "list-contracts",
+    listContractsAnalysis = "list-contracts-analysis",
+    listCancelContracts = "list-cancel-contracts",
+    acceptCancelContract = "accept-cancel-contract",
+    deleteCancelContract = "delete-cancel-contract",
     bookmarks = "bookmarks",
     createTicket = "create ticket",
     getAllTickets = "get-all-tickets",
@@ -70,10 +75,7 @@ export declare enum PERMISSIONS {
     accessDashboard = "access dashboard",
     createPlatform = "create producer platform",
     updatePlatform = "update producer platform",
-    getPlatform = "get producer platform",
-    getContractsCancel = "get contracts cancel",
-    deleteContractCancel = "delete contract cancel",
-    acceptContractCancel = "accept contract cancel"
+    getPlatform = "get producer platform"
 }
 export declare const permissions: {
     all: PERMISSIONS[];
@@ -84,6 +86,7 @@ export declare const permissions: {
     projects: PERMISSIONS[];
     withdrawMethods: PERMISSIONS[];
     complaint: PERMISSIONS[];
+    contract: PERMISSIONS[];
     bookmarks: PERMISSIONS[];
     ticket: PERMISSIONS[];
     terms: PERMISSIONS[];
@@ -97,5 +100,4 @@ export declare const permissions: {
     producer: PERMISSIONS[];
     dashboard: PERMISSIONS[];
     producerPlatform: PERMISSIONS[];
-    contractCancel: PERMISSIONS[];
 };

package/build/types/Permissions.js

@@ -36,6 +36,12 @@ var PERMISSIONS;
     PERMISSIONS["listComplaints"] = "list-complaints";
     PERMISSIONS["updateComplaint"] = "update-complaint";
     PERMISSIONS["closeComplaint"] = "close-complaint";
+    // contract
+    PERMISSIONS["listContracts"] = "list-contracts";
+    PERMISSIONS["listContractsAnalysis"] = "list-contracts-analysis";
+    PERMISSIONS["listCancelContracts"] = "list-cancel-contracts";
+    PERMISSIONS["acceptCancelContract"] = "accept-cancel-contract";
+    PERMISSIONS["deleteCancelContract"] = "delete-cancel-contract";
     PERMISSIONS["bookmarks"] = "bookmarks";
     PERMISSIONS["createTicket"] = "create ticket";
     PERMISSIONS["getAllTickets"] = "get-all-tickets";
@@ -93,10 +99,6 @@ var PERMISSIONS;
     PERMISSIONS["createPlatform"] = "create producer platform";
     PERMISSIONS["updatePlatform"] = "update producer platform";
     PERMISSIONS["getPlatform"] = "get producer platform";
-    // contract cancel
-    PERMISSIONS["getContractsCancel"] = "get contracts cancel";
-    PERMISSIONS["deleteContractCancel"] = "delete contract cancel";
-    PERMISSIONS["acceptContractCancel"] = "accept contract cancel";
 })(PERMISSIONS || (exports.PERMISSIONS = PERMISSIONS = {}));
 exports.permissions = {
     all: [
@@ -128,6 +130,11 @@ exports.permissions = {
         PERMISSIONS.listComplaints,
         PERMISSIONS.updateComplaint,
         PERMISSIONS.closeComplaint,
+        PERMISSIONS.listContracts,
+        PERMISSIONS.listContractsAnalysis,
+        PERMISSIONS.listCancelContracts,
+        PERMISSIONS.acceptCancelContract,
+        PERMISSIONS.deleteCancelContract,
     ],
     category: [
         PERMISSIONS.createCategory,
@@ -152,24 +159,21 @@ exports.permissions = {
         PERMISSIONS.unBlockUser,
         PERMISSIONS.removeUser,
     ],
-    messages: [
-        PERMISSIONS.listMessagesFromTo,
-        PERMISSIONS.sendNotificationToUsers,
-    ],
+    messages: [PERMISSIONS.listMessagesFromTo, PERMISSIONS.sendNotificationToUsers],
     projects: [
         PERMISSIONS.listProjects,
         PERMISSIONS.updateProject,
         PERMISSIONS.removeProject,
         PERMISSIONS.getProjectAnalysis,
     ],
-    withdrawMethods: [
-        PERMISSIONS.listWithdrawMethods,
-        PERMISSIONS.updateWithdrawMethod,
-    ],
-    complaint: [
-        PERMISSIONS.listComplaints,
-        PERMISSIONS.updateComplaint,
-        PERMISSIONS.closeComplaint,
+    withdrawMethods: [PERMISSIONS.listWithdrawMethods, PERMISSIONS.updateWithdrawMethod],
+    complaint: [PERMISSIONS.listComplaints, PERMISSIONS.updateComplaint, PERMISSIONS.closeComplaint],
+    contract: [
+        PERMISSIONS.listContracts,
+        PERMISSIONS.listContractsAnalysis,
+        PERMISSIONS.listCancelContracts,
+        PERMISSIONS.acceptCancelContract,
+        PERMISSIONS.deleteCancelContract,
     ],
     bookmarks: [PERMISSIONS.bookmarks],
     ticket: [
@@ -228,9 +232,4 @@ exports.permissions = {
         PERMISSIONS.createPlatform,
         PERMISSIONS.updatePlatform,
     ],
-    contractCancel: [
-        PERMISSIONS.getContractsCancel,
-        PERMISSIONS.deleteContractCancel,
-        PERMISSIONS.acceptContractCancel,
-    ],
 };

package/build/types/Ticket.d.ts

@@ -26,6 +26,7 @@ import { Types } from 'mongoose';
 import { Iuser } from './User';
 export interface Iticket {
     id: string;
+    ticketNumber: string;
     userId: Types.ObjectId | Iuser;
     name: string;
     phoneNumber: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.290",
+  "version": "1.1.293",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [