@duvdu-v1/duvdu 1.1.174 → 1.1.176

package/build/middlewares/auth.middleware.js

@@ -61,9 +61,9 @@ const isauthenticated = (req, res, next) => __awaiter(void 0, void 0, void 0, fu
                 _id: payload.id,
                 refreshTokens: {
                     $elemMatch: {
-                        token: req.session.refresh
-                    }
-                }
+                        token: req.session.refresh,
+                    },
+                },
             });
             if (!user)
                 return res.status(423).json({ message: 'token expired' });

package/build/middlewares/check-required-files.middleware.js

@@ -14,7 +14,10 @@ const checkRequiredFields = (options) => ((req, res, next) => {
     }
     else if (options.fields) {
         if (!req.files)
-            return next(new bad_request_error_1.BadRequestError({ en: `${options.fields.join(' ')} is required`, ar: `${options.fields.join(' ')} مطلوب` }, req.lang));
+            return next(new bad_request_error_1.BadRequestError({
+                en: `${options.fields.join(' ')} is required`,
+                ar: `${options.fields.join(' ')} مطلوب`,
+            }, req.lang));
         for (const field of options.fields) {
             if (!((_a = req.files) === null || _a === void 0 ? void 0 : _a[field]))
                 return next(new bad_request_error_1.BadRequestError({ en: `${field} is required`, ar: `${field} مطلوب` }));

package/build/middlewares/global-validator.middleware.js

@@ -28,7 +28,7 @@ const globalValidatorMiddleware = (req, res, next) => {
     if (!errors.isEmpty()) {
         const lang = req.lang;
         const language = loadLanguageFile(lang);
-        const translatedErrors = errors.array().map(error => (Object.assign(Object.assign({}, error), { msg: language[error.msg] || error.msg })));
+        const translatedErrors = errors.array().map((error) => (Object.assign(Object.assign({}, error), { msg: language[error.msg] || error.msg })));
         return next(new validation_error_1.ValidationError(translatedErrors));
     }
     req.body = (0, express_validator_1.matchedData)(req, { locations: ['body'] });

package/build/middlewares/upload-project-media.middleware.js

@@ -17,7 +17,11 @@ const uploadProjectMedia = (folder) => (0, multer_1.default)({
     }),
     limits: { fileSize: 100 * 1024 * 1024 },
     fileFilter(req, file, callback) {
-        if (file.mimetype.startsWith('image') || file.mimetype.startsWith('video') || file.mimetype === 'application/pdf' || file.mimetype === 'audio/mpeg' || file.mimetype === 'audio/wav')
+        if (file.mimetype.startsWith('image') ||
+            file.mimetype.startsWith('video') ||
+            file.mimetype === 'application/pdf' ||
+            file.mimetype === 'audio/mpeg' ||
+            file.mimetype === 'audio/wav')
             return callback(null, true);
         return callback(new bad_request_error_1.BadRequestError('invalid file format'));
     },

package/build/models/Review.model.js

@@ -9,7 +9,7 @@ exports.ProjectReview = (0, mongoose_1.model)(model_names_1.MODELS.projectReview
     project: { type: mongoose_1.Schema.Types.ObjectId },
     cycle: { type: String, enum: cycles_1.CYCLES },
     rate: { type: Number, default: 0 },
-    comment: { type: String, default: null }
+    comment: { type: String, default: null },
 }, { timestamps: true, collection: model_names_1.MODELS.projectReview }));
 exports.ContractReview = (0, mongoose_1.model)(model_names_1.MODELS.contractReview, new mongoose_1.Schema({
     sp: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
@@ -17,5 +17,5 @@ exports.ContractReview = (0, mongoose_1.model)(model_names_1.MODELS.contractRevi
     contract: { type: mongoose_1.Schema.Types.ObjectId },
     cycle: { type: String, enum: cycles_1.CYCLES },
     rate: { type: Number, default: 0 },
-    comment: { type: String, default: null }
+    comment: { type: String, default: null },
 }, { timestamps: true, collection: model_names_1.MODELS.contractReview }));

package/build/models/User.model.js

@@ -29,14 +29,15 @@ const userSchema = new mongoose_1.Schema({
     refreshTokens: [
         {
             token: { type: String, default: null },
-            fingerprint: { type: String, default: null },
-            clientType: { type: String, default: null },
-            userAgent: { type: String, default: null },
+            deviceId: { type: String, default: null },
         },
     ],
     profileImage: { type: String, default: 'defaults/profile.jpg' },
     coverImage: { type: String, default: null },
-    location: { lat: { type: Number, default: null }, lng: { type: Number, default: null } },
+    location: {
+        type: { type: String, default: 'Point' },
+        coordinates: { type: [Number], default: [31.2357, 30.0444] },
+    },
     category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category, default: null },
     acceptedProjectsCounter: { type: Number, default: 0 },
     profileViews: { type: Number, default: 0 },
@@ -80,7 +81,9 @@ const userSchema = new mongoose_1.Schema({
                 ret.profileImage = process.env.BUCKET_HOST + '/' + ret.profileImage;
         },
     },
-}).index({ name: 'text' });
+})
+    .index({ name: 'text' })
+    .index({ location: '2dsphere' });
 userSchema.pre('save', function (next) {
     return __awaiter(this, void 0, void 0, function* () {
         if (this.isModified('acceptedProjectsCounter'))

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

@@ -9,7 +9,7 @@ exports.Contracts = (0, mongoose_1.model)(model_names_1.MODELS.allContracts, new
     contract: { type: mongoose_1.Schema.Types.ObjectId, refPath: 'ref' },
     ref: String,
     cycle: { type: String, default: null },
-    coupons: [{ type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.coupon }]
+    coupons: [{ type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.coupon }],
 }, { timestamps: true, collection: model_names_1.MODELS.allContracts }));
 exports.ContractReports = (0, mongoose_1.model)(model_names_1.MODELS.contractReports, new mongoose_1.Schema({
     reporter: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },

package/build/models/category.model.js

@@ -39,7 +39,7 @@ const categorySchema = new mongoose_1.default.Schema({
         default: true,
     },
     trend: { type: Boolean, default: false },
-    media: { type: String, enum: ['image', 'video', 'audio'] }
+    media: { type: String, enum: ['image', 'video', 'audio'] },
 }, {
     timestamps: true,
     collection: model_names_1.MODELS.category,
@@ -55,6 +55,6 @@ categorySchema.set('toJSON', {
         if (ret.image)
             ret.image = process.env.BUCKET_HOST + '/' + ret.image;
         return ret;
-    }
+    },
 });
 exports.Categories = mongoose_1.default.model(model_names_1.MODELS.category, categorySchema);

package/build/models/coupon.model.js

@@ -6,7 +6,12 @@ const model_names_1 = require("../types/model-names");
 exports.Coupon = (0, mongoose_1.model)(model_names_1.MODELS.coupon, new mongoose_1.Schema({
     title: { en: { type: String, default: null }, ar: { type: String, default: null } },
     promoCode: { type: String, unique: true, sparse: true },
-    users: [{ user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user }, count: { type: Number, default: 0 } }],
+    users: [
+        {
+            user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+            count: { type: Number, default: 0 },
+        },
+    ],
     couponCount: { type: Number, default: 1 },
     couponCountAvaliable: { type: Number, default: 0 },
     userCount: { type: Number, default: 1 },
@@ -14,5 +19,5 @@ exports.Coupon = (0, mongoose_1.model)(model_names_1.MODELS.coupon, new mongoose
     percentage: { type: Number, default: null },
     expired: { type: Boolean, default: false },
     start: Date,
-    end: Date
+    end: Date,
 }, { timestamps: true, collection: model_names_1.MODELS.coupon }));

package/build/models/follow.model.js

@@ -5,5 +5,5 @@ const mongoose_1 = require("mongoose");
 const model_names_1 = require("../types/model-names");
 exports.Follow = (0, mongoose_1.model)(model_names_1.MODELS.follow, new mongoose_1.Schema({
     follower: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
-    following: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user }
+    following: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
 }, { timestamps: true, collection: model_names_1.MODELS.follow }));

package/build/models/messages.model.js

@@ -11,43 +11,48 @@ exports.Message = (0, mongoose_1.model)(model_names_1.MODELS.messages, new mongo
     sender: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,
-        required: true
+        required: true,
     },
     receiver: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,
-        required: true
+        required: true,
     },
     content: {
         type: String,
-        default: null
+        default: null,
     },
     reactions: [reactionSchema],
-    media: [{
+    media: [
+        {
             type: {
                 type: String,
-                default: null
+                default: null,
             },
             url: {
                 type: String,
-                default: null
+                default: null,
             },
-        }],
+        },
+    ],
     watched: {
         type: Boolean,
-        default: false
+        default: false,
     },
     updated: {
         type: Boolean,
-        default: false
-    }
-}, { timestamps: true, collection: model_names_1.MODELS.messages, toJSON: {
+        default: false,
+    },
+}, {
+    timestamps: true,
+    collection: model_names_1.MODELS.messages,
+    toJSON: {
         transform(doc, ret) {
             var _a;
             if ((_a = ret.media) === null || _a === void 0 ? void 0 : _a.url)
                 ret.media.url = process.env.BUCKET_HOST + '/' + ret.media.url;
-        }
-    }
+        },
+    },
 }));
 exports.Message.schema.set('toJSON', {
     transform: function (doc, ret) {
@@ -56,5 +61,5 @@ exports.Message.schema.set('toJSON', {
             ret.media.url = process.env.BUCKET_HOST + '/' + ret.media.url;
         }
         return ret;
-    }
+    },
 });

package/build/models/notification.model.js

@@ -8,7 +8,7 @@ exports.Notification = (0, mongoose_1.model)(model_names_1.MODELS.notifications,
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,
         // required:true
-        default: null
+        default: null,
     },
     targetUser: {
         type: mongoose_1.Schema.Types.ObjectId,

package/build/models/producer.model.js

@@ -6,14 +6,19 @@ const model_names_1 = require("../types/model-names");
 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
+        ref: model_names_1.MODELS.user,
     },
     category: {
         type: mongoose_1.Schema.Types.ObjectId,
-        ref: model_names_1.MODELS.category
+        ref: model_names_1.MODELS.category,
     },
-    subCategories: [{ title: { ar: { type: String, default: null }, en: { type: String, default: null } }, tags: [{ en: { type: String, default: null }, ar: { type: String, default: null } }] }],
+    subCategories: [
+        {
+            title: { ar: { type: String, default: null }, en: { type: String, default: null } },
+            tags: [{ en: { type: String, default: null }, ar: { type: String, default: null } }],
+        },
+    ],
     minBudget: { type: Number, default: null },
     maxBudget: { type: Number, default: null },
-    searchKeywords: [String]
+    searchKeywords: [String],
 }, { timestamps: true, collection: model_names_1.MODELS.producer }));

package/build/models/projectViews.model.js

@@ -13,7 +13,7 @@ const projectViewSchema = new mongoose_1.Schema({
     project: { type: mongoose_1.Schema.Types.ObjectId, refPath: 'ref' },
     ref: { type: String, enum: RefModels },
     count: { type: Number, default: 1 },
-    date: { type: Date, default: Date.now }
+    date: { type: Date, default: Date.now },
 }, { timestamps: true, collection: model_names_1.MODELS.projectsViews });
 projectViewSchema.index({ project: 1, ref: 1, date: 1 }, { unique: true });
 exports.ProjectView = (0, mongoose_1.model)(model_names_1.MODELS.projectsViews, projectViewSchema);

package/build/models/ranks.model.js

@@ -6,5 +6,5 @@ const model_names_1 = require("../types/model-names");
 exports.Rank = (0, mongoose_1.model)(model_names_1.MODELS.rank, new mongoose_1.Schema({
     actionCount: { type: Number, unique: true, default: 0 },
     rank: { type: String, unique: true, default: null },
-    color: { type: String, default: null }
+    color: { type: String, default: null },
 }, { timestamps: true, collection: model_names_1.MODELS.rank }));

package/build/models/settings.model.js

@@ -7,9 +7,11 @@ exports.Setting = (0, mongoose_1.model)(model_names_1.MODELS.setting, new mongoo
     expirationTime: [{ time: { type: Number, unique: true } }],
     default_profile: String,
     default_cover: String,
-    splash: [{
+    splash: [
+        {
             cover: { type: String, default: null },
             title: { type: String, default: null },
-            subTitle: { type: String, default: null }
-        }]
+            subTitle: { type: String, default: null },
+        },
+    ],
 }, { timestamps: true, collection: model_names_1.MODELS.setting }));

package/build/models/teamProject.model.js

@@ -7,91 +7,93 @@ const UserSchema = new mongoose_1.Schema({
     user: {
         type: mongoose_1.Schema.Types.ObjectId,
         ref: model_names_1.MODELS.user,
-        required: true
+        required: true,
     },
     workHours: {
         type: Number,
         required: true,
-        default: null
+        default: null,
     },
     totalAmount: {
         type: Number,
         required: true,
-        default: null
+        default: null,
     },
     status: {
         type: String,
         enum: ['pending', 'rejected', 'accepted'],
         required: true,
-        default: 'pending'
-    }
+        default: 'pending',
+    },
 });
 const CreativeSchema = new mongoose_1.Schema({
     category: {
         type: mongoose_1.Schema.Types.ObjectId,
         required: true,
-        ref: model_names_1.MODELS.category
+        ref: model_names_1.MODELS.category,
     },
-    users: [UserSchema]
+    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
+        ref: model_names_1.MODELS.user,
     },
     cover: {
         type: String,
-        default: null
+        default: null,
     },
     title: {
         type: String,
-        default: null
+        default: null,
     },
     budget: {
         type: Number,
-        default: null
+        default: null,
     },
     desc: {
         type: String,
-        default: null
+        default: null,
     },
     location: {
         lat: {
             type: Number,
-            default: null
+            default: null,
         },
         lng: {
             type: Number,
-            default: null
-        }
+            default: null,
+        },
     },
     address: {
         type: String,
-        default: null
+        default: null,
     },
     attachments: {
         type: [String],
-        default: null
+        default: null,
     },
     shootingDays: {
         type: Number,
-        default: null
+        default: null,
     },
     startDate: {
         type: Date,
-        default: null
+        default: null,
     },
     status: {
         type: String,
         enum: ['pending', 'completed'],
-        default: 'pending'
+        default: 'pending',
     },
     creatives: [CreativeSchema],
     isDeleted: {
         type: Boolean,
-        default: false
-    }
-}, { timestamps: true, collection: model_names_1.MODELS.teamProject,
+        default: false,
+    },
+}, {
+    timestamps: true,
+    collection: model_names_1.MODELS.teamProject,
     toJSON: {
         transform(doc, ret) {
             if (ret.cover)
@@ -99,5 +101,5 @@ exports.TeamProject = (0, mongoose_1.model)(model_names_1.MODELS.teamProject, ne
             if (ret.attachments)
                 ret.attachments = ret.attachments.map((el) => process.env.BUCKET_HOST + '/' + el);
         },
-    }
+    },
 }));

package/build/models/userSession.model.js

@@ -9,5 +9,5 @@ exports.userSession = (0, mongoose_1.model)(model_names_1.MODELS.userSession, ne
     accessToken: { type: String, default: null },
     refreshToken: { type: String, default: null },
     userAgent: { type: String, default: null },
-    clientType: { type: String, enum: ['web', 'mobile'], default: null }
+    clientType: { type: String, enum: ['web', 'mobile'], default: null },
 }, { timestamps: true }));

package/build/services/category.service.js

@@ -30,12 +30,19 @@ function filterTagsForCategory(categoryId, subcategoryId, tagIds, cycle, lang) {
         if (!subcategoryFound)
             throw new bad_request_error_1.BadRequestError({ en: 'Invalid subcategory', ar: 'فئة فرعية غير صالحة' }, lang);
         if (!subcategoryFound.tags || !Array.isArray(subcategoryFound.tags)) {
-            throw new bad_request_error_1.BadRequestError({ en: 'Subcategory does not contain valid tags', ar: 'الفئة الفرعية لا تحتوي على علامات صالحة' }, lang);
+            throw new bad_request_error_1.BadRequestError({
+                en: 'Subcategory does not contain valid tags',
+                ar: 'الفئة الفرعية لا تحتوي على علامات صالحة',
+            }, lang);
         }
         const filteredTags = subcategoryFound.tags.filter((tag) => tagIds.includes(tag._id.toString()));
         if (filteredTags.length !== tagIds.length)
             throw new bad_request_error_1.BadRequestError({ en: 'Invalid tags', ar: 'العلامات غير صالحة' }, lang);
-        return { subCategoryTitle: subcategoryFound.title, filteredTags, media: category.media ? category.media : undefined };
+        return {
+            subCategoryTitle: subcategoryFound.title,
+            filteredTags,
+            media: category.media ? category.media : undefined,
+        };
     });
 }
 exports.filterTagsForCategory = filterTagsForCategory;

package/build/services/rank.service.js

@@ -12,8 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateRankForUser = void 0;
 const ranks_model_1 = require("../models/ranks.model");
 const updateRankForUser = (user) => __awaiter(void 0, void 0, void 0, function* () {
-    const currentRank = yield ranks_model_1.Rank.findOne({ actionCount: { $lte: user.acceptedProjectsCounter } }).sort({ actionCount: -1 }).exec();
-    const nextRank = yield ranks_model_1.Rank.findOne({ actionCount: { $gt: user.acceptedProjectsCounter } }).sort({ actionCount: 1 }).exec();
+    const currentRank = yield ranks_model_1.Rank.findOne({ actionCount: { $lte: user.acceptedProjectsCounter } })
+        .sort({ actionCount: -1 })
+        .exec();
+    const nextRank = yield ranks_model_1.Rank.findOne({ actionCount: { $gt: user.acceptedProjectsCounter } })
+        .sort({ actionCount: 1 })
+        .exec();
     if (currentRank) {
         user.rank.title = currentRank.rank;
         user.rank.color = currentRank.color;

package/build/types/Permissions.js

@@ -119,7 +119,7 @@ exports.permissions = {
         PERMISSIONS.updateRoleHandler,
         PERMISSIONS.updateRoleHandler,
         PERMISSIONS.removeRoleHandler,
-        PERMISSIONS.getAllPermissions
+        PERMISSIONS.getAllPermissions,
     ],
     Post: [
         PERMISSIONS.createProjectHandler,
@@ -155,17 +155,13 @@ exports.permissions = {
     rank: [
         PERMISSIONS.createRankHandler,
         PERMISSIONS.updateRankHandler,
-        PERMISSIONS.deleteRankHandler
+        PERMISSIONS.deleteRankHandler,
     ],
     setting: [
         PERMISSIONS.createSettingHandler,
         PERMISSIONS.updateSettingHandler,
-        PERMISSIONS.deleteSettingHandler
+        PERMISSIONS.deleteSettingHandler,
     ],
-    producer: [
-        PERMISSIONS.getProducerAnalysis,
-    ],
-    dashboard: [
-        PERMISSIONS.accessDashboard
-    ]
+    producer: [PERMISSIONS.getProducerAnalysis],
+    dashboard: [PERMISSIONS.accessDashboard],
 };

package/build/types/User.d.ts

@@ -55,16 +55,14 @@ export interface Iuser {
     };
     isVerified: boolean;
     refreshTokens?: {
-        fingerprint: string;
-        clientType: string;
+        deviceId: string;
         token: string;
-        userAgent: string;
     }[];
     profileImage?: string;
     coverImage?: string;
-    location?: {
-        lat: number;
-        lng: number;
+    location: {
+        type: 'Point';
+        coordinates: [number, number];
     };
     category?: Types.ObjectId | Icategory;
     acceptedProjectsCounter: number;

package/build/types/notification_details.js

@@ -4,38 +4,38 @@ exports.NotificationDetails = void 0;
 exports.NotificationDetails = {
     newFollow: {
         title: 'new follow',
-        message: 'new follow'
+        message: 'new follow',
     },
     newMessage: {
         title: 'new message',
-        message: 'new message'
+        message: 'new message',
     },
     messageUpdated: {
         title: 'updated message',
-        message: 'updated message'
+        message: 'updated message',
     },
     newProducerContract: {
         title: 'new producer contract',
-        message: 'new producer contract'
+        message: 'new producer contract',
     },
     updatedProducerContract: {
         title: 'update producer contract',
-        message: 'update producer contract'
+        message: 'update producer contract',
     },
     newProjectContract: {
         title: 'new project contract',
-        message: 'new project contract'
+        message: 'new project contract',
     },
     updateProjectContract: {
         title: 'update project contract',
-        message: 'update project contract'
+        message: 'update project contract',
     },
     newTeamContract: {
         title: 'new Team contract',
-        message: 'new Team contract'
+        message: 'new Team contract',
     },
     updateTeamContract: {
         title: 'update Team contract',
-        message: 'update Team contract'
+        message: 'update Team contract',
     },
 };

package/build/utils/generateToken.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateToken = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const generateToken = (payload) => jsonwebtoken_1.default.sign(payload, process.env.JWT_KEY, {
-    expiresIn: '1m'
+    expiresIn: '1m',
 });
 exports.generateToken = generateToken;

package/package.json

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