Merge branch 'develop' into Weekly-Availability-Times

Author: Peyton-McKee

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

@@ -9,8 +9,9 @@ import { getOrganizationId } from '../utils/utils';
 export default class ProjectsController {
   static async getAllProjects(req: Request, res: Response, next: NextFunction) {
     try {
+      const includeDeleted = req.params.deleted === 'true';
       const organizationId = getOrganizationId(req.headers);
-      const projects: Project[] = await ProjectsService.getAllProjects(organizationId);
+      const projects: Project[] = await ProjectsService.getAllProjects(organizationId, includeDeleted);
       res.status(200).json(projects);
     } catch (error: unknown) {
       next(error);

src/backend/src/routes/projects.routes.ts

@@ -12,7 +12,7 @@ import ProjectsController from '../controllers/projects.controllers';
 
 const projectRouter = express.Router();
 
-projectRouter.get('/', ProjectsController.getAllProjects);
+projectRouter.get('/:deleted', ProjectsController.getAllProjects);
 
 /* Link Types */
 projectRouter.get('/link-types', ProjectsController.getAllLinkTypes);

src/backend/src/services/projects.services.ts

@@ -36,13 +36,19 @@ export default class ProjectsService {
   /**
    * Get all the non deleted projects in the database for the given organization.
    * @param organizationId the id of the organization the user is currently in
+   * @param includeDeleted whether or not to include deleted projects
    * @returns all the projects
    */
-  static async getAllProjects(organizationId: string): Promise<Project[]> {
-    const projects = await prisma.project.findMany({
-      where: { wbsElement: { dateDeleted: null, organizationId } },
-      ...getProjectQueryArgs(organizationId)
-    });
+  static async getAllProjects(organizationId: string, includeDeleted: boolean): Promise<Project[]> {
+    const projects = includeDeleted
+      ? await prisma.project.findMany({
+          where: { wbsElement: { organizationId } },
+          ...getProjectQueryArgs(organizationId)
+        })
+      : await prisma.project.findMany({
+          where: { wbsElement: { dateDeleted: null, organizationId } },
+          ...getProjectQueryArgs(organizationId)
+        });
     return projects.map(projectTransformer);
   }
 

src/backend/src/transformers/cars.transformer.ts

@@ -21,6 +21,7 @@ export const carTransformer = (car: Prisma.CarGetPayload<CarQueryArgs>): Car =>
     descriptionBullets: car.wbsElement.descriptionBullets.map(descBulletConverter),
     materials: car.wbsElement.materials.map(materialTransformer),
     assemblies: car.wbsElement.assemblies.map(assemblyTransformer),
-    changes: []
+    changes: [],
+    deleted: car.wbsElement.dateDeleted !== null
   };
 };

src/backend/src/transformers/projects.transformer.ts

@@ -41,6 +41,7 @@ const projectTransformer = (project: Prisma.ProjectGetPayload<ProjectQueryArgs>)
       detail: change.detail,
       dateImplemented: change.dateImplemented
     })),
+    deleted: wbsElement.dateDeleted !== null,
     favoritedBy: project.favoritedBy.map(userTransformer),
     teams: project.teams.map(teamTransformer),
     summary: project.summary,
@@ -85,7 +86,8 @@ const projectTransformer = (project: Prisma.ProjectGetPayload<ProjectQueryArgs>)
         stage: (workPackage.stage || undefined) as WorkPackageStage,
         materials: workPackage.wbsElement?.materials.map(materialTransformer),
         assemblies: workPackage.wbsElement?.assemblies.map(assemblyTransformer),
-        blocking: workPackage.wbsElement.blocking.map((blocking) => wbsNumOf(blocking.wbsElement))
+        blocking: workPackage.wbsElement.blocking.map((blocking) => wbsNumOf(blocking.wbsElement)),
+        deleted: workPackage.wbsElement.dateDeleted !== null
       };
     })
   };

src/backend/src/transformers/teams.transformer.ts

@@ -19,7 +19,8 @@ const teamTransformer = (team: Prisma.TeamGetPayload<TeamQueryArgs>): Team => {
       wbsNum: wbsNumOf(project.wbsElement),
       name: project.wbsElement.name,
       status: calculateProjectStatus(project),
-      workPackages: project.workPackages.map(workPackageTransformer)
+      workPackages: project.workPackages.map(workPackageTransformer),
+      deleted: project.wbsElement.dateDeleted !== null
     })),
     leads: team.leads.map(userTransformer),
     userArchived: team.userArchived ? userTransformer(team.userArchived) : undefined,

src/backend/src/transformers/work-packages.transformer.ts

@@ -36,7 +36,8 @@ const workPackageTransformer = (wpInput: Prisma.Work_PackageGetPayload<WorkPacka
     teamTypes: wpInput.project.teams.flatMap((team) => team.teamType ?? []),
     projectName: wpInput.project.wbsElement.name,
     stage: (wpInput.stage as WorkPackageStage) || undefined,
-    blocking: wpInput.wbsElement.blocking.map((wp) => wbsNumOf(wp.wbsElement))
+    blocking: wpInput.wbsElement.blocking.map((wp) => wbsNumOf(wp.wbsElement)),
+    deleted: wpInput.wbsElement.dateDeleted !== null
   };
 };
 

src/frontend/src/apis/projects.api.ts

@@ -13,8 +13,8 @@ import { CreateSingleProjectPayload, EditSingleProjectPayload } from '../utils/t
 /**
  * Fetches all projects.
  */
-export const getAllProjects = () => {
-  return axios.get<Project[]>(apiUrls.projects(), {
+export const getAllProjects = (includeDeleted: boolean) => {
+  return axios.get<Project[]>(apiUrls.allProjects(includeDeleted), {
     transformResponse: (data) => JSON.parse(data).map(projectTransformer)
   });
 };

src/frontend/src/hooks/projects.hooks.ts

@@ -26,9 +26,9 @@ import { useCurrentUser } from './users.hooks';
 /**
  * Custom React Hook to supply all projects.
  */
-export const useAllProjects = () => {
+export const useAllProjects = (includeDeleted: boolean = false) => {
   return useQuery<Project[], Error>(['projects'], async () => {
-    const { data } = await getAllProjects();
+    const { data } = await getAllProjects(includeDeleted);
     return data;
   });
 };

src/frontend/src/pages/GanttPage/GanttChartComponents/GanttTaskBar/GanttTaskBarEditView.tsx

@@ -114,7 +114,8 @@ export const GanttTaskBarEditView = ({
       teamTypes: [],
       changes: [],
       materials: [],
-      assemblies: []
+      assemblies: [],
+      deleted: false
     };
     addWorkPackage(workPackage);