Merge branch 'main' into david/fix-file-upload-for-events

Author: ChinemeremChigbo

.env.sample

@@ -13,4 +13,5 @@ POSTGRES_DATABASE=
 POSTGRES_PASSWORD=
 POSTGRES_USER=
 SISTEMA_PASSWORD=
-SISTEMA_EMAIL_DOMAIN=
+SISTEMA_EMAIL_DOMAIN=
+CRON_SECRET=

.github/workflows/cron-job.yml

@@ -2,15 +2,17 @@ name: Send Email Reminders for Missing Lessons
 
 on:
   schedule:
-    - cron: '0 0 * * *' # Runs every day at 00:00 UTC
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 jobs:
   call-api:
     runs-on: ubuntu-latest
     steps:
       - name: Log current time
-        run: date -u # Logs the current UTC time
+        run: date -u
 
       - name: Call reminders API
-        run: curl -X GET "${{ secrets.NEXT_PUBLIC_PROD_URL }}/api/reminders"
+        run: |
+          curl -X GET "${{ secrets.NEXT_PUBLIC_PROD_URL }}/api/reminders" \
+            -H "Authorization: Bearer ${{ secrets.CRON_SECRET }}"

README.md

@@ -1,8 +1,11 @@
 # Sistema Tacet
+
 ## Absence Calendar
+
 <img width="1728" alt="image" src="https://github.com/user-attachments/assets/7b6022b8-48a7-4192-9916-b1c3ef912780" />
 
 ## Admin Dashboard
+
 <img width="1728" alt="image" src="https://github.com/user-attachments/assets/642d3ff0-dbc0-44f0-80e0-f2fbbecaa916" />
 
 ## Setup

app/api/declareAbsence/route.ts

@@ -1,17 +1,28 @@
-import { NextResponse } from 'next/server';
 import { prisma } from '@utils/prisma';
+import { NextResponse } from 'next/server';
 
 export async function POST(req: Request) {
   try {
     const body = await req.json();
-    console.log(body);
+
+    const {
+      lessonDate,
+      reasonOfAbsence,
+      notes,
+      absentTeacherId,
+      substituteTeacherId,
+      locationId,
+      subjectId,
+      roomNumber,
+      lessonPlanFile,
+    } = body;
 
     if (
-      !body.lessonDate ||
-      !body.reasonOfAbsence ||
-      !body.absentTeacherId ||
-      !body.locationId ||
-      !body.subjectId
+      !lessonDate ||
+      !reasonOfAbsence ||
+      !absentTeacherId ||
+      !locationId ||
+      !subjectId
     ) {
       console.log('Missing required fields');
       return NextResponse.json(
@@ -23,28 +34,28 @@ export async function POST(req: Request) {
     const newAbsence = await prisma.$transaction(async (prisma) => {
       let lessonPlanId: number | null = null;
 
-      if (body.lessonPlanFile) {
+      if (lessonPlanFile) {
         const lessonPlan = await prisma.lessonPlanFile.create({
           data: {
-            name: body.lessonPlanFile.name,
-            url: body.lessonPlanFile.url,
-            size: body.lessonPlanFile.size,
+            name: lessonPlanFile.name,
+            url: lessonPlanFile.url,
+            size: lessonPlanFile.size,
           },
         });
         lessonPlanId = lessonPlan.id;
       }
 
       const absence = await prisma.absence.create({
         data: {
-          lessonDate: new Date(body.lessonDate),
+          lessonDate: new Date(lessonDate),
           lessonPlanId,
-          reasonOfAbsence: body.reasonOfAbsence,
-          notes: body.notes || null,
-          absentTeacherId: body.absentTeacherId,
-          substituteTeacherId: body.substituteTeacherId || null,
-          locationId: body.locationId,
-          subjectId: body.subjectId,
-          roomNumber: body.roomNumber || null,
+          reasonOfAbsence: reasonOfAbsence,
+          notes: notes || null,
+          absentTeacherId: absentTeacherId,
+          substituteTeacherId: substituteTeacherId || null,
+          locationId: locationId,
+          subjectId: subjectId,
+          roomNumber: roomNumber || null,
         },
       });
 

app/api/editAbsence/route.ts

@@ -0,0 +1,80 @@
+import { prisma } from '@utils/prisma';
+import { NextResponse } from 'next/server';
+
+export async function PUT(req: Request) {
+  try {
+    const body = await req.json();
+    const { id, lessonPlanFile, ...fields } = body;
+
+    if (!id) {
+      return NextResponse.json(
+        { error: 'Missing absence ID' },
+        { status: 400 }
+      );
+    }
+
+    const updatedAbsence = await prisma.$transaction(async (tx) => {
+      const existing = await tx.absence.findUnique({
+        where: { id },
+        include: { lessonPlan: true },
+      });
+
+      if (!existing) {
+        throw new Error(`Absence with ID ${id} not found.`);
+      }
+
+      const dataToUpdate: any = {};
+
+      if ('lessonDate' in fields)
+        dataToUpdate.lessonDate = new Date(fields.lessonDate);
+      if ('reasonOfAbsence' in fields)
+        dataToUpdate.reasonOfAbsence = fields.reasonOfAbsence;
+      if ('notes' in fields) dataToUpdate.notes = fields.notes || null;
+      if ('absentTeacherId' in fields)
+        dataToUpdate.absentTeacherId = fields.absentTeacherId;
+      if ('substituteTeacherId' in fields)
+        dataToUpdate.substituteTeacherId = fields.substituteTeacherId || null;
+      if ('locationId' in fields) dataToUpdate.locationId = fields.locationId;
+      if ('subjectId' in fields) dataToUpdate.subjectId = fields.subjectId;
+      if ('roomNumber' in fields)
+        dataToUpdate.roomNumber = fields.roomNumber || null;
+
+      if (lessonPlanFile) {
+        if (existing.lessonPlanId) {
+          await tx.absence.update({
+            where: { id },
+            data: { lessonPlanId: null },
+          });
+          await tx.lessonPlanFile.delete({
+            where: { id: existing.lessonPlanId },
+          });
+        }
+
+        const newLessonPlan = await tx.lessonPlanFile.create({
+          data: {
+            name: lessonPlanFile.name,
+            url: lessonPlanFile.url,
+            size: lessonPlanFile.size,
+          },
+        });
+
+        dataToUpdate.lessonPlanId = newLessonPlan.id;
+      }
+
+      const updated = await tx.absence.update({
+        where: { id },
+        data: dataToUpdate,
+      });
+
+      return updated;
+    });
+
+    return NextResponse.json(updatedAbsence, { status: 200 });
+  } catch (err) {
+    console.error('Error in PUT /api/editAbsence:', err.message || err);
+    return NextResponse.json(
+      { error: 'Internal Server Error', details: err.message },
+      { status: 500 }
+    );
+  }
+}

app/api/filter/locations/route.ts

@@ -1,6 +1,6 @@
 import { prisma } from '@utils/prisma';
-import { NextRequest, NextResponse } from 'next/server';
 import { Location } from '@utils/types';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function GET(req: NextRequest) {
   try {

app/api/filter/subjects/route.ts

@@ -1,6 +1,6 @@
 import { prisma } from '@utils/prisma';
-import { NextRequest, NextResponse } from 'next/server';
 import { SubjectAPI } from '@utils/types';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function GET(req: NextRequest) {
   try {

app/api/getAbsenceDates/route.ts

@@ -1,6 +1,6 @@
+import { YearlyAbsenceData } from '@utils/types';
 import { NextResponse } from 'next/server';
 import { getAbsenceYearRanges } from './absenceDates';
-import { YearlyAbsenceData } from '@utils/types';
 
 export async function GET() {
   try {

app/api/locations/[id]/route.ts

@@ -1,5 +1,5 @@
-import { NextRequest, NextResponse } from 'next/server';
 import { prisma } from '@utils/prisma';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function PATCH(
   request: NextRequest,

app/api/locations/route.ts

@@ -1,5 +1,5 @@
-import { NextRequest, NextResponse } from 'next/server';
 import { prisma } from '@utils/prisma';
+import { NextRequest, NextResponse } from 'next/server';
 
 export async function GET() {
   try {