Merge pull request #205 from dinesh-aot/COMP-306

Future date restriction for CR

Author: nitheesh-aot

compliance-api/src/compliance_api/schemas/continuation_report.py

@@ -1,6 +1,8 @@
 """Schema of continuation report."""
 
-from marshmallow import EXCLUDE, fields, post_dump
+from datetime import datetime, timedelta
+
+from marshmallow import EXCLUDE, ValidationError, fields, post_dump, validates
 from marshmallow_enum import EnumField
 
 from compliance_api.models.continuation_report import ContinuationReport, ContinuationReportKey
@@ -117,6 +119,15 @@ class ContinuationReportUpdateSchema(BaseSchema):  # pylint: disable=too-many-an
         },
     )
 
+    @validates("date_created")
+    def validate_date_created(self, value):  # pylint: disable=no-self-use
+        """Validate that date_created is not later than current date + 1."""
+        current_date_plus_one = datetime.utcnow() + timedelta(days=1)
+        if value > current_date_plus_one:
+            raise ValidationError(
+                f"date_created must not be later than {current_date_plus_one.strftime(INPUT_DATE_TIME_FORMAT)}."
+            )
+
 
 class ContinuationReportCreateSchema(
     ContinuationReportUpdateSchema

compliance-web/src/components/App/ContinuationReports/ContinuationReportEntryModal.tsx

@@ -1,24 +1,24 @@
-import { DialogContent } from "@mui/material";
-import { useEffect, useMemo } from "react";
-import * as yup from "yup";
-import { FormProvider, useForm } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
-import ModalTitleBar from "@/components/Shared/Modals/ModalTitleBar";
-import ModalActions from "@/components/Shared/Modals/ModalActions";
-import dayjs, { Dayjs } from "dayjs";
-import {
-  ContinuationReport,
-  ContinuationReportAPIData,
-  ContinuationReportFormData,
-} from "@/models/ContinuationReport";
-import ControlledRichTextEditor from "@/components/Shared/Controlled/ControlledRichTextEditor";
 import ControlledDateTimeField from "@/components/Shared/Controlled/ControlledDateTimeField";
+import ControlledRichTextEditor from "@/components/Shared/Controlled/ControlledRichTextEditor";
+import ModalActions from "@/components/Shared/Modals/ModalActions";
+import ModalTitleBar from "@/components/Shared/Modals/ModalTitleBar";
 import {
   useCreateContinuationReportEntry,
   useDeleteContinuationReportEntry,
   useUpdateContinuationReportEntry,
 } from "@/hooks/useContinuationReports";
+import {
+  ContinuationReport,
+  ContinuationReportAPIData,
+  ContinuationReportFormData,
+} from "@/models/ContinuationReport";
 import dateUtils from "@/utils/dateUtils";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { DialogContent } from "@mui/material";
+import dayjs, { Dayjs } from "dayjs";
+import { useEffect, useMemo } from "react";
+import { FormProvider, useForm } from "react-hook-form";
+import * as yup from "yup";
 import { ContinuationReportContextType } from "./ContinuationReport";
 
 type ContinuationReportEntryModal = {
@@ -74,7 +74,7 @@ const ContinuationReportEntryModal: React.FC<ContinuationReportEntryModal> = ({
     mode: "onBlur",
     defaultValues,
   });
-
+  const maxSelectableDate = dayjs().add(1, "day");
   const { handleSubmit, reset } = methods;
 
   useEffect(() => {
@@ -132,6 +132,7 @@ const ContinuationReportEntryModal: React.FC<ContinuationReportEntryModal> = ({
               name="dateOfEntry"
               label="Date and Time"
               sx={{ width: "50%" }}
+              maxDateTime={maxSelectableDate}
             />
             <ControlledRichTextEditor label="Entry" name="entry" />
           </DialogContent>