fix: remove cancelled job option and optimize job proposals query (#106)

client/src/pages/Admin/Jobs.tsx

@@ -153,7 +153,6 @@ const Jobs = () => {
             <option value="in_progress">In Progress</option>
             <option value="completed">Completed</option>
             <option value="closed">Closed</option>
-            <option value="cancelled">Cancelled</option>
           </select>
         </div>
 

server/src/controllers/adminControllers/jobController.ts

@@ -85,20 +85,29 @@ export async function getJobs(req: Request, res: Response): Promise<void> {
 
     const jobsQuery = await db.query(queryString, queryParams);
 
-    const jobPrposalsQuery = await db.query(
-      `
+    let jobPrposalsQuery = { rows: [] };
+
+    if (jobsQuery.rows.length !== 0)
+      jobPrposalsQuery = await db.query(
+        `
       SELECT job_id, COUNT(*) AS proposals_count
       FROM proposals
       WHERE job_id IN (${jobsQuery.rows.map((job) => job.id).join(',')})
       GROUP BY job_id
     `,
+      );
+
+    const jobProposalsMap = jobPrposalsQuery.rows.reduce(
+      (
+        acc: { [key: string]: number },
+        row: { job_id: string; proposals_count: number },
+      ) => {
+        acc[row.job_id] = row.proposals_count;
+        return acc;
+      },
+      {},
     );
 
-    const jobProposalsMap = jobPrposalsQuery.rows.reduce((acc, row) => {
-      acc[row.job_id] = row.proposals_count;
-      return acc;
-    }, {});
-
     const jobs = jobsQuery.rows.map((job) => {
       return {
         id: job.id,