Merge pull request #1932 from OneCommunityGlobal/Neeraj_Fix_Multi_Category_Filter_Backend

Neeraj Fix Multi Category Filtering

Author: one-community

src/controllers/jobsController.js

@@ -1,167 +1,168 @@
-const Job = require('../models/jobs'); // Import the Job model
+const Job = require('../models/jobs');
 const JobPositionCategory = require('../models/jobPositionCategory');
-// Controller to fetch all jobs with pagination, search, and filtering
+
+/* ============================================================
+   INTERNAL: MAIN PAGINATION + FILTERING LOGIC
+   ============================================================ */
 const paginationForJobs = async (req, res) => {
   const { page = 1, limit = 18, search = '', category = '', position = '' } = req.query;
 
   try {
-    // Validate query parameters
-    const pageNumber = Math.max(1, parseInt(page, 10)); // Ensure page is at least 1
-    const limitNumber = Math.max(1, parseInt(limit, 10)); // Ensure limit is at least 1
+    const pageNumber = Math.max(1, parseInt(page, 10));
+    const limitNumber = Math.max(1, parseInt(limit, 10));
 
-    // Build query conditions
     const conditions = [];
-    const [allCategories, allPositions] = await Promise.all([
-      JobPositionCategory.distinct('category'),
-      JobPositionCategory.distinct('position'),
-    ]);
 
-    if (search) {
-      const searchString = String(search);
+    /* ----------------------------
+       SEARCH FILTER
+       ---------------------------- */
+    if (search && search.trim() !== '') {
+      const searchString = search.trim();
       conditions.push({
         $or: [
           { title: { $regex: new RegExp(searchString, 'i') } },
           { description: { $regex: new RegExp(searchString, 'i') } },
         ],
       });
-    } // Case-insensitive search
-
-    if (position) conditions.push({ title: { $in: [position] } });
+    }
 
-    if (category) conditions.push({ category: { $in: [category] } });
+    /* ----------------------------
+       POSITION FILTER (only if non-empty)
+       ---------------------------- */
+    if (position && position.trim() !== '') {
+      conditions.push({ title: { $in: [position.trim()] } });
+    }
 
-    if (allCategories.length) conditions.push({ category: { $in: allCategories } });
-    if (allPositions.length) conditions.push({ title: { $in: allPositions } });
-    // Final query
+    /* ----------------------------
+       MULTI-CATEGORY FILTER (only if non-empty)
+       ---------------------------- */
+    if (category && category.trim() !== '') {
+      const categoryList = category.split(',').map((c) => c.trim());
+      conditions.push({ category: { $in: categoryList } });
+    }
 
     const query = conditions.length ? { $and: conditions } : {};
+
     const totalJobs = await Job.countDocuments(query);
+    const totalPages = Math.ceil(totalJobs / limitNumber);
 
-    const totalPages = Math.ceil(totalJobs / limitNumber); // was 20
+    const pageNum = pageNumber > totalPages ? 1 : pageNumber;
 
-    let pageNum;
-    if (pageNumber > totalPages) pageNum = 1;
-    else pageNum = pageNumber;
-    // Fetch paginated results
     const jobs = await Job.find(query)
       .skip((pageNum - 1) * limitNumber)
       .limit(limitNumber);
 
-    // Prepare response
     res.json({
       jobs,
       pagination: {
         totalJobs,
-        totalPages: Math.ceil(totalJobs / limitNumber),
-        currentPage: pageNumber,
+        totalPages,
+        currentPage: pageNum,
         limit: limitNumber,
-        hasNextPage: pageNumber < Math.ceil(totalJobs / limitNumber),
-        hasPreviousPage: pageNumber > 1,
+        hasNextPage: pageNum < totalPages,
+        hasPreviousPage: pageNum > 1,
       },
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to fetch Jobs/Summaries', details: error.message });
+    res.status(500).json({
+      error: 'Failed to fetch Jobs',
+      details: error.message,
+    });
   }
 };
 
-// Controller to fetch all jobs with pagination, search, and filtering
-const getJobs = (req, res) => paginationForJobs(req, res, false);
+/* ============================================================
+   EXPORT: GET JOBS WITH PAGINATION
+   ============================================================ */
+const getJobs = (req, res) => paginationForJobs(req, res);
 
-// Controller to fetch job summaries with pagination, search, filtering, and sorting
+/* ============================================================
+   JOB SUMMARIES
+   ============================================================ */
 const getJobSummaries = async (req, res) => {
   const { search = '', category = '', position = '' } = req.query;
 
   try {
-    // Build query conditions
     const conditions = [];
-    const [allCategories, allPositions] = await Promise.all([
-      JobPositionCategory.distinct('category'),
-      JobPositionCategory.distinct('position'),
-    ]);
 
-    if (search) {
-      const searchString = String(search);
+    if (search && search.trim() !== '') {
+      const searchString = search.trim();
       conditions.push({
         $or: [
           { title: { $regex: new RegExp(searchString, 'i') } },
           { description: { $regex: new RegExp(searchString, 'i') } },
         ],
       });
-    } // Case-insensitive search
-
-    if (position) conditions.push({ title: { $in: [position] } });
+    }
 
-    if (category) conditions.push({ category: { $in: [category] } });
+    if (position && position.trim() !== '') {
+      conditions.push({ title: { $in: [position.trim()] } });
+    }
 
-    if (allCategories.length) conditions.push({ category: { $in: allCategories } });
-    if (allPositions.length) conditions.push({ title: { $in: allPositions } });
-    // Final query
+    if (category && category.trim() !== '') {
+      const categoryList = category.split(',').map((c) => c.trim());
+      conditions.push({ category: { $in: categoryList } });
+    }
 
     const query = conditions.length ? { $and: conditions } : {};
 
-    // Sorting logic
     const sortCriteria = {
       displayOrder: 1,
       featured: -1,
       datePosted: -1,
       title: 1,
     };
 
-    // Fetch the total number of jobs matching the query for pagination
     const totalJobs = await Job.countDocuments(query);
     const jobs = await Job.find(query)
       .select('title category location description datePosted featured jobDetailsLink')
       .sort(sortCriteria);
 
-    res.json({
-      jobs,
-      totalJobs,
-    });
+    res.json({ jobs, totalJobs });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to fetch job summaries', details: error.message });
+    res.status(500).json({
+      error: 'Failed to fetch job summaries',
+      details: error.message,
+    });
   }
 };
 
-// Controller to fetch job title suggestions for a dropdown
+/* ============================================================
+   OTHER CONTROLLERS
+   ============================================================ */
 const getJobTitleSuggestions = async (req, res) => {
   const { query = '' } = req.query;
-
   try {
-    const suggestions = await Job.find({ title: { $regex: query, $options: 'i' } }).distinct(
-      'title',
-    );
+    const suggestions = await Job.find({
+      title: { $regex: query, $options: 'i' },
+    }).distinct('title');
 
     res.json({ suggestions });
   } catch (error) {
-    res
-      .status(500)
-      .json({ error: 'Failed to fetch job title suggestions', details: error.message });
+    res.status(500).json({ error: 'Failed to fetch job title suggestions' });
   }
 };
 
 const resetJobsFilters = async (req, res) => {
   const { page = 1, limit = 18 } = req.query;
 
   try {
-    // Validate pagination parameters
     const pageNumber = Math.max(1, parseInt(page, 10));
     const limitNumber = Math.max(1, parseInt(limit, 10));
 
-    // Sorting logic
     const sortCriteria = {
       displayOrder: 1,
       featured: -1,
       datePosted: -1,
       title: 1,
     };
-    // Fetch all jobs without filtering
+
     const totalJobs = await Job.countDocuments({});
     const jobs = await Job.find({})
       .sort(sortCriteria)
       .skip((pageNumber - 1) * limitNumber)
       .limit(limitNumber);
 
-    // Respond with all jobs and pagination metadata
     res.json({
       jobs,
       pagination: {
@@ -174,64 +175,50 @@ const resetJobsFilters = async (req, res) => {
       },
     });
   } catch (error) {
-    res
-      .status(500)
-      .json({ error: 'Failed to reset filters or reload jobs', details: error.message });
+    res.status(500).json({ error: 'Failed to reset filters', details: error.message });
   }
 };
 
 const getCategories = async (req, res) => {
   try {
-    //    const categories = await Job.distinct('category', {});
     const categories = await JobPositionCategory.distinct('category', {});
-    // Sort categories alphabetically
     categories.sort((a, b) => a.localeCompare(b));
-
     res.status(200).json({ categories });
-  } catch (error) {
+  } catch {
     res.status(500).json({ message: 'Failed to fetch categories' });
   }
 };
+
 const getPositions = async (req, res) => {
   try {
     const positions = await JobPositionCategory.distinct('position', {});
-
-    // Sort categories alphabetically
     positions.sort((a, b) => a.localeCompare(b));
-
     res.status(200).json({ positions });
-  } catch (error) {
+  } catch {
     res.status(500).json({ message: 'Failed to fetch positions' });
   }
 };
 
-// Controller to fetch job details by ID
 const getJobById = async (req, res) => {
   const { id } = req.params;
-
   try {
     const job = await Job.findById(id);
-    if (!job) {
-      return res.status(404).json({ error: 'Job not found' });
-    }
+    if (!job) return res.status(404).json({ error: 'Job not found' });
     res.json(job);
   } catch (error) {
     res.status(500).json({ error: 'Failed to fetch job', details: error.message });
   }
 };
 
-// Controller to create a new job
 const createJob = async (req, res) => {
   const { title, category, description, imageUrl, location, applyLink, jobDetailsLink } = req.body;
 
   try {
-    // Find the highest displayOrder value currently in use
     const highestOrderJob = await Job.findOne().sort({ displayOrder: -1 }).limit(1);
     const newDisplayOrder = highestOrderJob ? highestOrderJob.displayOrder + 1 : 0;
 
     const newJob = new Job({
       title,
-      //  summaries,
       category,
       description,
       imageUrl,
@@ -248,47 +235,37 @@ const createJob = async (req, res) => {
   }
 };
 
-// Controller to update an existing job by ID
 const updateJob = async (req, res) => {
   const { id } = req.params;
 
   try {
     const updatedJob = await Job.findByIdAndUpdate(id, req.body, { new: true });
-    if (!updatedJob) {
-      return res.status(404).json({ error: 'Job not found' });
-    }
+    if (!updatedJob) return res.status(404).json({ error: 'Job not found' });
     res.json(updatedJob);
   } catch (error) {
     res.status(500).json({ error: 'Failed to update job', details: error.message });
   }
 };
 
-// Controller to delete a job by ID
 const deleteJob = async (req, res) => {
   const { id } = req.params;
 
   try {
     const deletedJob = await Job.findByIdAndDelete(id);
-    if (!deletedJob) {
-      return res.status(404).json({ error: 'Job not found' });
-    }
+    if (!deletedJob) return res.status(404).json({ error: 'Job not found' });
     res.json({ message: 'Job deleted successfully' });
   } catch (error) {
     res.status(500).json({ error: 'Failed to delete job', details: error.message });
   }
 };
 
-// Controller to reorder jobs
 const reorderJobs = async (req, res) => {
   const { jobIds } = req.body;
 
   try {
-    // Validate input
-    if (!Array.isArray(jobIds) || jobIds.length === 0) {
+    if (!Array.isArray(jobIds) || jobIds.length === 0)
       return res.status(400).json({ error: 'Invalid job order data' });
-    }
 
-    // Update the order of each job
     const updateOperations = jobIds.map((jobId, index) => ({
       updateOne: {
         filter: { _id: jobId },
@@ -298,7 +275,6 @@ const reorderJobs = async (req, res) => {
 
     await Job.bulkWrite(updateOperations);
 
-    // Fetch and return the updated jobs
     const jobs = await Job.find({ _id: { $in: jobIds } }).sort({ displayOrder: 1 });
 
     res.json({
@@ -311,7 +287,6 @@ const reorderJobs = async (req, res) => {
   }
 };
 
-// Export controllers as a plain object
 module.exports = {
   getJobs,
   getJobTitleSuggestions,