@duvdu-v1/duvdu 1.1.325 → 1.1.327

package/build/models/Ticket.model.js

@@ -25,10 +25,13 @@ 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 generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `TKT${random}`;
+};
 const ticketSchema = new mongoose_1.default.Schema({
-    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
+    ticketNumber: { type: String, default: 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,7 +24,8 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { Types } from 'mongoose';
 import { Iuser } from '../types/User';
-export declare const generateTicketNumber: () => string;
+export declare const generateContractTicketNumber: () => string;
+export declare const generateContractReportTicketNumber: () => string;
 export interface Icontract {
     id: string;
     customer: Types.ObjectId | Iuser;
@@ -34,6 +35,7 @@ export interface Icontract {
     cycle: string;
     coupons: Types.ObjectId[];
     ticketNumber: string;
+    project: Types.ObjectId;
 }
 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,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContractReports = exports.Contracts = exports.generateTicketNumber = void 0;
+exports.ContractReports = exports.Contracts = exports.generateContractReportTicketNumber = exports.generateContractTicketNumber = void 0;
 const mongoose_1 = require("mongoose");
 const model_names_1 = require("../types/model-names");
 // Function to generate simple unique ticket number
-const generateTicketNumber = () => {
+const generateContractTicketNumber = () => {
     const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
-    return `TKT${random}`;
+    return `CON${random}`;
 };
-exports.generateTicketNumber = generateTicketNumber;
+exports.generateContractTicketNumber = generateContractTicketNumber;
+const generateContractReportTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `CRT${random}`;
+};
+exports.generateContractReportTicketNumber = generateContractReportTicketNumber;
 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 },
@@ -17,9 +22,10 @@ exports.Contracts = (0, mongoose_1.model)(model_names_1.MODELS.allContracts, new
     cycle: { type: String, default: null },
     coupons: [{ type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.coupon }],
     ticketNumber: { type: String, default: null },
+    project: { type: mongoose_1.Schema.Types.ObjectId },
 }, { 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: exports.generateTicketNumber, unique: true },
+    ticketNumber: { type: String, default: exports.generateContractReportTicketNumber, 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,

package/build/models/copyright-contract.model.js

@@ -33,7 +33,7 @@ exports.CopyrightContracts = (0, mongoose_1.model)(model_names_1.MODELS.copyrigh
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     project: { type: mongoose_1.Schema.Types.ObjectId, ref: 'rentals' },
     details: { type: String, default: null },
-    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateContractTicketNumber, unique: true, sparse: true },
     attachments: [String],
     location: { lat: Number, lng: Number },
     address: { type: String, default: null },

package/build/models/copyrights-booking.model.js

@@ -11,7 +11,7 @@ exports.CopyrightsBooking = (0, mongoose_1.model)(model_names_1.MODELS.copyright
     project: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user, required: true },
     jobDetails: { type: String, default: null },
     deadline: { type: Date, required: true },
-    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateContractTicketNumber, unique: true, sparse: true },
     totalPrice: { type: Number, required: true },
     address: { type: String, default: null },
     location: { lat: { type: String, required: true }, lng: { type: String, required: true } },

package/build/models/copyrights.model.js

@@ -9,7 +9,7 @@ exports.CopyRights = (0, mongoose_1.model)(model_names_1.MODELS.copyrights, new
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category },
     price: { type: Number, default: 0 },
-    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
+    ticketNumber: { type: String, default: all_contracts_model_1.generateContractTicketNumber, unique: true, sparse: true },
     duration: { value: Number, unit: String },
     address: { type: String, default: null },
     searchKeywords: [String],

package/build/models/fundedTransactions.model.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FundedTransaction = exports.FundedTransactionStatus = 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 FundedTransactionStatus;
 (function (FundedTransactionStatus) {
@@ -10,6 +9,10 @@ var FundedTransactionStatus;
     FundedTransactionStatus["SUCCESS"] = "success";
     FundedTransactionStatus["FAILED"] = "failed";
 })(FundedTransactionStatus || (exports.FundedTransactionStatus = FundedTransactionStatus = {}));
+const generateFundedTransactionTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `FND${random}`;
+};
 exports.FundedTransaction = (0, mongoose_1.model)(model_names_1.MODELS.fundedTransaction, new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     createdBy: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
@@ -18,5 +21,5 @@ exports.FundedTransaction = (0, mongoose_1.model)(model_names_1.MODELS.fundedTra
     contract: { type: mongoose_1.Schema.Types.ObjectId },
     status: { type: String, default: FundedTransactionStatus.PENDING },
     withdrawMethod: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.withdrawMethod },
-    ticketNumber: { type: String, default: all_contracts_model_1.generateTicketNumber, unique: true, sparse: true },
+    ticketNumber: { type: String, default: generateFundedTransactionTicketNumber, unique: true, sparse: true },
 }, { timestamps: true, collection: model_names_1.MODELS.fundedTransaction }));

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

@@ -32,6 +32,7 @@ export interface IPage {
         ar: string;
         en: string;
     };
+    slug: string;
 }
 export declare const Pages: import("mongoose").Model<IPage, {}, {}, {}, import("mongoose").Document<unknown, {}, IPage> & IPage & {
     _id: import("mongoose").Types.ObjectId;

package/build/models/pages.model.js

@@ -6,6 +6,7 @@ const model_names_1 = require("../types/model-names");
 exports.Pages = (0, mongoose_1.model)(model_names_1.MODELS.page, new mongoose_1.Schema({
     title: { ar: { type: String, default: null }, en: { type: String, default: null } },
     content: { ar: { type: String, default: null }, en: { type: String, default: null } },
+    slug: { type: String, unique: true, sparse: true },
 }, {
     timestamps: true,
     collection: model_names_1.MODELS.page,

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

@@ -2,7 +2,6 @@
 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) {
@@ -10,9 +9,13 @@ var InviteStatus;
     InviteStatus["rejected"] = "rejected";
     InviteStatus["pending"] = "pending";
 })(InviteStatus || (exports.InviteStatus = InviteStatus = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `PRT${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: 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.model.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Producer = void 0;
 const mongoose_1 = require("mongoose");
-const all_contracts_model_1 = require("./all-contracts.model");
 const model_names_1 = require("../types/model-names");
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `PRD${random}`;
+};
 exports.Producer = (0, mongoose_1.model)(model_names_1.MODELS.producer, 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 },
+    ticketNumber: { type: String, default: generateTicketNumber, unique: true, sparse: true },
     category: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.category,

package/build/models/producer_contracts.model.js

@@ -2,7 +2,6 @@
 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,8 +12,12 @@ var ContractStatus;
     ContractStatus["acceptedWithUpdate"] = "accepted with update";
     ContractStatus["complaint"] = "complaint";
 })(ContractStatus || (exports.ContractStatus = ContractStatus = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `PRC${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: 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.js

@@ -2,7 +2,6 @@
 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;
@@ -17,9 +16,13 @@ var ProjectContractStatus;
     ProjectContractStatus["rejected"] = "rejected";
     ProjectContractStatus["complaint"] = "complaint";
 })(ProjectContractStatus || (exports.ProjectContractStatus = ProjectContractStatus = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `PRJC${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: 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: [

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

@@ -2,7 +2,6 @@
 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,8 +13,12 @@ var RentalContractStatus;
     RentalContractStatus["rejected"] = "rejected";
     RentalContractStatus["complaint"] = "complaint";
 })(RentalContractStatus || (exports.RentalContractStatus = RentalContractStatus = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `RNTC${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: 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.js

@@ -2,7 +2,6 @@
 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) {
@@ -12,9 +11,13 @@ var RentalUnits;
     RentalUnits["months"] = "months";
     RentalUnits["weeks"] = "weeks";
 })(RentalUnits || (exports.RentalUnits = RentalUnits = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `RNT${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: 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.js

@@ -2,10 +2,13 @@
 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");
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `RPT${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: generateTicketNumber, unique: true, sparse: true },
     sourceUser: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,

package/build/models/teamProject.model.js

@@ -2,12 +2,15 @@
 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");
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `TPT${random}`;
+};
 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 },
+    ticketNumber: { type: String, default: generateTicketNumber, unique: true, sparse: true },
     cover: { type: String, default: null },
     title: { type: String, default: null },
     desc: { type: String, default: null },

package/build/models/transactions.model.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Transaction = exports.TransactionType = exports.TransactionStatus = 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 TransactionStatus;
 (function (TransactionStatus) {
@@ -16,6 +15,10 @@ var TransactionType;
     TransactionType["DEPOSIT"] = "deposit";
     TransactionType["WITHDRAW"] = "withdraw";
 })(TransactionType || (exports.TransactionType = TransactionType = {}));
+const generateTicketNumber = () => {
+    const random = Math.floor(100000 + Math.random() * 900000); // 6-digit random number
+    return `TRN${random}`;
+};
 exports.Transaction = (0, mongoose_1.model)(model_names_1.MODELS.transaction, new mongoose_1.Schema({
     currency: { type: String, default: 'EGP' },
     amount: { type: Number, default: 0 },
@@ -30,5 +33,16 @@ exports.Transaction = (0, mongoose_1.model)(model_names_1.MODELS.transaction, ne
     fundAttachment: { type: [String], default: [] },
     fundingAmount: { type: Number, default: 0 },
     fundedBy: { 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 },
+    ticketNumber: { type: String, default: generateTicketNumber, unique: true, sparse: true },
+}, {
+    timestamps: true,
+    collection: model_names_1.MODELS.transaction,
+    toJSON: {
+        transform: (doc, ret) => {
+            if (ret.fundAttachment) {
+                ret.fundAttachment = ret.fundAttachment.map((attachment) => `${process.env.BUCKET_HOST}/${attachment}`);
+            }
+            return ret;
+        },
+    },
 }));

package/package.json

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