Working DB with table promotions

routes/(apps)/mobility/(_islands)/ConsultStudents.tsx

@@ -11,83 +11,63 @@ interface Student {
   lastName: string;
   email: string;
   promotionId: number;
+  promotionName: string;
 }
 
 export default function ConsultStudents() {
-  const [promotions, setPromotions] = useState<Promotion[]>([]);
-  const [studentsByPromotion, setStudentsByPromotion] = useState<Record<number, Student[]>>({});
+  const [data, setData] = useState<{ promotions: Promotion[]; students: Student[] } | null>(null);
   const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
-    const fetchPromotionsAndStudents = async () => {
+    const fetchData = async () => {
       try {
-        const promoResponse = await fetch("/mobility/api/promotions");
-        if (!promoResponse.ok) {
-          throw new Error(`Error fetching promotions: ${promoResponse.statusText}`);
+        const response = await fetch("/mobility/api/insert_students");
+        if (!response.ok) {
+          throw new Error(`Error fetching data: ${response.statusText}`);
         }
-        const promos: Promotion[] = await promoResponse.json();
-        setPromotions(promos);
 
-        const studentsResponse = await fetch("/mobility/api/insert_students");
-        if (!studentsResponse.ok) {
-          throw new Error(`Error fetching students: ${studentsResponse.statusText}`);
-        }
-        const students: Student[] = await studentsResponse.json();
-
-        const grouped: Record<number, Student[]> = {};
-        for (const student of students) {
-          if (!grouped[student.promotionId]) {
-            grouped[student.promotionId] = [];
-          }
-          grouped[student.promotionId].push(student);
-        }
-        setStudentsByPromotion(grouped);
+        const result = await response.json();
+        setData(result);
       } catch (err) {
-        console.error("Error fetching promotions or students:", err);
+        console.error("Error fetching data:", err);
         setError("Failed to load data. Please try again later.");
       }
     };
 
-    fetchPromotionsAndStudents();
+    fetchData();
   }, []);
 
   return (
     <section>
       <h2>Consult Students</h2>
       {error && <p className="error">{error}</p>}
-      {promotions.length === 0 ? (
-        <p>No promotions found.</p>
-      ) : (
-        promotions.map((promo) => (
-          <div key={promo.id}>
-            <h3>Promotion: {promo.name}</h3>
-            {studentsByPromotion[promo.id]?.length ? (
-              <table>
-                <thead>
-                  <tr>
-                    <th>ID</th>
-                    <th>First Name</th>
-                    <th>Last Name</th>
-                    <th>Email</th>
+      {data?.promotions.map((promo) => (
+        <div key={promo.id}>
+          <h3>Promotion: {promo.name}</h3>
+          <table>
+            <thead>
+              <tr>
+                <th>ID</th>
+                <th>First Name</th>
+                <th>Last Name</th>
+                <th>Email</th>
+              </tr>
+            </thead>
+            <tbody>
+              {data.students
+                .filter((student) => student.promotionId === promo.id)
+                .map((student) => (
+                  <tr key={student.id}>
+                    <td>{student.id}</td>
+                    <td>{student.firstName}</td>
+                    <td>{student.lastName}</td>
+                    <td>{student.email}</td>
                   </tr>
-                </thead>
-                <tbody>
-                  {studentsByPromotion[promo.id].map((student) => (
-                    <tr key={student.id}>
-                      <td>{student.id}</td>
-                      <td>{student.firstName}</td>
-                      <td>{student.lastName}</td>
-                      <td>{student.email}</td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            ) : (
-              <p>No students in this promotion.</p>
-            )}
-          </div>
-        ))
-      )}
+                ))}
+            </tbody>
+          </table>
+        </div>
+      ))}
     </section>
   );
 }