@duvdu-v1/duvdu 1.1.224 → 1.1.226

package/build/models/User.model.js

@@ -53,10 +53,7 @@ const userSchema = new mongoose_1.Schema({
         value: { type: Boolean, default: false },
         reason: { type: String, default: null },
     },
-    notificationToken: {
-        type: String,
-        default: null,
-    },
+    fcmTokens: [{ fcmToken: String, deviceId: String }],
     followCount: {
         followers: { type: Number, default: 0 },
         following: { type: Number, default: 0 },
@@ -90,8 +87,10 @@ const userSchema = new mongoose_1.Schema({
     .index({ location: '2dsphere' });
 userSchema.pre('save', function (next) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (this.isModified('acceptedProjectsCounter'))
+        if (this.isModified('acceptedProjectsCounter') ||
+            this.isModified('likes')) {
             yield (0, rank_service_1.updateRankForUser)(this);
+        }
         next();
     });
 });

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

@@ -26,6 +26,9 @@
 export interface Irank {
     actionCount: number;
     rank: string;
+    favoriteCount: number;
+    projectsLiked: number;
+    projectsCount: number;
     color: string;
 }
 export declare const Rank: import("mongoose").Model<Irank, {}, {}, {}, import("mongoose").Document<unknown, {}, Irank> & Irank & {

package/build/models/ranks.model.js

@@ -7,4 +7,7 @@ exports.Rank = (0, mongoose_1.model)(model_names_1.MODELS.rank, new mongoose_1.S
     actionCount: { type: Number, unique: true, default: 0 },
     rank: { type: String, unique: true, default: null },
     color: { type: String, default: null },
+    favoriteCount: { type: Number, default: 0 },
+    projectsLiked: { type: Number, default: 0 },
+    projectsCount: { type: Number, default: 0 },
 }, { timestamps: true, collection: model_names_1.MODELS.rank }));

package/build/services/rank.service.js

@@ -10,21 +10,73 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateRankForUser = void 0;
+const allProjects_model_1 = require("../models/allProjects.model");
+const favourites_model_1 = require("../models/favourites.model");
 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 })
+    // get all user stats
+    const projectsCount = yield allProjects_model_1.Project.countDocuments({ user: user._id });
+    const favoriteCount = yield favourites_model_1.Favourites.countDocuments({ user: user._id });
+    const projectsLiked = user.likes;
+    const acceptedProjectsCounter = user.acceptedProjectsCounter;
+    // Find current rank that matches ALL criteria
+    const currentRank = yield ranks_model_1.Rank.findOne({
+        actionCount: { $lte: acceptedProjectsCounter },
+        favoriteCount: { $lte: favoriteCount },
+        projectsLiked: { $lte: projectsLiked },
+        projectsCount: { $lte: projectsCount }
+    })
+        .sort({
+        actionCount: -1,
+        favoriteCount: -1,
+        projectsLiked: -1,
+        projectsCount: -1
+    })
         .exec();
-    const nextRank = yield ranks_model_1.Rank.findOne({ actionCount: { $gt: user.acceptedProjectsCounter } })
-        .sort({ actionCount: 1 })
+    // Find next possible rank
+    const nextRank = yield ranks_model_1.Rank.findOne({
+        $or: [
+            { actionCount: { $gt: acceptedProjectsCounter } },
+            { favoriteCount: { $gt: favoriteCount } },
+            { projectsLiked: { $gt: projectsLiked } },
+            { projectsCount: { $gt: projectsCount } }
+        ]
+    })
+        .sort({
+        actionCount: 1,
+        favoriteCount: 1,
+        projectsLiked: 1,
+        projectsCount: 1
+    })
         .exec();
     if (currentRank) {
         user.rank.title = currentRank.rank;
         user.rank.color = currentRank.color;
         if (nextRank) {
-            const actionsNeeded = nextRank.actionCount - currentRank.actionCount;
-            const actionsCompleted = user.acceptedProjectsCounter - currentRank.actionCount;
-            user.rank.nextRangPercentage = (actionsCompleted / actionsNeeded) * 100;
+            // Calculate progress based on the most relevant criterion
+            const criteriaProgress = [
+                {
+                    completed: acceptedProjectsCounter - currentRank.actionCount,
+                    needed: nextRank.actionCount - currentRank.actionCount
+                },
+                {
+                    completed: favoriteCount - currentRank.favoriteCount,
+                    needed: nextRank.favoriteCount - currentRank.favoriteCount
+                },
+                {
+                    completed: projectsLiked - currentRank.projectsLiked,
+                    needed: nextRank.projectsLiked - currentRank.projectsLiked
+                },
+                {
+                    completed: projectsCount - currentRank.projectsCount,
+                    needed: nextRank.projectsCount - currentRank.projectsCount
+                }
+            ];
+            // Find the criterion with the highest progress percentage
+            const progress = criteriaProgress
+                .filter(c => c.needed > 0)
+                .map(c => (c.completed / c.needed) * 100);
+            user.rank.nextRangPercentage = progress.length ? Math.max(...progress) : 0;
             user.rank.nextRankTitle = nextRank.rank;
         }
         else {

package/build/types/User.d.ts

@@ -87,7 +87,10 @@ export interface Iuser {
         following: number;
         followers: number;
     };
-    notificationToken: string | null;
+    fcmTokens: {
+        fcmToken: string;
+        deviceId: string;
+    }[];
     isFollow?: boolean;
     favourites: {
         project: Types.ObjectId;

package/package.json

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