Merge pull request #2264 from jadmsaadaot/TRACK-task#2105

Prevent issue start date being after earliest update

Author: jadmsaadaot

epictrack-api/src/api/services/work_issues.py

@@ -118,15 +118,26 @@ def approve_work_issues(cls, issue_id, update_id):
 
         return work_issue_update
 
+    @classmethod
+    def _check_valid_issue_edit_data(cls, new_data, work_issue_db):
+        """Check if the issue data is valid for editing"""
+        if new_data.get('expected_resolution_date'):
+            if new_data.get('start_date').timestamp() > new_data.get('expected_resolution_date').timestamp():
+                raise BadRequestError('expected resolution date cannot be before the start date')
+
+        earliest_issue_update_date = min(update.posted_date for update in work_issue_db.updates)
+        if new_data.get('start_date').timestamp() > earliest_issue_update_date.timestamp():
+            raise BadRequestError('issue start date cannot be after an update date')
+
     @classmethod
     def edit_issue(cls, work_id, issue_id, issue_data):
         """Edit an existing work issue, and save it only if there are changes."""
         work_issue = WorkIssuesService.find_work_issue_by_id(work_id, issue_id)
 
         if not work_issue:
             raise ResourceNotFoundError("Work issue doesnt exist")
-
         cls._check_edit_auth(work_id)
+        cls._check_valid_issue_edit_data(issue_data, work_issue)
 
         # Create a flag to track changes on work_issues
         has_changes_to_work_issue = False

epictrack-web/src/components/workPlan/issues/Forms/EditIssue.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import * as yup from "yup";
 import { yupResolver } from "@hookform/resolvers/yup";
@@ -13,6 +13,7 @@ import { EditIssueForm } from "../types";
 import moment from "moment";
 import ControlledDatePicker from "../../../shared/controlledInputComponents/ControlledDatePicker";
 import { ETFormLabel } from "../../../shared";
+import dayjs from "dayjs";
 
 const InfoIcon: React.FC<IconProps> = Icons["InfoIcon"];
 
@@ -40,6 +41,19 @@ const EditIssue = () => {
     mode: "onSubmit",
   });
 
+  const maxStartDate = useMemo(() => {
+    if (!issueToEdit) {
+      return undefined;
+    }
+
+    // find the min date of updates
+    const updatesPostedDates = issueToEdit.updates.map((update) =>
+      moment(update.posted_date)
+    );
+    const minPostedDate = moment.min(updatesPostedDates).toDate();
+    return dayjs(minPostedDate);
+  }, [issueToEdit]);
+
   const { handleSubmit, watch } = methods;
 
   const watchedTitle = watch("title");
@@ -131,7 +145,12 @@ const EditIssue = () => {
         </Grid>
         <Grid item xs={6}>
           <ETFormLabel required>Start Date</ETFormLabel>
-          <ControlledDatePicker name="start_date" />
+          <ControlledDatePicker
+            name="start_date"
+            datePickerProps={{
+              maxDate: maxStartDate,
+            }}
+          />
         </Grid>
         <Grid item xs={6}>
           <ETFormLabel required>Expected Resolution Date</ETFormLabel>