@duvdu-v1/duvdu 1.1.252 → 1.1.254

package/build/middlewares/auth.middleware.js

@@ -72,6 +72,8 @@ const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, fu
                     en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,
                     ar: ` ممنوع: المستخدم محظور ${req.loggedUser.isBlocked.reason}`,
                 }, req.lang));
+            if (user.isDeleted)
+                return next(new unauthorized_error_1.UnauthorizedError({ en: 'user not found', ar: 'لا يوجد مستخدم' }, req.lang));
             const role = yield Role_model_1.Roles.findById(user.role);
             if (!role)
                 return res.status(423).json({ message: 'invalid role' });

package/build/middlewares/optional-auth.middleware.js

@@ -24,6 +24,8 @@ const optionalAuthenticated = (req, res, next) => __awaiter(void 0, void 0, void
                 en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,
                 ar: ` ممنوع: المستخدم محظور ${req.loggedUser.isBlocked.reason}`,
             }, req.lang));
+        if (req.loggedUser.isDeleted)
+            return next(new unauthorized_error_1.UnauthorizedError({ en: 'user not found', ar: 'لا يوجد مستخدم' }, req.lang));
     }
     catch (error) {
         return next();

package/build/models/User.model.js

@@ -18,6 +18,7 @@ const userSchema = new mongoose_1.Schema({
     appleId: { type: String, default: null },
     email: { type: String, unique: true, sparse: true },
     name: { type: String, default: null },
+    isDeleted: { type: Boolean, default: false },
     phoneNumber: {
         key: { type: String, default: null },
         number: { type: String, unique: true, sparse: true },

package/build/models/copyright-contract.model.d.ts

@@ -41,6 +41,11 @@ export declare enum SubmitFilesStatus {
     approved = "approved",
     rejected = "rejected"
 }
+export declare enum RequestedDeadlineStatus {
+    pending = "pending",
+    approved = "approved",
+    rejected = "rejected"
+}
 export interface IcopyrightContract {
     id: string;
     customer: Types.ObjectId | Iuser;
@@ -79,6 +84,11 @@ export interface IcopyrightContract {
     }[];
     createdAt: Date;
     updatedAt: Date;
+    requestedDeadline: {
+        deadline: Date;
+        status: RequestedDeadlineStatus;
+        user: Types.ObjectId | Iuser;
+    };
 }
 export declare const CopyrightContracts: import("mongoose").Model<IcopyrightContract, {}, {}, {}, import("mongoose").Document<unknown, {}, IcopyrightContract> & IcopyrightContract & {
     _id: Types.ObjectId;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CopyrightContracts = exports.SubmitFilesStatus = exports.CopyrightContractStatus = void 0;
+exports.CopyrightContracts = exports.RequestedDeadlineStatus = exports.SubmitFilesStatus = exports.CopyrightContractStatus = void 0;
 const mongoose_1 = require("mongoose");
 const model_names_1 = require("../types/model-names");
 var CopyrightContractStatus;
@@ -21,6 +21,12 @@ var SubmitFilesStatus;
     SubmitFilesStatus["approved"] = "approved";
     SubmitFilesStatus["rejected"] = "rejected";
 })(SubmitFilesStatus || (exports.SubmitFilesStatus = SubmitFilesStatus = {}));
+var RequestedDeadlineStatus;
+(function (RequestedDeadlineStatus) {
+    RequestedDeadlineStatus["pending"] = "pending";
+    RequestedDeadlineStatus["approved"] = "approved";
+    RequestedDeadlineStatus["rejected"] = "rejected";
+})(RequestedDeadlineStatus || (exports.RequestedDeadlineStatus = RequestedDeadlineStatus = {}));
 exports.CopyrightContracts = (0, mongoose_1.model)(model_names_1.MODELS.copyrightContract, 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 },
@@ -52,4 +58,9 @@ exports.CopyrightContracts = (0, mongoose_1.model)(model_names_1.MODELS.copyrigh
     ],
     rejectedBy: { type: String, enum: ['sp', 'customer'], default: null },
     paymentLink: { type: String, default: null },
+    requestedDeadline: {
+        deadline: { type: Date, default: null },
+        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.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { Types } from 'mongoose';
-import { SubmitFilesStatus } from './copyright-contract.model';
+import { RequestedDeadlineStatus, SubmitFilesStatus } from './copyright-contract.model';
 import { IprojectCycle } from './portfolio-post.model';
 import { Iuser } from '../types/User';
 export declare enum ProjectContractStatus {
@@ -86,6 +86,11 @@ export interface IprojectContract {
         reason?: string;
         dateOfSubmission: Date;
     }[];
+    requestedDeadline: {
+        deadline: Date;
+        status: RequestedDeadlineStatus;
+        user: Types.ObjectId | Iuser;
+    };
 }
 export declare const ProjectContract: import("mongoose").Model<IprojectContract, {}, {}, {}, import("mongoose").Document<unknown, {}, IprojectContract> & IprojectContract & {
     _id: Types.ObjectId;

package/build/models/projectContract.model.js

@@ -67,4 +67,9 @@ exports.ProjectContract = (0, mongoose_1.model)(model_names_1.MODELS.projectCont
             status: { type: String, enum: copyright_contract_model_1.SubmitFilesStatus, default: copyright_contract_model_1.SubmitFilesStatus.pending },
         },
     ],
+    requestedDeadline: {
+        deadline: { type: Date, default: null },
+        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.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { Types } from 'mongoose';
-import { SubmitFilesStatus } from './copyright-contract.model';
+import { RequestedDeadlineStatus, SubmitFilesStatus } from './copyright-contract.model';
 import { Icategory } from '../types/Category';
 import { CYCLES } from '../types/cycles';
 import { Iuser } from '../types/User';
@@ -107,6 +107,11 @@ export interface ITeamContract {
         reason?: string;
         dateOfSubmission: Date;
     }[];
+    requestedDeadline: {
+        deadline: Date;
+        status: RequestedDeadlineStatus;
+        user: Types.ObjectId | Iuser;
+    };
 }
 export declare const TeamContract: import("mongoose").Model<ITeamContract, {}, {}, {}, import("mongoose").Document<unknown, {}, ITeamContract> & ITeamContract & {
     _id: Types.ObjectId;

package/build/models/teamProject.model.js

@@ -105,4 +105,9 @@ exports.TeamContract = (0, mongoose_1.model)(model_names_1.MODELS.teamContract,
             status: { type: String, enum: copyright_contract_model_1.SubmitFilesStatus, default: copyright_contract_model_1.SubmitFilesStatus.pending },
         },
     ],
+    requestedDeadline: {
+        deadline: { type: Date, default: null },
+        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.teamContract }));

package/build/types/User.d.ts

@@ -108,4 +108,5 @@ export interface Iuser {
     haveInvitation: boolean;
     faceRecognition: string | null;
     projectsCount: number;
+    isDeleted: boolean;
 }

package/package.json

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