Merge branch 'develop' into 3604-maintenence---tracking-spending-on-project-overview

Author: superhvarn

src/backend/custom.d.ts

@@ -1,9 +1,10 @@
-import { Organization, User as PrismaUser } from '@prisma/client';
+import { Organization } from '@prisma/client';
+import { User as SharedUser } from 'shared';
 
 declare global {
   namespace Express {
     export interface Request {
-      currentUser: PrismaUser;
+      currentUser: SharedUser;
       organization: Organization;
     }
   }

src/backend/src/controllers/projects.controllers.ts

@@ -1,13 +1,31 @@
-import { Manufacturer, MaterialType, Project, ProjectPreview, validateWBS, WbsNumber, wbsPipe } from 'shared';
+import {
+  Manufacturer,
+  MaterialType,
+  Project,
+  ProjectOverview,
+  ProjectGantt,
+  ProjectPreview,
+  validateWBS,
+  WbsNumber,
+  wbsPipe
+} from 'shared';
 import { NextFunction, Request, Response } from 'express';
 import ProjectsService from '../services/projects.services';
 import BillOfMaterialsService from '../services/boms.services';
 
 export default class ProjectsController {
+  static async getAllProjectsGantt(req: Request, res: Response, next: NextFunction) {
+    try {
+      const projects: ProjectGantt[] = await ProjectsService.getAllProjectsGantt(req.organization);
+      res.status(200).json(projects);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getAllProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const includeDeleted = req.params.deleted === 'true';
-      const projects: ProjectPreview[] = await ProjectsService.getAllProjects(req.organization, includeDeleted);
+      const projects: ProjectPreview[] = await ProjectsService.getAllProjects(req.organization);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -16,7 +34,7 @@ export default class ProjectsController {
 
   static async getUsersTeamsProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectPreview[] = await ProjectsService.getUsersTeamsProjects(req.currentUser, req.organization);
+      const projects: ProjectOverview[] = await ProjectsService.getUsersTeamsProjects(req.currentUser, req.organization);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);
@@ -25,7 +43,7 @@ export default class ProjectsController {
 
   static async getUsersLeadingProjects(req: Request, res: Response, next: NextFunction) {
     try {
-      const projects: ProjectPreview[] = await ProjectsService.getUsersLeadingProjects(req.currentUser, req.organization);
+      const projects: ProjectOverview[] = await ProjectsService.getUsersLeadingProjects(req.currentUser, req.organization);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);

src/backend/src/controllers/tasks.controllers.ts

@@ -89,4 +89,15 @@ export default class TasksController {
       next(error);
     }
   }
+
+  static async getOverdueTasksByTeamLeadership(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userId } = req.params;
+
+      const tasks = await TasksService.getOverdueTasksByTeamLeadership(userId, req.organization);
+      res.status(200).json(tasks);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/controllers/teams.controllers.ts

@@ -1,7 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import TeamsService from '../services/teams.services';
 import { HttpException } from '../utils/errors.utils';
-import { WorkPackage } from 'shared';
 
 export default class TeamsController {
   static async getAllTeams(req: Request, res: Response, next: NextFunction) {
@@ -260,10 +259,10 @@ export default class TeamsController {
     }
   }
 
-  static async getMyTeamsWorkpackages(req: Request, res: Response, next: NextFunction) {
+  static async getMyTeamAsHead(req: Request, res: Response, next: NextFunction) {
     try {
-      const workPackages: WorkPackage[] = await TeamsService.getMyTeamsWorkpackages(req.currentUser, req.organization);
-      res.json(workPackages);
+      const team = await TeamsService.getMyTeamAsHead(req.currentUser, req.organization);
+      res.json(team);
     } catch (error) {
       next(error);
     }

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

@@ -6,7 +6,15 @@ export default class UsersController {
   static async getAllUsers(_req: Request, res: Response, next: NextFunction) {
     try {
       const users = await UsersService.getAllUsers();
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 
+  static async getAllOrgUsers(req: Request, res: Response, next: NextFunction) {
+    try {
+      const users = await UsersService.getAllOrgUsers(req.organization.organizationId);
       res.status(200).json(users);
     } catch (error: unknown) {
       next(error);
@@ -209,4 +217,16 @@ export default class UsersController {
       next(error);
     }
   }
+
+  static async getManyUsersWithScheduleSettings(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userIds } = req.body;
+
+      const users = await UsersService.getManyUsersWithScheduleSettings(userIds, req.organization);
+
+      res.status(200).json(users);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/controllers/work-packages.controllers.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import { validateWBS, WbsNumber, WorkPackage } from 'shared';
+import { validateWBS, WbsNumber, WorkPackage, WorkPackagePreview, WorkPackageSelection } from 'shared';
 import WorkPackagesService from '../services/work-packages.services';
 
 /** Controller for operations involving work packages. */
@@ -134,4 +134,20 @@ export default class WorkPackagesController {
       next(error);
     }
   }
+
+  static async getHomePageWorkPackages(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { selection } = req.params;
+
+      const workPackages: WorkPackagePreview[] = await WorkPackagesService.getHomePageWorkPackages(
+        req.currentUser,
+        req.organization,
+        selection as WorkPackageSelection
+      );
+
+      res.status(200).json(workPackages);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

src/backend/src/prisma-query-args/auth-user.query-args.ts

@@ -1,49 +1,35 @@
 import { Prisma } from '@prisma/client';
-import { getTeamQueryArgs } from './teams.query-args';
 
 export type AuthUserQueryArgs = ReturnType<typeof getAuthUserQueryArgs>;
 
 export const getAuthUserQueryArgs = (organizationId: string) =>
   Prisma.validator<Prisma.UserDefaultArgs>()({
     include: {
       userSettings: true,
+      organizations: true,
       teamsAsHead: {
-        where: {
-          organizationId
-        },
-        ...getTeamQueryArgs(organizationId)
+        select: {
+          teamId: true,
+          financeTeam: true
+        }
       },
-      organizations: true,
       teamsAsLead: {
-        where: {
-          organizationId
-        },
-        ...getTeamQueryArgs(organizationId)
-      },
-      teamsAsMember: {
-        where: {
-          organizationId
+        select: {
+          financeTeam: true,
+          teamId: true
         }
       },
-      favoriteProjects: {
-        where: {
-          wbsElement: {
-            organizationId
-          }
+      teamsAsMember: {
+        select: {
+          financeTeam: true,
+          teamId: true
         }
       },
       roles: {
         where: {
           organizationId
         }
       },
-      changeRequestsToReview: {
-        where: {
-          wbsElement: {
-            organizationId
-          }
-        }
-      },
       onboardingTeamTypes: {
         where: {
           organizationId

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

@@ -13,7 +13,7 @@ export const getCarQueryArgs = (organizationId: string) =>
           lead: getUserQueryArgs(organizationId),
           descriptionBullets: getDescriptionBulletQueryArgs(organizationId),
           manager: getUserQueryArgs(organizationId),
-          links: getLinkQueryArgs(organizationId),
+          links: getLinkQueryArgs(),
           changes: {
             where: { changeRequest: { dateDeleted: null } },
             include: { implementer: getUserQueryArgs(organizationId) }

src/backend/src/prisma-query-args/link-types.query-args.ts

@@ -1,10 +1,8 @@
 import { Prisma } from '@prisma/client';
-import { getLinkTypeQueryArgs } from './link-types.query-args';
-import { getUserQueryArgs } from './user.query-args';
 
 export type LinkQueryArgs = ReturnType<typeof getLinkQueryArgs>;
 
-export const getLinkQueryArgs = (organizationId: string) =>
+export const getLinkQueryArgs = () =>
   Prisma.validator<Prisma.LinkDefaultArgs>()({
-    include: { linkType: getLinkTypeQueryArgs(organizationId), creator: getUserQueryArgs(organizationId) }
+    include: { linkType: true }
   });