@duvdu-v1/duvdu 1.1.146 → 1.1.148

package/build/index.d.ts

@@ -69,6 +69,7 @@ export * from './models/all-contracts.model';
 export * from './models/producer_contracts.model';
 export * from './models/rental.model';
 export * from './models/Review.model';
+export * from './models/projectViews.model';
 export * from './services/category.service';
 export * from './services/projectView.service';
 export * from './types/notification.type';

package/build/index.js

@@ -87,6 +87,7 @@ __exportStar(require("./models/all-contracts.model"), exports);
 __exportStar(require("./models/producer_contracts.model"), exports);
 __exportStar(require("./models/rental.model"), exports);
 __exportStar(require("./models/Review.model"), exports);
+__exportStar(require("./models/projectViews.model"), exports);
 __exportStar(require("./services/category.service"), exports);
 __exportStar(require("./services/projectView.service"), exports);
 __exportStar(require("./types/notification.type"), exports);

package/build/middlewares/auth.middleware.js

@@ -52,26 +52,36 @@ 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));
+        next();
     }
     catch (error) {
-        // return res.status(423).json({ message: 'access token expired' });
-        const user = yield User_model_1.Users.findOne({ token: req.session.refresh });
-        if (!user)
-            return res.status(423).json({ message: 'refresh token expired' });
-        const role = yield Role_model_1.Roles.findById(user.role);
-        if (!role)
-            return res.status(423).json({ message: 'invalid role' });
-        const accessToken = (0, exports.generateAccessToken)({
-            id: user.id,
-            isVerified: user.isVerified,
-            isBlocked: user.isBlocked,
-            role: { key: role.key, permissions: role.permissions },
-        });
-        req.session.access = accessToken;
-        req.session.refresh = user.token;
-        next();
+        try {
+            const payload = (0, jsonwebtoken_1.verify)(req.session.refresh, process.env.JWT_KEY);
+            const user = yield User_model_1.Users.findById(payload.id);
+            if (!user)
+                return res.status(423).json({ message: 'token expired' });
+            if (user.isBlocked.value)
+                return next(new unauthorized_error_1.UnauthorizedError({
+                    en: `Forbidden: User is blocked ${req.loggedUser.isBlocked.reason}`,
+                    ar: ` ممنوع: المستخدم محظور ${req.loggedUser.isBlocked.reason}`,
+                }, req.lang));
+            const role = yield Role_model_1.Roles.findById(user.role);
+            if (!role)
+                return res.status(423).json({ message: 'invalid role' });
+            const accessToken = (0, exports.generateAccessToken)({
+                id: user.id,
+                isVerified: user.isVerified,
+                isBlocked: user.isBlocked,
+                role: { key: role.key, permissions: role.permissions },
+            });
+            req.session.access = accessToken;
+            req.loggedUser = (0, jsonwebtoken_1.verify)(accessToken, process.env.JWT_KEY);
+            next();
+        }
+        catch (error) {
+            return res.status(423).json({ message: 'token expired' });
+        }
     }
-    next();
 });
 exports.isauthenticated = isauthenticated;
 const generateAccessToken = (payload) => jsonwebtoken_1.default.sign(payload, process.env.JWT_KEY, {

package/build/models/User.model.js

@@ -25,7 +25,7 @@ const userSchema = new mongoose_1.Schema({
     password: String,
     verificationCode: { code: String, expireAt: Date, reason: { type: String, default: null } },
     isVerified: { type: Boolean, default: false },
-    token: String,
+    refreshTokens: { token: { type: String, default: null }, fingerprint: { type: String, default: null }, clientType: { 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 } },

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

@@ -0,0 +1,36 @@
+/// <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/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Types } from 'mongoose';
+interface IProjectView {
+    user: Types.ObjectId;
+    project: Types.ObjectId;
+    ref: string;
+    count: number;
+    date: Date;
+}
+export declare const ProjectView: import("mongoose").Model<IProjectView, {}, {}, {}, import("mongoose").Document<unknown, {}, IProjectView> & IProjectView & {
+    _id: Types.ObjectId;
+}, any>;
+export {};

package/build/models/projectViews.model.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectView = void 0;
+const mongoose_1 = require("mongoose");
+const model_names_1 = require("../types/model-names");
+var RefModels;
+(function (RefModels) {
+    RefModels["copyright"] = "portfolio-post";
+    RefModels["studio"] = "studio-booking";
+})(RefModels || (RefModels = {}));
+const projectViewSchema = new mongoose_1.Schema({
+    user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
+    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 }
+}, { 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/services/projectView.service.d.ts

@@ -1,29 +1 @@
-/// <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/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose/types/inferschematype" />
-import { Document } from 'mongoose';
-import { Iuser } from '../types/User';
-type UserDocument = Document & Iuser;
-export declare const incrementProjectsView: (userId: string) => Promise<UserDocument>;
-export {};
+export declare const incrementProjectsView: (userId: string, projectId: string, lang: string) => Promise<void>;

package/build/services/projectView.service.js

@@ -10,16 +10,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.incrementProjectsView = void 0;
+const notfound_error_1 = require("../errors/notfound-error");
+const allProjects_model_1 = require("../models/allProjects.model");
+const projectViews_model_1 = require("../models/projectViews.model");
 const User_model_1 = require("../models/User.model");
-const incrementProjectsView = (userId) => __awaiter(void 0, void 0, void 0, function* () {
+const incrementProjectsView = (userId, projectId, lang) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const user = yield User_model_1.Users.findById(userId);
-        if (!user) {
-            throw new Error('User not found');
-        }
+        const project = yield allProjects_model_1.Project.findOne({ project: projectId });
+        if (!user)
+            throw new notfound_error_1.NotFound({ en: 'user not found', ar: 'لم يتم العثور على المستخدم' }, lang);
         user.projectsView += 1;
         yield user.save();
-        return user;
+        if (!project)
+            throw new notfound_error_1.NotFound({ en: 'project not found', ar: 'لم يتم العثور على المشروع' }, lang);
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+        const update = yield projectViews_model_1.ProjectView.updateOne({ user: userId, project: project._id, date: today }, { $inc: { count: 1 }, $setOnInsert: { ref: project.cycle, date: today } }, { upsert: true });
+        if (!update.upsertedId) {
+            yield projectViews_model_1.ProjectView.updateOne({ user: userId, project: project._id, date: today }, { $inc: { count: 1 } });
+        }
     }
     catch (error) {
         console.error('Error incrementing projectsView:', error);

package/build/types/User.d.ts

@@ -53,7 +53,11 @@ export interface Iuser {
         reason?: VerificationReason;
     };
     isVerified: boolean;
-    token?: string;
+    refreshTokens?: {
+        fingerprint: string;
+        clientType: string;
+        token: string;
+    };
     profileImage?: string;
     coverImage?: string;
     location?: {

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

@@ -28,5 +28,6 @@ export declare enum MODELS {
     allContracts = "all_contracts",
     contractReports = "contract_reports",
     projectReview = "project_reviews",
-    contractReview = "contract_review"
+    contractReview = "contract_review",
+    projectsViews = "projects_views"
 }

package/build/types/model-names.js

@@ -33,4 +33,5 @@ var MODELS;
     MODELS["contractReports"] = "contract_reports";
     MODELS["projectReview"] = "project_reviews";
     MODELS["contractReview"] = "contract_review";
+    MODELS["projectsViews"] = "projects_views";
 })(MODELS || (exports.MODELS = MODELS = {}));

package/package.json

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