et --hard HEAD~1

commit 10ebe059d8cd9b9ef2b943ad3c1c561fde12e208 (HEAD -> job-pagination-v2)
Author: Mariz Youssef <mariz.youssef7@gamil.com>
Date:   Sat Dec 27 23:22:25 2025 +0200

    handle filter & search

diff --git a/src/DB/Models/JobListModel.js b/src/DB/Models/JobListModel.js
deleted file mode 100644
index 5585856..0000000
--- a/src/DB/Models/JobListModel.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import mongoose from "mongoose";
-import {
-  jobEmploymentTypeValues,
-  jobCategoryValues,
-} from "../../Constants/constants.js";
-// import { string } from "joi";
-
-
-const JobSchema = new mongoose.Schema(
-  {
-    title: {
-      type: String,
-      required: true, // role col
-      trim: true,
-    },
-
-    // jobType: {
-    //   type: String,
-    //   enum: jobEmploymentTypeValues,
-    //   required: true,
-    // },
-    jobType: String,
-
-    category: {
-      type: String,
-      enum: jobCategoryValues,
-    },
-
-    dueDate: {
-      type: Date,
-    },
-
-    companyId: {
-      type: mongoose.Schema.Types.ObjectId,
-      ref: "Company",
-      required: true,
-    },
-  },
-  { timestamps: true } //createdAt = Date Posted
-);
-
-const jobListModel=
-  mongoose.models.Job || mongoose.model("Job", JobSchema);
-
-export default jobListModel;
diff --git a/src/Modules/company/controllers/company.controller.js b/src/Modules/company/controllers/company.controller.js
index c484b01..988541c 100644
--- a/src/Modules/company/controllers/company.controller.js
+++ b/src/Modules/company/controllers/company.controller.js
@@ -35,7 +35,15 @@ catch(error){
 export const getMyCompanyJobs = async (req, res, next) => {
   try {
     const { companyId } = req.params;
-    const { page = 1, limit = 7 } = req.query;
+    const {
+      page = 1,
+      limit = 7,
+      status,
+      jobType,
+      fromDate,
+      toDate,
+      search,
+    } = req.query;
 
     if (!companyId) {
       return res.status(403).json({
@@ -43,10 +51,18 @@ export const getMyCompanyJobs = async (req, res, next) => {
       });
     }
 
+    const filters = {};
+    if (status) filters.status = status;
+    if (jobType) filters.jobType = jobType;
+    if (fromDate) filters.fromDate = fromDate;
+    if (toDate) filters.toDate = toDate;
+    if (search) filters.search = search;
+
     const jobs = await getJobsByCompanyIdService(
       companyId,
-      page,
-      limit
+      Number(page),
+      Number(limit),
+      filters
     );
 
     res.status(200).json({
@@ -58,3 +74,4 @@ export const getMyCompanyJobs = async (req, res, next) => {
   }
 };
 
+
diff --git a/src/Modules/company/services/company.service.js b/src/Modules/company/services/company.service.js
index d0e6cf4..89d13e2 100644
--- a/src/Modules/company/services/company.service.js
+++ b/src/Modules/company/services/company.service.js
@@ -1,8 +1,7 @@
 import CompanyModel from "../../../DB/Models/CompanyModel.js"
 import JobApplicationModel from "../../../DB/Models/JobApplicationModel.js";
-import jobListModel from "../../../DB/Models/JobListModel.js";
+import JobModel from "../../../DB/Models/JobModel.js";
 
-const now = new Date();
 
 export const getCompanyByIdService=async(companyId)=>{
     const company=await CompanyModel.findById(companyId);
@@ -15,38 +14,69 @@ export const createCompanyService= async(companyData)=>{
 }
 
 
-export const getJobsByCompanyIdService = async (companyId, page, limit) => {
+export const getJobsByCompanyIdService = async (
+  companyId,
+  page,
+  limit,
+  filters = {}
+) => {
   page = Number(page);
   limit = Number(limit);
   const skip = (page - 1) * limit;
 
-  const totalJobs = await jobListModel.countDocuments({ companyId });
+  const now = new Date();
+  const query = { companyId };
+
+  if (filters.search) {
+    query.title = { $regex: filters.search, $options: "i" };
+  }
+
+  if (filters.jobType) {
+    query.employmentType = filters.jobType;
+  }
+
+  if (filters.status === "live") {
+    query.isLive = true;
+    query.$or = [
+      { dueDate: { $gte: now } },
+      { dueDate: { $exists: false } },
+    ];
+  }
+
+  if (filters.status === "closed") {
+    query.$or = [
+      { isLive: false },
+      { dueDate: { $lt: now } },
+    ];
+  }
 
-  const jobs = await jobListModel
-    .find({ companyId })
-    .select("title status jobType dueDate createdAt") 
+  const totalJobs = await JobModel.countDocuments(query);
+
+  const jobs = await JobModel.find(query)
+    .select("title employmentType dueDate isLive postDate") 
     .sort({ createdAt: -1 })
     .skip(skip)
     .limit(limit)
     .lean();
 
-  const now = new Date();
-
   const jobsWithApplicantsCount = await Promise.all(
     jobs.map(async (job) => {
       const applicantsCount = await JobApplicationModel.countDocuments({
         jobId: job._id,
       });
 
-      const status = job.dueDate && new Date(job.dueDate) < now ? "closed" : "live";
+      const status =
+        job.isLive === false || (job.dueDate && job.dueDate < now)
+          ? "closed"
+          : "live";
 
       return {
         _id: job._id,
         title: job.title,
+        jobType: job.employmentType, 
         status,
-        jobType: job.jobType,
         dueDate: job.dueDate,
-        createdAt: job.createdAt,
+        createdAt: job.postDate,
         applicantsCount,
       };
     })
@@ -61,3 +91,4 @@ export const getJobsByCompanyIdService = async (companyId, page, limit) => {
   };
 };
 
+