date and query validation for filtered tasks

Author: chpy04

src/backend/src/routes/tasks.routes.ts

@@ -2,13 +2,14 @@ import express from 'express';
 import { body } from 'express-validator';
 import TasksController from '../controllers/tasks.controllers.js';
 import { nonEmptyString, isTaskPriority, isTaskStatus, validateInputs, isOptionalDate } from '../utils/validation.utils.js';
+import { isDate } from '../utils/validation.utils.js';
 
 const tasksRouter = express.Router();
 
 tasksRouter.post(
   '/filter',
-  body('startPeriod').isString(),
-  body('endPeriod').isString(),
+  isDate(body('startPeriod')),
+  isDate(body('endPeriod')),
   body('memberIds').optional().isArray(),
   body('memberIds.*').optional().isString(),
   body('teamIds').optional().isArray(),

src/backend/src/services/tasks.services.ts

@@ -302,7 +302,7 @@ export default class TasksService {
     // Validate memberIds if provided
     if (memberIds && memberIds.length > 0) {
       const users = await prisma.user.findMany({
-        where: { userId: { in: memberIds } }
+        where: { userId: { in: memberIds }, organizations: { some: { organizationId: organization.organizationId } } }
       });
       if (users.length !== memberIds.length) {
         throw new NotFoundException('User', 'one or more member IDs');

src/frontend/src/pages/CalendarPage/CalendarPage.tsx

@@ -213,7 +213,12 @@ const NewCalendarPage: React.FC<NewCalendarPageProps> = ({
         }
     : null;
 
-  const { data: filteredTasks } = useFilterTasks(taskFilterArgs);
+  const {
+    isLoading: tasksIsLoading,
+    isError: tasksIsError,
+    error: tasksError,
+    data: filteredTasks
+  } = useFilterTasks(taskFilterArgs);
 
   const [pendingEvent, setPendingEvent] = useState(
     yourEvents.filter((event) => event.approved === ConflictStatus.PENDING).length > 0
@@ -332,6 +337,7 @@ const NewCalendarPage: React.FC<NewCalendarPageProps> = ({
   if (conflictingEventsIsError) return <ErrorPage message={conflictingEventsError.message} />;
   if (conflictingDeniedEventsIsError) return <ErrorPage message={conflictingDeniedEventsError.message} />;
   if (conflictingReviewEventsIsError) return <ErrorPage message={conflictingReviewEventsError.message} />;
+  if (tasksIsError) return <ErrorPage message={tasksError.message} />;
 
   if (
     isLoading ||
@@ -341,7 +347,9 @@ const NewCalendarPage: React.FC<NewCalendarPageProps> = ({
     conflictingDeniedEventsLoading ||
     !conflictingDeniedEvents ||
     conflictingReviewEventsLoading ||
-    !conflictingReviewEvents
+    !conflictingReviewEvents ||
+    tasksIsLoading ||
+    !filteredTasks
   )
     return <LoadingIndicator />;