Merge remote-tracking branch 'origin/main'

utmgdsc · Jan 15, 2025 · d5841e9 · d5841e9
2 parents 1783092 + 826adb4
commit d5841e9
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 149 deletions.
diff --git a/backend/prisma/migrations/20241109235555_rename_field/migration.sql b/backend/prisma/migrations/20241109235555_rename_field/migration.sql
@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `needAccess` on the `Room` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Room" DROP COLUMN "needAccess",
+ADD COLUMN     "needTCardAccess" BOOLEAN NOT NULL DEFAULT false;
diff --git a/backend/src/api/index.ts b/backend/src/api/index.ts
@@ -84,9 +84,10 @@ app.use(async (req, res, next) => {
     utorid: req.headers.utorid as string,
     email: req.headers.http_mail as string,
     name:
-      req.headers.sn && req.headers.givenname
+      (req.headers.HTTP_CN as string) ??
+      (req.headers.sn && req.headers.givenName
         ? `${req.headers.givenname} ${req.headers.sn}`
-        : (req.headers.http_mail as string).split('@')[0],
+        : (req.headers.http_mail as string).split('@')[0]),
     webhooks: defaultWebhooksSetttings,
     slackWebhook: null,
     discordWebhook: null,

diff --git a/backend/src/models/requestsModel.ts b/backend/src/models/requestsModel.ts
@@ -174,13 +174,15 @@ export default {
       query.startDate = { gte: new Date(filters.start_date) };
     }
     logger.debug(query.startDate);
-    // In a week
     if (filters.end_date) {
       query.endDate = { lte: filters.end_date };
-    } else {
-      filters.end_date = filters.end_date || new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000).toISOString();
-      query.endDate = { lte: filters.end_date };
     }
+    // else {
+    // // In a week
+    //   filters.end_date = filters.end_date || new Date(new Date().getTime() + 7 * 24 * 60 * 60 * 1000).toISOString();
+    //   query.endDate = { lte: filters.end_date };
+    // }
+
     if (filters.startDate && filters.endDate) {
       const startDate = new Date(filters.startDate);
       const endDate = new Date(filters.endDate);
@@ -301,14 +303,14 @@ export default {
     if (userFetched.requests.length >= room.requestLimit) {
       return {
         status: 429,
-        message: 'User has too many pending requests.',
-      };
+        message: `User has too many pending requests. Maximum pending requests for this room is ${room.requestLimit}.`,
+      }
     }
     if (userFetched.groups[0].requests.length >= room.requestLimit) {
       return {
         status: 429,
-        message: 'Group has too many pending requests.',
-      };
+        message: `Group has too many pending requests. Maximum pending requests for this room is ${room.requestLimit}.`,
+      }
     }
 
     try {

diff --git a/backend/src/models/roomsModel.ts b/backend/src/models/roomsModel.ts
@@ -25,7 +25,7 @@ const updateRequests = async (roomName: string, authorUtorid: string, approver:
     where: {
       roomName,
       authorUtorid: authorUtorid,
-      status: RequestStatus.completed ? RequestStatus.needTCard : RequestStatus.completed,
+      status: status == RequestStatus.completed ? RequestStatus.needTCard : RequestStatus.completed,
     },
     include: {
       author: true,
@@ -38,7 +38,7 @@ const updateRequests = async (roomName: string, authorUtorid: string, approver:
       authorUtorid: authorUtorid,
       roomName,
       endDate: { gte: new Date() },
-      status: RequestStatus.completed ? RequestStatus.needTCard : RequestStatus.completed,
+      status: status == RequestStatus.completed ? RequestStatus.needTCard : RequestStatus.completed,
     },
     data: { status: status },
   });
@@ -118,6 +118,7 @@ export default {
         include: {
           requests: {
             where: {
+              status: { in: [RequestStatus.completed, RequestStatus.needTCard] },
               OR: [{ author: { utorid: user.utorid } }, { group: { members: { some: { utorid: user.utorid } } } }],
             },
             include: { group: true },