Merge branch '2774-stats-page-line-graph-component-3' into 2774-stats…

…-page-line-graph-component-2

src/backend/src/controllers/statistics.controllers.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from 'express';
 import StatisticsService from '../services/statistics.services';
-import { Graph } from 'shared';
+import { Graph, GraphCollection } from 'shared';
 
 export default class StatisticsController {
   static async createGraph(req: Request, res: Response, next: NextFunction) {
@@ -39,13 +39,104 @@ export default class StatisticsController {
 
   static async getSingleGraph(req: Request, res: Response, next: NextFunction) {
     try {
-      const { id } = req.params;
+      const { graphId } = req.params;
 
-      const requestedGraph = await StatisticsService.getSingleGraph(id, req.currentUser, req.organization);
+      const requestedGraph = await StatisticsService.getSingleGraph(graphId, req.currentUser, req.organization);
 
       res.status(200).json(requestedGraph);
     } catch (error: unknown) {
       next(error);
     }
   }
+
+  static async getAllGraphCollections(req: Request, res: Response, next: NextFunction) {
+    try {
+      const graphCollections = await StatisticsService.getAllGraphCollections(req.currentUser, req.organization);
+      res.status(200).json(graphCollections);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async editGraph(req: Request, res: Response, next: NextFunction) {
+    try {
+      const {
+        startDate,
+        endDate,
+        title,
+        graphType,
+        measure,
+        graphDisplayType,
+        graphCollectionId,
+        carIds,
+        specialPermissions
+      } = req.body;
+      const { graphId } = req.params;
+
+      const updatedGraph = await StatisticsService.editGraph(
+        req.currentUser,
+        graphId,
+        title,
+        graphType,
+        measure,
+        graphDisplayType,
+        req.organization,
+        carIds,
+        specialPermissions,
+        startDate ? new Date(startDate) : undefined,
+        endDate ? new Date(endDate) : undefined,
+        graphCollectionId
+      );
+
+      res.status(200).json(updatedGraph);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async createGraphCollection(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { title, specialPermissions } = req.body;
+      const graphCollection: GraphCollection = await StatisticsService.createGraphCollection(
+        req.currentUser,
+        title,
+        specialPermissions,
+        req.organization
+      );
+      res.status(200).json(graphCollection);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async editGraphCollection(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { title, specialPermissions } = req.body;
+      const { graphCollectionId } = req.params;
+      const graphCollection: GraphCollection = await StatisticsService.editGraphCollection(
+        req.currentUser,
+        graphCollectionId,
+        title,
+        specialPermissions,
+        req.organization
+      );
+      res.status(200).json(graphCollection);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getSingleGraphCollection(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { graphCollectionId } = req.params;
+      const graphCollection: GraphCollection = await StatisticsService.getSingleGraphCollection(
+        req.currentUser,
+        graphCollectionId,
+        req.organization
+      );
+      res.status(200).json(graphCollection);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -13,11 +13,11 @@ export default class TasksController {
         wbsNum,
         title,
         notes,
-        new Date(deadline),
         priority,
         status,
         assignees,
-        req.organization
+        req.organization,
+        deadline ? new Date(deadline) : undefined
       );
 
       res.status(200).json(task);

src/backend/src/prisma/migrations/20241113231854_optional_deadline_assignees_task/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Task" ALTER COLUMN "deadline" DROP NOT NULL;

src/backend/src/prisma/migrations/20241217224731_stats_page/migration.sql → src/backend/src/prisma/migrations/20241227031743_stats_page/migration.sql

@@ -49,6 +49,7 @@ CREATE TABLE "Graph_Collection" (
     "title" TEXT NOT NULL,
     "dateDeleted" TIMESTAMP(3),
     "viewPermissions" "Special_Permission"[],
+    "dateCreated" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "userCreatedId" TEXT NOT NULL,
     "userDeletedId" TEXT,
     "organizationId" TEXT NOT NULL,

src/backend/src/prisma/schema.prisma

@@ -532,7 +532,7 @@ model Task {
   taskId          String        @id @default(uuid())
   title           String
   notes           String
-  deadline        DateTime
+  deadline        DateTime?
   assignees       User[]        @relation(name: "assignedTo")
   priority        Task_Priority
   status          Task_Status
@@ -1011,6 +1011,7 @@ model Graph_Collection {
   dateDeleted     DateTime?
   viewPermissions Special_Permission[]
   graphs          Graph[]
+  dateCreated     DateTime             @default(now())
 
   userCreatedId  String
   userCreated    User         @relation(fields: [userCreatedId], references: [userId], name: "graphCollectionsCreator")