Merge remote-tracking branch 'origin/develop' into #3936-delete-guest-definition

Author: chrisdicono

src/backend/src/controllers/attendance.controllers.ts

@@ -21,6 +21,16 @@ export default class AttendanceController {
     }
   }
 
+  static async getAttendanceById(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { meetingAttendanceId } = req.params as Record<string, string>;
+      const attendance = await AttendanceService.getAttendanceById(meetingAttendanceId, req.organization);
+      res.status(200).json(attendance);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOngoingAttendance(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params as Record<string, string>;

src/backend/src/controllers/change-requests.controllers.ts

@@ -23,6 +23,15 @@ export default class ChangeRequestsController {
     }
   }
 
+  static async getAllGuestChangeRequests(req: Request, res: Response, next: NextFunction) {
+    try {
+      const changeRequests = await ChangeRequestsService.getAllGuestChangeRequests(req.organization);
+      res.status(200).json(changeRequests);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getToReviewChangeRequests(req: Request, res: Response, next: NextFunction) {
     try {
       const changeRequests = await ChangeRequestsService.getToReviewChangeRequests(req.currentUser, req.organization);

src/backend/src/controllers/recruitment.controllers.ts

@@ -125,4 +125,13 @@ export default class RecruitmentController {
       next(error);
     }
   }
+
+  static async getAllGuestDefintions(req: Request, res: Response, next: NextFunction) {
+    try {
+      const allDefinitons = await RecruitmentServices.getAllGuestDefinitions(req.organization);
+      res.status(200).json(allDefinitons);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/controllers/users.controllers.ts

@@ -102,7 +102,7 @@ export default class UsersController {
 
       const { user, token } = await UsersService.logUserIn(idToken, header!);
 
-      res.cookie('token', token, { httpOnly: true, sameSite: 'none', secure: true });
+      res.cookie('token', token, { httpOnly: true, sameSite: 'none', secure: true, maxAge: 7 * 24 * 60 * 60 * 1000 });
       res.status(200).json(user);
     } catch (error: unknown) {
       next(error);

src/backend/src/integrations/slack.ts

@@ -271,6 +271,23 @@ export const getChannelName = async (channelId: string) => {
   }
 };
 
+/**
+ * Checks whether the bot is a member of the given channel
+ * @param channelId the id of the slack channel
+ * @returns true if the bot is a member of the channel, false otherwise
+ */
+export const checkBotInChannel = async (channelId: string): Promise<boolean> => {
+  const client = getSlackClient();
+  if (!client) return false;
+
+  try {
+    const channelRes = await client.conversations.info({ channel: channelId });
+    return channelRes.channel?.is_member ?? false;
+  } catch (error) {
+    return false;
+  }
+};
+
 /**
  * Given a slack user id, prood.uces the name of the channel
  * @param userId the id of the slack user

src/backend/src/prisma-query-args/attendance.query-args.ts

@@ -2,6 +2,7 @@ import { Prisma } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args.js';
 
 export type MeetingAttendanceQueryArgs = ReturnType<typeof getMeetingAttendanceQueryArgs>;
+export type MeetingAttendanceWithAttendeesQueryArgs = ReturnType<typeof getMeetingAttendanceWithAttendeesQueryArgs>;
 
 export const getMeetingAttendanceQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.Meeting_AttendanceDefaultArgs>()({
@@ -19,3 +20,20 @@ export const getMeetingAttendanceQueryArgs = (organizationId: string) =>
       attendees: { select: { userId: true } }
     }
   });
+
+export const getMeetingAttendanceWithAttendeesQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Meeting_AttendanceDefaultArgs>()({
+    include: {
+      userCreated: getUserQueryArgs(organizationId),
+      team: {
+        select: {
+          teamId: true,
+          teamName: true,
+          headId: true,
+          members: { select: { userId: true } },
+          leads: { select: { userId: true } }
+        }
+      },
+      attendees: getUserQueryArgs(organizationId)
+    }
+  });

src/backend/src/prisma-query-args/change-requests.query-args.ts

@@ -68,6 +68,51 @@ export const getManyChangeRequestQueryArgs = (organizationId: string) =>
     }
   });
 
+export type ChangeRequestGuestQueryArgs = ReturnType<typeof getGuestChangeRequestQueryArgs>;
+
+export const getGuestChangeRequestQueryArgs = (organizationId: string) =>
+  Prisma.validator<Prisma.Change_RequestDefaultArgs>()({
+    select: {
+      crId: true,
+      identifier: true,
+      dateSubmitted: true,
+      type: true,
+      accepted: true,
+      dateReviewed: true,
+      submitter: getUserQueryArgs(organizationId),
+      reviewer: getUserQueryArgs(organizationId),
+      changes: { select: { changeId: true } },
+      wbsElement: {
+        select: {
+          carNumber: true,
+          projectNumber: true,
+          workPackageNumber: true,
+          name: true,
+          project: {
+            select: {
+              wbsElement: { select: { name: true } },
+              teams: {
+                select: { teamType: { select: { name: true } } }
+              }
+            }
+          },
+          workPackage: {
+            select: {
+              project: {
+                select: {
+                  wbsElement: { select: { name: true } },
+                  teams: {
+                    select: { teamType: { select: { name: true } } }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  });
+
 export const getChangeRequestWithProjectAndWorkPackageQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.Change_RequestDefaultArgs>()({
     include: {

src/backend/src/prisma-query-args/projects.query-args.ts

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client';
+import { Prisma, Task_Status } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args.js';
 import { getDescriptionBulletQueryArgs } from './description-bullets.query-args.js';
 import { getTeamPreviewQueryArgs } from './teams.query-args.js';
@@ -129,7 +129,13 @@ export const getProjectOverviewQueryArgs = (organizationId: string) =>
           manager: getUserQueryArgs(organizationId),
           status: true,
           links: getLinkQueryArgs(),
-          tasks: getTaskQueryArgs(organizationId)
+          _count: {
+            select: {
+              tasks: {
+                where: { AND: [{ dateDeleted: null }, { NOT: { status: Task_Status.DONE } }] }
+              }
+            }
+          }
         }
       },
       workPackages: getWorkPackagePreviewQueryArgs(),

src/backend/src/prisma/schema.prisma

@@ -739,11 +739,11 @@ model Receipt {
 model Reimbursement_Request {
   reimbursementRequestId   String                          @id @default(uuid())
   identifier               Int
-  saboId                   String?                            @unique
+  saboId                   String?                         @unique
   dateCreated              DateTime                        @default(now())
   dateDeleted              DateTime?
   dateOfExpense            DateTime?
-  description              String @default("")
+  description              String                          @default("")
   reimbursementStatuses    Reimbursement_Status[]
   recipientId              String
   recipient                User                            @relation(name: "reimbursementRequestRecipient", fields: [recipientId], references: [userId])

src/backend/src/prisma/seed.ts

@@ -41,6 +41,7 @@ import OnboardingServices from '../services/onboarding.services.js';
 import { dbSeedAllParts, dbSeedAllPartTags } from './seed-data/parts.seed.js';
 import FinanceServices from '../services/finance.services.js';
 import CalendarService from '../services/calendar.services.js';
+import { allChangeRequestsReviewed } from '../utils/change-requests.utils.js';
 
 const prisma = new PrismaClient();
 
@@ -3901,6 +3902,50 @@ const performSeed: () => Promise<void> = async () => {
       userCreatedId: batman.userId
     }
   });
+
+  await RecruitmentServices.createGuestDefinition(
+    thomasEmrax,
+    ner,
+    'Projects',
+    'This is the definition of a project. Projects are blah blah blah',
+    0,
+    'bar_chart',
+    'Click here to view all our projects!',
+    '/projects'
+  );
+
+  await RecruitmentServices.createGuestDefinition(
+    thomasEmrax,
+    ner,
+    'Change Requests',
+    'This is the definiton for a change request. Changes requests are blah blah blah',
+    0,
+    'bar_chart',
+    'Click here to view all our change requests!',
+    '/change-requests'
+  );
+
+  await RecruitmentServices.createGuestDefinition(
+    thomasEmrax,
+    ner,
+    'Gantt Chart',
+    'This is the definiton for a change request. Changes requests are blah blah blah',
+    0,
+    'bar_chart',
+    'Click here to view all our projects!',
+    '/gantt'
+  );
+
+  await RecruitmentServices.createGuestDefinition(
+    thomasEmrax,
+    ner,
+    'Design Reviews',
+    'This is the definiton for a design review. Design reviews are blah blah blah',
+    0,
+    'bar_chart',
+    'Click here to view all our design reviews!',
+    '/design-reviews'
+  );
 };
 
 performSeed()