Merge branch 'develop' into multitenancy

Author: Peyton-McKee

src/backend/index.ts

@@ -22,6 +22,7 @@ import announcementsRouter from './src/routes/announcements.routes';
 import onboardingRouter from './src/routes/onboarding.routes';
 import popUpsRouter from './src/routes/pop-up.routes';
 import statisticsRouter from './src/routes/statistics.routes';
+import retrospectiveRouter from './src/routes/retrospective.routes';
 
 const app = express();
 
@@ -81,6 +82,7 @@ app.use('/pop-ups', popUpsRouter);
 app.use('/announcements', announcementsRouter);
 app.use('/onboarding', onboardingRouter);
 app.use('/statistics', statisticsRouter);
+app.use('/retrospective', retrospectiveRouter);
 app.use('/', (_req, res) => {
   res.status(200).json('Welcome to FinishLine');
 });

src/backend/src/controllers/announcements.controllers.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from 'express';
-import AnnouncementService from '../services/announcement.service';
+import AnnouncementService from '../services/announcement.services';
 
 export default class AnnouncementController {
   static async getUserUnreadAnnouncements(req: Request, res: Response, next: NextFunction) {

src/backend/src/controllers/retrospectives.controllers.ts

@@ -0,0 +1,27 @@
+import { NextFunction, Request, Response } from 'express';
+import RetrospectiveService from '../services/retrospective.services';
+
+export default class RetrospectiveController {
+  static async getRetrospectiveTimelines(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { start, end } = req.query;
+      const projects = await RetrospectiveService.getRetrospectiveTimelines(
+        req.organization.organizationId,
+        start ? new Date(start as string) : undefined,
+        end ? new Date(end as string) : undefined
+      );
+      res.json(projects);
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  static async getRetrospectiveBudgets(req: Request, res: Response, next: NextFunction) {
+    try {
+      const projects = await RetrospectiveService.getRetrospectiveBudgets(req.organization.organizationId);
+      res.json(projects);
+    } catch (error) {
+      next(error);
+    }
+  }
+}

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

@@ -1,6 +1,7 @@
 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) {
@@ -237,4 +238,13 @@ export default class TeamsController {
       next(error);
     }
   }
+
+  static async getMyTeamsWorkpackages(req: Request, res: Response, next: NextFunction) {
+    try {
+      const workPackages: WorkPackage[] = await TeamsService.getMyTeamsWorkpackages(req.currentUser, req.organization);
+      res.json(workPackages);
+    } catch (error) {
+      next(error);
+    }
+  }
 }

src/backend/src/prisma/seed.ts

@@ -49,7 +49,7 @@ import OrganizationsService from '../services/organizations.services';
 import StatisticsService from '../services/statistics.services';
 import { seedGraph } from './seed-data/statistics.seed';
 import { graphCollectionTransformer } from '../transformers/statistics-graph-collection.transformer';
-import AnnouncementService from '../services/announcement.service';
+import AnnouncementService from '../services/announcement.services';
 import OnboardingServices from '../services/onboarding.services';
 
 const prisma = new PrismaClient();

src/backend/src/routes/retrospective.routes.ts

@@ -0,0 +1,9 @@
+import { Router } from 'express';
+import RetrospectiveController from '../controllers/retrospectives.controllers';
+
+const retrospectiveRouter = Router();
+
+retrospectiveRouter.get('/timelines', RetrospectiveController.getRetrospectiveTimelines);
+retrospectiveRouter.get('/budgets', RetrospectiveController.getRetrospectiveBudgets);
+
+export default retrospectiveRouter;

src/backend/src/routes/teams.routes.ts

@@ -85,4 +85,6 @@ teamsRouter.post(
 
 teamsRouter.delete('teamType/:teamTypeId/delete', TeamsController.deleteTeamType);
 
+teamsRouter.get('/my-teams-work-packages', TeamsController.getMyTeamsWorkpackages);
+
 export default teamsRouter;

…end/src/services/announcement.service.ts …nd/src/services/announcement.services.tssrc/backend/src/services/announcement.service.ts renamed to src/backend/src/services/announcement.services.ts src/backend/src/services/announcement.service.ts renamed to src/backend/src/services/announcement.services.ts

@@ -4,7 +4,7 @@ import {
   isGuest,
   isLeadership,
   isNotLeadership,
-  isProject,
+  isProjectWbs,
   ProjectProposedChangesCreateArgs,
   ProposedSolution,
   ProposedSolutionCreateArgs,
@@ -827,7 +827,7 @@ export default class ChangeRequestsService {
     if (
       projectNumber !== 0 && // Excluding Cars
       !(projectProposedChanges && projectProposedChanges.workPackageProposedChanges.length === 0) && // Excluding new projects with work packages
-      !(isProject(wbsElement) && workPackageProposedChanges) // Excluding Creating Work Package on Project
+      !(isProjectWbs(wbsElement) && workPackageProposedChanges) // Excluding Creating Work Package on Project
     ) {
       await validateNoUnreviewedOpenCRs(wbsElement.wbsElementId);
     }
@@ -941,7 +941,9 @@ export default class ChangeRequestsService {
                           detail: bullet.detail,
                           descriptionBulletTypeId: bullet.descriptionBulletType.id
                         }))
-                      }
+                      },
+                      leadId: workPackage.originalElement.leadId,
+                      managerId: workPackage.originalElement.managerId
                     }
                   },
                   duration: workPackage.originalElement.duration,
@@ -1003,6 +1005,16 @@ export default class ChangeRequestsService {
               descriptionBulletTypeId: bullet.descriptionBulletType.id
             }))
           },
+          lead: {
+            connect: {
+              userId: leadId
+            }
+          },
+          manager: {
+            connect: {
+              userId: managerId
+            }
+          },
           workPackageProposedChanges: {
             create: {
               duration,

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

@@ -3,7 +3,7 @@ import {
   DescriptionBulletPreview,
   isAdmin,
   isGuest,
-  isProject,
+  isProjectWbs,
   LinkCreateArgs,
   LinkType,
   Project,
@@ -40,18 +40,18 @@ export default class ProjectsService {
    * @param includeDeleted whether or not to include deleted projects
    * @returns all the projects
    */
-  static async getAllProjects(organization: Organization, includeDeleted: boolean): Promise<Project[]> {
+  static async getAllProjects(organization: Organization, includeDeleted: boolean): Promise<ProjectPreview[]> {
     const projects = includeDeleted
       ? await prisma.project.findMany({
           where: { wbsElement: { organizationId: organization.organizationId } },
-          ...getProjectQueryArgs(organization.organizationId)
+          ...getProjectManyQueryArgs(organization.organizationId)
         })
       : await prisma.project.findMany({
           where: { wbsElement: { dateDeleted: null, organizationId: organization.organizationId } },
-          ...getProjectQueryArgs(organization.organizationId)
+          ...getProjectManyQueryArgs(organization.organizationId)
         });
 
-    return projects.map(projectTransformer);
+    return projects.map(projectPreviewTransformer);
   }
 
   static async getUsersLeadingProjects(user: User, organization: Organization): Promise<ProjectPreview[]> {
@@ -116,7 +116,7 @@ export default class ProjectsService {
   }
 
   static async getSingleProjectWithQueryArgs(wbsNumber: WbsNumber, organization: Organization) {
-    if (!isProject(wbsNumber)) throw new HttpException(400, `${wbsPipe(wbsNumber)} is not a valid project WBS #!`);
+    if (!isProjectWbs(wbsNumber)) throw new HttpException(400, `${wbsPipe(wbsNumber)} is not a valid project WBS #!`);
 
     const { carNumber, projectNumber, workPackageNumber } = wbsNumber;
 
@@ -346,7 +346,7 @@ export default class ProjectsService {
    * @throws if the project isn't found, the team isn't found, or the user doesn't have access
    */
   static async setProjectTeam(user: User, wbsNumber: WbsNumber, teamId: string, organization: Organization): Promise<void> {
-    if (!isProject(wbsNumber)) throw new HttpException(400, `${wbsPipe(wbsNumber)} is not a valid project WBS #!`);
+    if (!isProjectWbs(wbsNumber)) throw new HttpException(400, `${wbsPipe(wbsNumber)} is not a valid project WBS #!`);
 
     // find the associated project
     const project = await ProjectsService.getSingleProjectWithQueryArgs(wbsNumber, organization);