Dev to Main Sync

constants/application.ts

@@ -48,6 +48,11 @@ const APPLICATION_STATUS = {
  * Business requirement: Applications created after this date are considered reviewed
  * and cannot be resubmitted. This date marks the start of the new application review cycle.
  */
+const APPLICATION_SCORE = {
+  INITIAL_SCORE: 50,
+  NUDGE_BONUS: 10,
+};
+
 const APPLICATION_REVIEW_CYCLE_START_DATE = new Date("2026-01-01T00:00:00.000Z");
 
 module.exports = {
@@ -57,5 +62,6 @@ module.exports = {
   APPLICATION_ERROR_MESSAGES,
   APPLICATION_LOG_MESSAGES,
   APPLICATION_REVIEW_CYCLE_START_DATE,
-  APPLICATION_STATUS
+  APPLICATION_STATUS,
+  APPLICATION_SCORE
 };

controllers/applications.ts

@@ -202,6 +202,7 @@ const nudgeApplication = async (req: CustomRequest, res: CustomResponse) => {
           message: API_RESPONSE_MESSAGES.NUDGE_SUCCESS,
           nudgeCount: result.nudgeCount,
           lastNudgeAt: result.lastNudgeAt,
+          score: result.score,
         });
       default:
         return res.boom.badImplementation(INTERNAL_SERVER_ERROR);

controllers/users.js

@@ -561,6 +561,30 @@ const updateSelf = async (req, res, next) => {
   }
 };
 
+const handleUserPictureUpload = async (req, res) => {
+  if (req.body.type === "application") {
+    return postApplicationUserPicture(req, res);
+  }
+  return postUserPicture(req, res);
+};
+
+const postApplicationUserPicture = async (req, res) => {
+  const { file } = req;
+  const { id: userId } = req.userData;
+  const { coordinates } = req.body;
+  try {
+    const coordinatesObject = coordinates && JSON.parse(coordinates);
+    const imageData = await imageService.uploadProfilePicture({ file, userId, coordinates: coordinatesObject });
+    return res.status(201).json({
+      message: "Application picture uploaded successfully!",
+      image: imageData,
+    });
+  } catch (error) {
+    logger.error(`Error while uploading application picture: ${error}`);
+    return res.boom.badImplementation(INTERNAL_SERVER_ERROR);
+  }
+};
+
 /**
  * Post user profile picture
  *
@@ -1186,4 +1210,5 @@ module.exports = {
   getIdentityStats,
   updateUsernames,
   updateProfile,
+  handleUserPictureUpload,
 };

middlewares/pictureRouteMiddleware.js

@@ -0,0 +1,8 @@
+const skipWhenApplicationType = (middleware) => {
+  return (req, res, next) => {
+    if (req.body.type === "application") return next();
+    return middleware(req, res, next);
+  };
+};
+
+module.exports = skipWhenApplicationType;

middlewares/validators/application.ts

@@ -31,7 +31,7 @@ const validateApplicationData = async (req: CustomRequest, res: CustomResponse,
       userId: joi.string().optional(),
       firstName: joi.string().min(1).required(),
       lastName: joi.string().min(1).required(),
-      college: joi.string().min(1).required(),
+      institution: joi.string().min(1).required(),
       skills: joi.string().min(5).required(),
       city: joi.string().min(1).required(),
       state: joi.string().min(1).required(),
@@ -130,6 +130,15 @@ const validateApplicationUpdateData = async (req: CustomRequest, res: CustomResp
     .strict()
     .min(1)
     .keys({
+      institution: joi.string().min(1).optional(),
+      skills: joi.string().min(5).optional(),
+      city: joi.string().min(1).optional(),
+      state: joi.string().min(1).optional(),
+      country: joi.string().min(1).optional(),
+      role: joi
+        .string()
+        .valid(...Object.values(APPLICATION_ROLES))
+        .optional(),
       imageUrl: joi.string().uri().optional(),
       foundFrom: joi.string().min(1).optional(),
       introduction: joi.string().min(1).optional(),

models/applications.ts

@@ -4,7 +4,7 @@ const { logType } = require("../constants/logs");
 const firestore = require("../utils/firestore");
 const logger = require("../utils/logger");
 const ApplicationsModel = firestore.collection("applicants");
-const { APPLICATION_STATUS_TYPES, APPLICATION_STATUS } = require("../constants/application");
+const { APPLICATION_STATUS_TYPES, APPLICATION_STATUS, APPLICATION_SCORE } = require("../constants/application");
 const { convertDaysToMilliseconds } = require("../utils/time");
 
 const getAllApplications = async (limit: number, lastDocId?: string) => {
@@ -16,7 +16,7 @@ const getAllApplications = async (limit: number, lastDocId?: string) => {
       lastDoc = await ApplicationsModel.doc(lastDocId).get();
     }
 
-    let dbQuery = ApplicationsModel.orderBy("createdAt", "desc");
+    let dbQuery = ApplicationsModel.where("isNew", "==", true).orderBy("createdAt", "desc");
 
     if (lastDoc) {
       dbQuery = dbQuery.startAfter(lastDoc);
@@ -59,7 +59,7 @@ const getApplicationsBasedOnStatus = async (status: string, limit: number, lastD
   try {
     let lastDoc = null;
     const applications = [];
-    let dbQuery = ApplicationsModel.where("status", "==", status);
+    let dbQuery = ApplicationsModel.where("isNew", "==", true).where("status", "==", status);
 
     if (userId) {
       dbQuery = dbQuery.where("userId", "==", userId);
@@ -86,7 +86,7 @@ const getApplicationsBasedOnStatus = async (status: string, limit: number, lastD
       });
     });
 
-    let countQuery = ApplicationsModel.where("status", "==", status);
+    let countQuery = ApplicationsModel.where("isNew", "==", true).where("status", "==", status);
 
     const totalApplications = await countQuery.get();
     const totalCount = totalApplications.size;
@@ -219,16 +219,19 @@ const nudgeApplication = async ({ applicationId, userId }: { applicationId: stri
     const currentNudgeCount = application.nudgeCount || 0;
     const updatedNudgeCount = currentNudgeCount + 1;
     const newLastNudgeAt = new Date(currentTime).toISOString();
+    const updatedScore = (application.score || 0) + APPLICATION_SCORE.NUDGE_BONUS;
 
     transaction.update(applicationRef, {
       nudgeCount: updatedNudgeCount,
       lastNudgeAt: newLastNudgeAt,
+      score: updatedScore,
     });
 
     return {
       status: APPLICATION_STATUS.success,
       nudgeCount: updatedNudgeCount,
       lastNudgeAt: newLastNudgeAt,
+      score: updatedScore,
     };
   });
 

models/discordactions.js

@@ -404,6 +404,7 @@ const updateIdleUsersOnDiscord = async (dev) => {
   let allUsersHavingGroupIdle = [];
   let groupIdleRole;
   let groupIdleRoleId;
+  const allMavens = [];
 
   try {
     groupIdleRole = await getGroupRole("group-idle");

routes/users.js

@@ -15,6 +15,7 @@
 const { devFlagMiddleware } = require("../middlewares/devFlag");
 const { userAuthorization } = require("../middlewares/userAuthorization");
 const conditionalMiddleware = require("../middlewares/conditionalMiddleware");
+const skipWhenApplicationType = require("../middlewares/pictureRouteMiddleware");
 
 router.post("/", authorizeAndAuthenticate([ROLES.SUPERUSER], [Services.CRON_JOB_HANDLER]), users.markUnverified);
 router.post("/update-in-discord", authenticate, authorizeRoles([SUPERUSER]), users.setInDiscordScript);
@@ -65,7 +66,13 @@
 );
 
 // upload.single('profile') -> multer inmemory storage of file for type multipart/form-data
-router.post("/picture", authenticate, checkIsVerifiedDiscord, upload.single("profile"), users.postUserPicture);
+router.post(
+  "/picture",
+  authenticate,
+  upload.single("profile"),
+  skipWhenApplicationType(checkIsVerifiedDiscord),
+  users.handleUserPictureUpload
+);
 router.patch(
   "/picture/verify/:id",
   authenticate,

services/applicationService.ts

@@ -5,6 +5,7 @@ const {
   APPLICATION_STATUS_TYPES,
   APPLICATION_ERROR_MESSAGES,
   APPLICATION_REVIEW_CYCLE_START_DATE,
+  APPLICATION_SCORE,
 } = require("../constants/application");
 const logger = require("../utils/logger");
 
@@ -31,7 +32,7 @@ const transformPayloadToApplication = (payload: applicationPayload, userId: stri
       country: payload.country,
     },
     professional: {
-      institution: payload.college,
+      institution: payload.institution,
       skills: payload.skills,
     },
     intro: {
@@ -86,7 +87,7 @@ export const createApplicationService = async (
 
     const applicationData: application = {
       ...transformPayloadToApplication(payload, userId),
-      score: 0,
+      score: APPLICATION_SCORE.INITIAL_SCORE,
       status: APPLICATION_STATUS_TYPES.PENDING,
       createdAt,
       isNew: true,

test/fixtures/applications/applications.ts

@@ -3,7 +3,7 @@ module.exports = () => {
     {
       firstName: "vinayak",
       lastName: "triveid",
-      college: "Christ Church college",
+      institution: "Christ Church institution",
       skills: "React, Ember, Node js",
       city: "Kanpur",
       state: "Uttar Pradesh",
@@ -21,12 +21,13 @@ module.exports = () => {
       },
       createdAt: null,
       role: "developer",
+      isNew: true,
     },
     {
       userId: "xyajkdfsfsd",
       firstName: "Ritik",
       lastName: "Jaiwal",
-      college: "Tata Consultancy services",
+      institution: "Tata Consultancy services",
       skills: "React, Ember, Node js",
       city: "Bangalore",
       state: "Karnataka",
@@ -44,9 +45,10 @@ module.exports = () => {
       },
       createdAt: null,
       role: "developer",
+      isNew: true,
     },
     {
-      college: "Groww",
+      institution: "Groww",
       state: "Karnataka",
       firstName: "Vaibhav",
       lastName: "Desai",
@@ -68,9 +70,10 @@ module.exports = () => {
       status: "rejected",
       createdAt: null,
       role: "developer",
+      isNew: true,
     },
     {
-      college: "Groww",
+      institution: "Groww",
       state: "Karnataka",
       firstName: "Vaibhav",
       lastName: "Desai",
@@ -92,9 +95,10 @@ module.exports = () => {
       status: "rejected",
       createdAt: null,
       role: "developer",
+      isNew: true,
     },
     {
-      college: "Groww",
+      institution: "Groww",
       state: "Karnataka",
       firstName: "Vaibhav",
       lastName: "Desai",
@@ -116,9 +120,10 @@ module.exports = () => {
       status: "rejected",
       createdAt: null,
       role: "developer",
+      isNew: true,
     },
     {
-      college: "Groww",
+      institution: "Groww",
       state: "Karnataka",
       firstName: "Vaibhav",
       lastName: "Desai",
@@ -145,7 +150,7 @@ module.exports = () => {
       city: "Kanpur",
       state: "UP",
       country: "India",
-      college: "Christ Church College",
+      institution: "Christ Church College",
       skills: "React, NodeJs, Ember",
       introduction:
         "mattis aliquam faucibus purus in massa tempor nec feugiat nisl pretium fusce id velit ut tortor pretium viverra suspendisse potenti nullam ac tortor vitae purus faucibus ornare suspendisse sed nisi lacus sed viverra tellus in hac habitasse platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus at augue eget arcu dictum varius duis at consectetur lorem donec massa sapien faucibus et molestie ac feugiat sed lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt ornare massa eget egestas purus viverra accumsan in nisl nisi scelerisque eu ultrices vitae auctor eu augue ut lectus arcu bibendum at",