feat: fixes and validation (#35)

* fix: make err handling resilient, and fix bugs (#32)

* fix: infinite looping cronjob

* feat: rewrite service unit tests

* feat: add global err handlers

* feat: add 404

* feat: update api client

* refactor: use common page skeleton on loading

* fix: fix code smells

* feat: add ci badge

* feat: add ratelimit handling

* fix: fix proxy security warn

* fix: typo

* refactor: auto detect rsc on xhr request

* feat: rewrite auth tests

* chore: bump deps, fix text

* feat: start on announcementmodel unit tests

* fix: add cleanup func

* feat: replace working name

* fix: rename completed to read

* Feat/api type validation (#36)

* feat: write middleware for checking

* feat: overhaul file structure

* feat: upgrade auth endpoints

* feat: add typecheck for /user/*

* fix: provide full list of missing env

* feat: announcement api validation

* feat: upgrade service endpoints

* feat: fix up announcementmodel tests

* chore: Update to use "CCA Hours" instead of "Service Hours".

* fix: api regression

* fix: code smells

* Feat/requested changes (#38)

* feat: migrate db

* feat: update models and endpoints

* fix: update tests

* feat: update scheduler

* refactor: deletion logic efficiency

* fix: debounce state for xhr req

* feat: update FE service sessions and varifyattendance

* feat: add support for service

* feat: improved validation errors

* chore: rename service hours to cca hours

* fix: fix smells

* fix: misc bugfixes

* feat: initial commit of empty suites

* chore: bump deps

* fix: remove unused import

* fix: permissions issue

* chore: update meta

* feat: start on usermodel tests

* chore: continue tests

* feat: more tests

* feat: complete usermodel tests

* feat: add db snapshotting

* fix: scheduling of service sessions

* fix: smells

* fix: test volume type

* test: volume test again

* chore: bump versions

* chore: remove console log

Author: SebassNoob

.github/workflows/pipeline.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup bun
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: 1.0.24
+          bun-version: 1.0.29
 
       - name: Install dependencies
         run: cd interapp-backend && bun install

.gitignore

@@ -175,4 +175,5 @@ dist
 .DS_Store
 
 pgdata/
-minio_data/
+minio_data/
+dump/

README.md

@@ -4,6 +4,7 @@
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=raffles-interact_interapp&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=raffles-interact_interapp)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=raffles-interact_interapp&metric=bugs)](https://sonarcloud.io/summary/new_code?id=raffles-interact_interapp)
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=raffles-interact_interapp&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=raffles-interact_interapp)
+[![CI](https://github.com/raffles-interact/interapp/actions/workflows/pipeline.yml/badge.svg)](https://github.com/raffles-interact/interapp/actions/workflows/pipeline.yml)
 
 A monorepo for Raffles Interact's administrative application. Built with Next.js and Express along with the Bun runtime.
 

docker-compose.dev.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   postgres:
     container_name: interapp-postgres
-    image: postgres:alpine
+    image: postgres:16-alpine
     restart: on-failure
     ports:
       - 5432:5432
@@ -62,6 +62,10 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+    volumes:
+      - type: bind
+        source: ./dump
+        target: /tmp/dump
 
   minio:
     container_name: interapp-minio

docker-compose.prod.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   postgres:
     container_name: interapp-postgres
-    image: postgres:alpine
+    image: postgres:16-alpine
     restart: always
     ports:
       - 5432:5432
@@ -52,6 +52,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+    volumes:
+        - ./:/tmp/dump
 
   minio:
     container_name: interapp-minio

docker-compose.test.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
   postgres:
     container_name: interapp-postgres-test
-    image: postgres:alpine
+    image: postgres:16-alpine
     restart: on-failure
     ports:
       - 2345:2345

interapp-backend/api/email_handler/templates/reset_password.html

@@ -31,7 +31,7 @@
 </head>
 <body>
   <div>
-    <h1 class="title">Reset your password on Interapp!</h1>
+    <h1 class="title">Reset your password on OneInteract!</h1>
     <p class="content">Hi {{ username }},</p>
     <p class="content">Click the link below to reset your password:</p>
     <button class="content button"><a href="{{ url }}">Reset</a></button>
@@ -40,7 +40,7 @@ <h1 class="title">Reset your password on Interapp!</h1>
       contact the administrator immediately.
     </p>
     <p class="content">Thanks,</p>
-    <p class="content">Interapp Team</p>
+    <p class="content">OneInteract Team</p>
     <hr />
     <p class="content">
       If you're having trouble clicking the "Reset" button, copy and paste the URL below into your

interapp-backend/api/email_handler/templates/verify_email.html

@@ -31,13 +31,13 @@
 </head>
 <body>
   <div>
-    <h1 class="title">Verify your email with Interapp!</h1>
+    <h1 class="title">Verify your email with OneInteract!</h1>
     <p class="content">Hi {{ username }},</p>
     <p class="content">Click the link below to verify your email:</p>
     <button class="content button"><a href="{{ url }}">Verify Now!</a></button>
     <p class="content">If you did not request this, please ignore this email.</p>
     <p class="content">Thanks,</p>
-    <p class="content">Interapp Team</p>
+    <p class="content">OneInteract Team</p>
     <hr />
     <p class="content">
       If you're having trouble clicking the "Verify Now" button, copy and paste the URL below into

interapp-backend/api/models/index.ts

@@ -0,0 +1,5 @@
+export * from './announcement';
+export * from './auth';
+export * from './hello';
+export * from './user';
+export * from './service';

interapp-backend/api/models/service.ts

@@ -16,6 +16,8 @@ export class ServiceModel {
     newService.contact_email = service.contact_email;
     newService.contact_number = service.contact_number;
     newService.website = service.website;
+    newService.enable_scheduled = service.enable_scheduled;
+    newService.service_hours = service.service_hours;
 
     if (!service.promotional_image) newService.promotional_image = null;
     else {
@@ -136,9 +138,18 @@ export class ServiceModel {
   ) {
     const session = new ServiceSession();
     session.service_id = service_session.service_id;
+    const validTime = new Date(service_session.start_time) > new Date(service_session.end_time);
+    if (validTime) {
+      throw new HTTPError(
+        'Invalid time',
+        'Start time must be before end time',
+        HTTPErrorCode.BAD_REQUEST_ERROR,
+      );
+    }
     session.start_time = service_session.start_time;
     session.end_time = service_session.end_time;
     session.ad_hoc_enabled = service_session.ad_hoc_enabled;
+    session.service_hours = service_session.service_hours;
     session.service = await this.getService(service_session.service_id);
     try {
       await appDataSource.manager.insert(ServiceSession, session);
@@ -163,8 +174,19 @@ export class ServiceModel {
     }
     return res;
   }
-  public static async updateServiceSession(service_session: ServiceSession) {
+  public static async updateServiceSession(
+    service_session: Omit<ServiceSession, 'service_session_users' | 'service'>,
+  ) {
     const service = await this.getService(service_session.service_id); // check if service exists
+
+    const validTime = new Date(service_session.start_time) > new Date(service_session.end_time);
+    if (validTime) {
+      throw new HTTPError(
+        'Invalid time',
+        'Start time must be before end time',
+        HTTPErrorCode.BAD_REQUEST_ERROR,
+      );
+    }
     try {
       await appDataSource.manager.update(
         ServiceSession,