Major updates on Master Statistical

src/pages/api/assignments/corporate/index.ts

@@ -5,7 +5,6 @@ import { sessionOptions } from "@/lib/session";
 import { getAllAssignersByCorporate } from "@/utils/groups.be";
 import { getAssignmentsByAssigners } from "@/utils/assignments.be";
 
-
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -20,17 +19,49 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 }
 
 async function GET(req: NextApiRequest, res: NextApiResponse) {
-  const { ids, startDate, endDate } = req.query as { ids: string, startDate?: string, endDate?: string };
+  const { ids, startDate, endDate } = req.query as {
+    ids: string;
+    startDate?: string;
+    endDate?: string;
+  };
 
   const startDateParsed = startDate ? new Date(startDate) : undefined;
   const endDateParsed = endDate ? new Date(endDate) : undefined;
   try {
     const idsList = ids.split(",");
 
-    const assigners = await Promise.all(idsList.map(getAllAssignersByCorporate));
-    const assignmentList = [...assigners.flat(), ...idsList];
-    const assignments = await getAssignmentsByAssigners(assignmentList, startDateParsed, endDateParsed);
-    res.status(200).json(assignments);
+    const assigners = await Promise.all(
+      idsList.map(async (id) => {
+        const assigners = await getAllAssignersByCorporate(id);
+        return {
+          corporateId: id,
+          assigners,
+        };
+      })
+    );
+
+    const assignments = await Promise.all(assigners.map(async (data) => {
+      try {
+        const assigners = [...new Set([...data.assigners, data.corporateId])];
+        const assignments = await getAssignmentsByAssigners(
+          assigners,
+          startDateParsed,
+          endDateParsed
+        );
+        return assignments.map((assignment) => ({
+          ...assignment,
+          corporateId: data.corporateId,
+        }));
+      } catch (err) {
+        console.error(err);
+        return [];
+      }
+    }));
+
+    console.log(assignments);
+
+    // const assignments = await getAssignmentsByAssigners(assignmentList, startDateParsed, endDateParsed);
+    res.status(200).json(assignments.flat());
   } catch (err: any) {
     res.status(500).json({ error: err.message });
   }