@duvdu-v1/duvdu 1.1.262 → 1.1.264

package/build/index.d.ts

@@ -82,6 +82,7 @@ export * from './models/favourites.model';
 export * from './models/Bookmark.model';
 export * from './models/Bookmark-projects.model';
 export * from './models/contractCancel.model';
+export * from './models/transactions.model';
 export * from './services/category.service';
 export * from './services/projectView.service';
 export * from './services/rank.service';

package/build/index.js

@@ -99,6 +99,7 @@ __exportStar(require("./models/favourites.model"), exports);
 __exportStar(require("./models/Bookmark.model"), exports);
 __exportStar(require("./models/Bookmark-projects.model"), exports);
 __exportStar(require("./models/contractCancel.model"), exports);
+__exportStar(require("./models/transactions.model"), exports);
 __exportStar(require("./services/category.service"), exports);
 __exportStar(require("./services/projectView.service"), exports);
 __exportStar(require("./services/rank.service"), exports);

package/build/middlewares/redis-connection.d.ts

@@ -1,5 +1,5 @@
 import RedisStore from 'connect-redis';
-export declare const redisClient: import("@redis/client").RedisClientType<{
+export declare const getRedisClient: () => import("@redis/client").RedisClientType<{
     graph: {
         CONFIG_GET: typeof import("@redis/graph/dist/commands/CONFIG_GET");
         configGet: typeof import("@redis/graph/dist/commands/CONFIG_GET");
@@ -580,3 +580,4 @@ export declare const redisConnection: (url: string, password: string) => Promise
     };
 } & import("redis").RedisModules, import("redis").RedisFunctions, import("redis").RedisScripts>>;
 export declare const sessionStore: (url: string, password: string) => Promise<RedisStore>;
+export declare const cleanupRedis: () => Promise<void>;

package/build/middlewares/redis-connection.js

@@ -12,19 +12,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionStore = exports.redisConnection = exports.redisClient = void 0;
+exports.cleanupRedis = exports.sessionStore = exports.redisConnection = exports.getRedisClient = void 0;
 const connect_redis_1 = __importDefault(require("connect-redis"));
 const redis_1 = require("redis");
 const data_base_connections_1 = require("../errors/data-base-connections");
-exports.redisClient = (0, redis_1.createClient)({
-    url: process.env.REDIS_HOST,
-    password: process.env.REDIS_PASS,
-});
+let redisClient = null;
+const getRedisClient = () => {
+    if (!redisClient) {
+        redisClient = (0, redis_1.createClient)({
+            url: process.env.REDIS_HOST,
+            password: process.env.REDIS_PASS,
+        });
+        // Set a higher limit for event listeners
+        redisClient.setMaxListeners(20);
+    }
+    return redisClient;
+};
+exports.getRedisClient = getRedisClient;
 const redisConnection = (url, password) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield exports.redisClient.connect();
+        const client = (0, exports.getRedisClient)();
+        if (!client.isOpen) {
+            yield client.connect();
+        }
         console.log(`Redis connected in : ${url}`);
-        return exports.redisClient;
+        return client;
     }
     catch (error) {
         console.error(`Cannot connect to Redis: ${url}`, error);
@@ -33,6 +45,14 @@ const redisConnection = (url, password) => __awaiter(void 0, void 0, void 0, fun
 });
 exports.redisConnection = redisConnection;
 const sessionStore = (url, password) => __awaiter(void 0, void 0, void 0, function* () {
-    return new connect_redis_1.default({ client: exports.redisClient });
+    const client = (0, exports.getRedisClient)();
+    return new connect_redis_1.default({ client });
 });
 exports.sessionStore = sessionStore;
+const cleanupRedis = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (redisClient) {
+        yield redisClient.quit();
+        redisClient = null;
+    }
+});
+exports.cleanupRedis = cleanupRedis;

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

@@ -60,7 +60,11 @@ exports.CopyrightContracts = (0, mongoose_1.model)(model_names_1.MODELS.copyrigh
     paymentLink: { type: String, default: null },
     requestedDeadline: {
         deadline: { type: Date, default: null },
-        status: { type: String, enum: RequestedDeadlineStatus, default: RequestedDeadlineStatus.pending },
+        status: {
+            type: String,
+            enum: RequestedDeadlineStatus,
+            default: RequestedDeadlineStatus.pending,
+        },
         user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user, default: null },
     },
 }, { collection: model_names_1.MODELS.copyrightContract, timestamps: true }));

package/build/models/projectContract.model.js

@@ -69,7 +69,11 @@ exports.ProjectContract = (0, mongoose_1.model)(model_names_1.MODELS.projectCont
     ],
     requestedDeadline: {
         deadline: { type: Date, default: null },
-        status: { type: String, enum: copyright_contract_model_1.RequestedDeadlineStatus, default: copyright_contract_model_1.RequestedDeadlineStatus.pending },
+        status: {
+            type: String,
+            enum: copyright_contract_model_1.RequestedDeadlineStatus,
+            default: copyright_contract_model_1.RequestedDeadlineStatus.pending,
+        },
         user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user, default: null },
     },
 }, { timestamps: true, collection: model_names_1.MODELS.projectContract }));

package/build/models/teamProject.model.js

@@ -11,7 +11,12 @@ exports.TeamProject = (0, mongoose_1.model)(model_names_1.MODELS.teamProject, ne
     desc: { type: String, default: null },
     location: { lat: { type: Number, default: null }, lng: { type: Number, default: null } },
     address: { type: String, default: null },
-    relatedContracts: [{ category: { type: mongoose_1.Types.ObjectId, ref: model_names_1.MODELS.category }, contracts: [{ contract: { type: mongoose_1.Types.ObjectId, ref: model_names_1.MODELS.projectContract } }] }],
+    relatedContracts: [
+        {
+            category: { type: mongoose_1.Types.ObjectId, ref: model_names_1.MODELS.category },
+            contracts: [{ contract: { type: mongoose_1.Types.ObjectId, ref: model_names_1.MODELS.projectContract } }],
+        },
+    ],
     isDeleted: { type: Boolean, default: false },
     cycle: { type: String, default: cycles_1.CYCLES.teamProject },
 }, {

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

@@ -0,0 +1,42 @@
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Types } from 'mongoose';
+export declare enum TransactionStatus {
+    PENDING = "pending",
+    SUCCESS = "success",
+    FAILED = "failed"
+}
+export interface ITransaction {
+    currency: string;
+    amount: number;
+    user: Types.ObjectId;
+    contract: Types.ObjectId;
+    status: string;
+    timeStamp: Date;
+    model: string;
+}
+export declare const Transaction: import("mongoose").Model<ITransaction, {}, {}, {}, import("mongoose").Document<unknown, {}, ITransaction> & ITransaction & {
+    _id: Types.ObjectId;
+}, any>;

package/build/models/transactions.model.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transaction = exports.TransactionStatus = void 0;
+const mongoose_1 = require("mongoose");
+const model_names_1 = require("../types/model-names");
+var TransactionStatus;
+(function (TransactionStatus) {
+    TransactionStatus["PENDING"] = "pending";
+    TransactionStatus["SUCCESS"] = "success";
+    TransactionStatus["FAILED"] = "failed";
+})(TransactionStatus || (exports.TransactionStatus = TransactionStatus = {}));
+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 },
+    user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    contract: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.contracts },
+    status: { type: String, default: TransactionStatus.PENDING },
+    timeStamp: { type: Date, default: Date.now },
+    model: { type: String, default: null },
+}));

package/build/types/model-names.d.ts

@@ -38,5 +38,6 @@ export declare enum MODELS {
     teamContract = "team_contracts",
     favourites = "favourites",
     contractCancel = "contract_cancel",
-    withdrawMethod = "withdraw-methods"
+    withdrawMethod = "withdraw-methods",
+    transaction = "transactions"
 }

package/build/types/model-names.js

@@ -43,4 +43,5 @@ var MODELS;
     MODELS["favourites"] = "favourites";
     MODELS["contractCancel"] = "contract_cancel";
     MODELS["withdrawMethod"] = "withdraw-methods";
+    MODELS["transaction"] = "transactions";
 })(MODELS || (exports.MODELS = MODELS = {}));

package/package.json

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