Squash

Author: ChinemeremChigbo

.env.sample

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

.eslintrc.json

@@ -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 }}"

.github/workflows/cron-job.yml

@@ -1,14 +1,25 @@
-# Sistema
+# Sistema Tacet
 
-## Setup
+## Preview
 
-- Make sure you have been added to the [UW Blueprint Github Workspace](https://github.com/uwblueprint/).
-- Install Docker Desktop ([MacOS](https://docs.docker.com/docker-for-mac/install/) | [Windows](https://docs.docker.com/desktop/install/windows-install/) | [Linux](https://docs.docker.com/engine/install/#server)) and ensure that it is running.
-- Install [Node.js](https://nodejs.org/) (v22 tested). It's recommended to use [NVM (Node Version Manager)](https://github.com/nvm-sh/nvm) to manage your Node.js versions.
+- Absence Calendar
+  <img width="1728" alt="image"
+  src="https://github.com/user-attachments/assets/7b6022b8-48a7-4192-9916-b1c3ef912780"
+  />
 
-  - [Node.js for MacOS](https://nodejs.org/en/download/)
-  - [Node.js for Windows](https://nodejs.org/en/download/)
-  - [Node.js for Linux](https://nodejs.org/en/download/package-manager/)
+- Admin Dashboard
+  <img width="1728" alt="image"
+  src="https://github.com/user-attachments/assets/642d3ff0-dbc0-44f0-80e0-f2fbbecaa916"
+  />
+
+## Prerequisites
+
+- If you intend to contribute to this project ensure you have been added to the [UW Blueprint Github Organization](https://github.com/uwblueprint/).
+- Install [Node.js](https://nodejs.org/en/download/) (v22 tested). It's recommended to use [NVM (Node Version Manager)](https://github.com/nvm-sh/nvm) to manage your Node.js versions.
+- Install Docker Desktop ([MacOS](https://docs.docker.com/desktop/setup/install/mac-install/) | [Windows](https://docs.docker.com/desktop/install/windows-install/) | [Linux](https://docs.docker.com/desktop/setup/install/linux/)) and ensure that it is running.
+-
+
+## Clone and Install
 
 - Clone the [Sistema Github Repository](https://github.com/uwblueprint/sistema) to your local machine and `cd` into the project folder:
 
@@ -34,12 +45,12 @@ npm install
 - Build and start the Docker containers
 
 ```bash
-docker-compose up --build
+docker compose up --build
 ```
 
 ## Secrets
 
-- Create A [HashiCorp Cloud Platform Account](https://portal.cloud.hashicorp.com/sign-in?ajs_aid=9085f07d-f411-42b4-855b-72795f4fdbcc&product_intent=vault)
+- Create a [HashiCorp Cloud Platform Account](https://portal.cloud.hashicorp.com/sign-in?ajs_aid=9085f07d-f411-42b4-855b-72795f4fdbcc&product_intent=vault)
 - Make sure you have been added to the [Sistema HashiCorp Vault](https://github.com/uwblueprint/).
 - Install [HashiCorp Vault](https://developer.hashicorp.com/hcp/tutorials/get-started-hcp-vault-secrets/hcp-vault-secrets-install-cli#install-hcp-vault-secrets-cli) in order to pull secrets
 - In the folder where you cloned the Sistema repository, log into Vault
@@ -82,22 +93,22 @@ Use the arrow keys to navigate: ↓ ↑ → ←
 
 ## Docker Commands
 
-If you’re new to Docker, you can learn more about `docker-compose` commands at
+If you’re new to Docker, you can learn more about `docker compose` commands at
 this [docker compose overview](https://docs.docker.com/compose/reference/).
 
 ```bash
 # Start Docker Containers
-docker-compose up --build
+docker compose up --build
 ```
 
 ```bash
 # Stop Containers
-docker-compose down
+docker compose down
 ```
 
 ```bash
 # Remove Containers, Networks, and Volumes:
-docker-compose down --volumes
+docker compose down --volumes
 ```
 
 ```bash
@@ -157,7 +168,7 @@ This will open an interactive shell inside the container.
 ## Accessing Database
 
 ```bash
-# Open a Postgres shell in the sistema-db -1 Docker container and connect to the sistema database
+# Open a Postgres shell in the sistema-db-1 Docker container and connect to the sistema database
 docker exec -it sistema-db-1 psql -U sistema -d sistema
 # Retrieve all rows from the "Absence" table
 SELECT * FROM public."Absence";
@@ -267,7 +278,7 @@ git push -f
 ```
 
 - Commit messages and PR names are descriptive and written in **imperative tense**. The first word should be capitalized. E.g. "Create user REST endpoints", not "Created user REST endpoints"
-- PRs can contain multiple commits, they do not need to be squashed together before merging as long as each commit is atomic. Our repo is configured to only allow squash commits to `main` so the entire PR will appear as 1 commit on `main`, but the individual commits are preserved when viewing the PR.
+- PRs can contain multiple commits, they do not need to be squashed together before merging as long as each commit is atomic.
 
 ## Version Control Guide
 

README.md

@@ -0,0 +1,15 @@
+import { NextResponse } from 'next/server';
+import { prisma } from '@utils/prisma';
+
+export async function GET() {
+  try {
+    const colorGroups = await prisma.colorGroup.findMany();
+    return NextResponse.json(colorGroups);
+  } catch (error) {
+    console.error('Error fetching color groups:', error);
+    return NextResponse.json(
+      { error: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}

app/api/colorGroups/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/declareAbsence/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/editAbsence/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/locations/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/filter/subjects/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 {