Merge branch 'main' of https://github.com/priyam-03/Recruitify

Author: priyam-03

backend/controllers/jobController.js

@@ -10,7 +10,7 @@ const { index } = require("../vector_database/connectVectorDB.js");
 exports.createJobForms = catchAsyncErrors(async (req, res) => {
   try {
     const userId = req.user._id;
-    const { content } = req.body;
+    const content = req.body.content || {};
 
     const formDetails = {
       ownerProfile: userId,
@@ -70,8 +70,10 @@ exports.createJobForms = catchAsyncErrors(async (req, res) => {
 
     const newJobForm = new JobApplicationForm(formDetails);
     const jobForm = await newJobForm.save();
-    createJobSkillRelation(jobForm);
-    await addJobDataToVDB(jobForm._id);
+    await createJobSkillRelation(jobForm);
+    const similarJobids = await addJobDataToVDB(jobForm._id);
+    jobForm.similarJobs = similarJobids;
+    await jobForm.save();
     res.status(200).json(jobForm);
   } catch (error) {
     console.error(error);
@@ -205,7 +207,12 @@ exports.fetchJobById = catchAsyncErrors(async (req, res) => {
       .populate({
         path: "requiredSkills",
         // select: "_id skill",
-      });
+      })
+      .populate({
+        path: "similarJobs",
+        select: "_id jobRole company",
+        model: "JobApplicationForm"
+      })
     res.status(200).json(formData);
   } catch (error) {
     res.status(500).json({ error: "Internal server error" });

backend/models/jobForms.js

@@ -4,29 +4,34 @@ const Userauth = require("./userModel.js");
 const Skill = require("./skillModel.js");
 
 const JobApplicationFormSchema = new Schema({
+
   jobRole: {
     type: String,
     required: [true, "Please Enter Job Role"],
     maxLength: [50, "Job Role exceed 50 characters"],
     minLength: [2, "Job Role have less than 5 characters"],
   },
+
   jobLocation: {
     type: String,
     required: [true, "Please Enter Job Location"],
     maxLength: [100, "Job Location exceed 100 characters"],
     minLength: [3, "Job Location have more than 4 characters"],
   },
+
   jobLocationType: {
     type: String,
     enum: ["On-site", "Remote"],
     required: false,
   },
+
   company: {
     type: String,
     required: [true, "Please Enter Company Name"],
     maxLength: [50, "Company Name exceed 50 characters"],
     minLength: [2, "Company Name have more than  1 characters"],
   },
+
   requiredSkills: [
     {
       type: mongoose.Schema.Types.ObjectId,
@@ -75,6 +80,14 @@ const JobApplicationFormSchema = new Schema({
     },
   ],
 
+  similarJobs: [
+    {
+      type: mongoose.Schema.Types.ObjectId,
+      required: false,
+      ref: "JobApplicationForm",
+    },
+  ],
+
   timestamp: { type: Date, default: Date.now },
   updated: { type: Date },
 });
@@ -83,7 +96,6 @@ JobApplicationFormSchema.pre("save", function (next) {
   let isError = false;
   let errStr = "";
 
-  // Checking totalDuration
   if (
     this.totalDuration &&
     this.totalDuration.value &&
@@ -93,14 +105,12 @@ JobApplicationFormSchema.pre("save", function (next) {
     isError = true;
   }
 
-  // Checking workingHours
   if (this.workingHours && this.workingHours.value && !this.workingHours.mode) {
     if (isError) errStr += ", ";
     errStr += "Working-hours-mode (as working hour is mentioned)";
     isError = true;
   }
 
-  // Checking salary
   if (
     this.salary &&
     this.salary.value &&

backend/vector_database/addJobData.js

@@ -4,7 +4,7 @@ const { index } = require('./connectVectorDB.js');
 const connectDatabase = require('../database/database.js');
 
 const makeLower = (text) => {
-    if (!text) return ''; 
+    if (!text) return '';
     return text
         .split(' ')
         .map((word) => word.toLowerCase())
@@ -19,39 +19,71 @@ const add_batch_data_to_vdb = async () => {
             console.log("No jobs found.");
             return;
         }
-        
-        let modifiedJobs = jobs.map((job) => ({
-            id: job._id.toString(),
-            description:makeLower(job.jobRole) + " " + makeLower(job.jobDescription)
-        }));
-
-        for(let job of modifiedJobs){
-            await index.upsert({
-                id: job.id,
-                data: job.description
-              });
+
+        for (let job of jobs) {
+            const queryText = makeLower(job.jobRole) + " " + makeLower(job.jobDescription);
+            const fetchedJobIds = await index.query({
+                data: queryText,
+                topK: 5,
+                includeVectors: false,
+                includeMetadata: false,
+            });
+
+            if (!fetchedJobIds || !Array.isArray(fetchedJobIds)) {
+                console.log(fetchedJobIds);
+                throw new Error(
+                    "Invalid response format: 'result' is undefined or not an array"
+                );
+            }
+
+            const similarJobids = fetchedJobIds.map((job) => {
+                if (!job.id) throw new Error("Missing 'id' field in one of the results");
+                return mongoose.Types.ObjectId(job.id);
+            });
+            job.similarJobs = similarJobids;
+            await job.save();
         }
         console.log("batch job successfully added to the vector database.");
 
     } catch (error) {
         console.error("Error while adding data to vector DB:", error);
     }
-    finally{
+    finally {
         mongoose.connection.close();
     }
 };
 
-const addJobDataToVDB = async(jobId) =>{
+const addJobDataToVDB = async (jobId) => {
     try {
         const job = await JobApplicationForm.findById(jobId).select('_id jobRole jobDescription');
         if (!job || job.length === 0) {
             console.log("No jobs found.");
             return;
         }
 
+        const queryText = makeLower(job.jobRole) + " " + makeLower(job.jobDescription);
+        const fetchedJobIds = await index.query({
+            data: queryText,
+            topK: 5,
+            includeVectors: false,
+            includeMetadata: false,
+        });
+
+        if (!fetchedJobIds || !Array.isArray(fetchedJobIds)) {
+            console.log(fetchedJobIds);
+            throw new Error(
+                "Invalid response format: 'result' is undefined or not an array"
+            );
+        }
+
+        const similarJobids = fetchedJobIds.map((job) => {
+            if (!job.id) throw new Error("Missing 'id' field in one of the results");
+            return mongoose.Types.ObjectId(job.id);
+        });
+
         const modifiedJob = {
             id: job._id.toString(),
-            description: makeLower(job.jobRole) + " " + makeLower(job.jobDescription),
+            description: queryText,
         };
 
         await index.upsert({
@@ -60,6 +92,7 @@ const addJobDataToVDB = async(jobId) =>{
         });
 
         console.log("Job successfully added to the vector database.");
+        return similarJobids;
 
     } catch (error) {
         console.error("Error while adding data to vector DB:", error);