@duvdu-v1/duvdu 1.1.253 → 1.1.255

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/teamProject.model.d.ts

@@ -23,16 +23,8 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { Types } from 'mongoose';
-import { RequestedDeadlineStatus, SubmitFilesStatus } from './copyright-contract.model';
-import { Icategory } from '../types/Category';
-import { CYCLES } from '../types/cycles';
+import { IprojectContract } from './projectContract.model';
 import { Iuser } from '../types/User';
-export declare enum UserStatus {
-    accepted = "accepted",
-    rejected = "rejected",
-    pending = "pending",
-    canceled = "canceled"
-}
 export interface ITeamProject {
     user: Types.ObjectId | Iuser;
     cover: string;
@@ -44,75 +36,11 @@ export interface ITeamProject {
     };
     address: string;
     cycle: string;
-    creatives: [
-        {
-            category: Types.ObjectId | Icategory;
-            users: [
-                {
-                    user: Types.ObjectId | Iuser;
-                    attachments: string[];
-                    duration: number;
-                    startDate: Date;
-                    workHours: number;
-                    hourPrice: number;
-                    details: string;
-                    deadLine: Date;
-                    totalAmount: number;
-                    status: UserStatus;
-                    contract: Types.ObjectId;
-                }
-            ];
-        }
-    ];
+    contracts: {
+        contract: Types.ObjectId | IprojectContract;
+    }[];
     isDeleted: boolean;
 }
 export declare const TeamProject: import("mongoose").Model<ITeamProject, {}, {}, {}, import("mongoose").Document<unknown, {}, ITeamProject> & ITeamProject & {
     _id: Types.ObjectId;
 }, any>;
-export declare enum TeamContractStatus {
-    canceled = "canceled",
-    pending = "pending",
-    waitingForTotalPayment = "waiting-for-total-payment",
-    ongoing = "ongoing",
-    completed = "completed",
-    rejected = "rejected",
-    complaint = "complaint"
-}
-export interface ITeamContract {
-    sp: Types.ObjectId | Iuser;
-    customer: Types.ObjectId | Iuser;
-    project: Types.ObjectId | ITeamProject;
-    category: Types.ObjectId | Icategory;
-    startDate: Date;
-    duration: Date;
-    workHours: number;
-    hourPrice: number;
-    deadline: Date;
-    details: string;
-    attachments: string[];
-    totalPrice: number;
-    actionAt: Date;
-    rejectedBy?: 'customer' | 'sp';
-    paymentLink: string;
-    stageExpiration: number;
-    status: TeamContractStatus;
-    cycle: CYCLES;
-    createdAt: Date;
-    paymentAmount: number;
-    totalCheckoutAt: Date;
-    submitFiles: {
-        link: string;
-        notes: string;
-        status: SubmitFilesStatus;
-        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;
-}, any>;

package/build/models/teamProject.model.js

@@ -1,38 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TeamContract = exports.TeamContractStatus = exports.TeamProject = exports.UserStatus = void 0;
+exports.TeamProject = void 0;
 const mongoose_1 = require("mongoose");
-const copyright_contract_model_1 = require("./copyright-contract.model");
 const cycles_1 = require("../types/cycles");
 const model_names_1 = require("../types/model-names");
-var UserStatus;
-(function (UserStatus) {
-    UserStatus["accepted"] = "accepted";
-    UserStatus["rejected"] = "rejected";
-    UserStatus["pending"] = "pending";
-    UserStatus["canceled"] = "canceled";
-})(UserStatus || (exports.UserStatus = UserStatus = {}));
-const UserSchema = new mongoose_1.Schema({
-    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.user },
-    attachments: [String],
-    duration: { type: Number, default: 0 },
-    startDate: Date,
-    workHours: { type: Number, default: 0 },
-    hourPrice: { type: Number, default: 0 },
-    details: { type: String, default: null },
-    deadLine: Date,
-    totalAmount: { type: Number, default: 0 },
-    status: { type: String, enum: UserStatus, default: UserStatus.pending },
-});
-const CreativeSchema = new mongoose_1.Schema({
-    category: {
-        type: mongoose_1.Schema.Types.ObjectId,
-        required: true,
-        ref: model_names_1.MODELS.category,
-    },
-    users: [UserSchema],
-});
 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 },
     cover: { type: String, default: null },
@@ -40,7 +11,7 @@ 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 },
-    creatives: [CreativeSchema],
+    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 },
 }, {
@@ -50,64 +21,6 @@ exports.TeamProject = (0, mongoose_1.model)(model_names_1.MODELS.teamProject, ne
         transform(doc, ret) {
             if (ret.cover)
                 ret.cover = process.env.BUCKET_HOST + '/' + ret.cover;
-            if (ret.creatives && ret.creatives.length > 0) {
-                ret.creatives.forEach((creative) => {
-                    if (creative.users && creative.users.length > 0) {
-                        creative.users.forEach((user) => {
-                            if (user.attachments && user.attachments.length > 0) {
-                                user.attachments = user.attachments.map((attachment) => process.env.BUCKET_HOST + '/' + attachment);
-                            }
-                        });
-                    }
-                });
-            }
         },
     },
 }));
-// contract
-var TeamContractStatus;
-(function (TeamContractStatus) {
-    TeamContractStatus["canceled"] = "canceled";
-    TeamContractStatus["pending"] = "pending";
-    TeamContractStatus["waitingForTotalPayment"] = "waiting-for-total-payment";
-    TeamContractStatus["ongoing"] = "ongoing";
-    TeamContractStatus["completed"] = "completed";
-    TeamContractStatus["rejected"] = "rejected";
-    TeamContractStatus["complaint"] = "complaint";
-})(TeamContractStatus || (exports.TeamContractStatus = TeamContractStatus = {}));
-exports.TeamContract = (0, mongoose_1.model)(model_names_1.MODELS.teamContract, new mongoose_1.Schema({
-    sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
-    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.teamProject },
-    category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category },
-    startDate: Date,
-    duration: Date,
-    workHours: { type: Number, default: 0 },
-    hourPrice: { type: Number, default: 0 },
-    deadline: Date,
-    details: { type: String, default: null },
-    totalPrice: { type: Number, default: 0 },
-    actionAt: Date,
-    rejectedBy: { type: String, enum: ['customer', 'sp'] },
-    paymentLink: { type: String, default: null },
-    stageExpiration: { type: Number, default: 0 },
-    status: { type: String, enum: TeamContractStatus, default: TeamContractStatus.pending },
-    cycle: { type: String, default: cycles_1.CYCLES.teamProject },
-    paymentAmount: { type: Number, default: 0 },
-    attachments: [String],
-    totalCheckoutAt: Date,
-    submitFiles: [
-        {
-            link: { type: String, default: null },
-            notes: { type: String, default: null },
-            reason: { type: String, default: null },
-            dateOfSubmission: { type: Date, default: null },
-            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.253",
+  "version": "1.1.255",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [