Merge pull request #1012 from mdhaman/SDESK-3394

[SDESK-3394] Fixing date validation for event editor form.
superdesk · Sep 27, 2018 · 91ddbf5 · 91ddbf5
2 parents b8e0b65 + b78c698
commit 91ddbf5
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 8 deletions.
diff --git a/client/components/Main/EditorPanel.jsx b/client/components/Main/EditorPanel.jsx
@@ -51,14 +51,14 @@ const mapDispatchToProps = (dispatch) => ({
     onPost: (item) => dispatch(actions.main.post(item)),
     openCancelModal: (modalProps) => dispatch(actions.main.openIgnoreCancelSaveModal(modalProps)),
 
-    onValidate: (type, item, diff, profile, errors, messages) => dispatch(validateItem({
+    onValidate: (type, item, diff, profile, errors, messages, ignoreDateValidation = false) => dispatch(validateItem({
         profileName: type,
         item: item,
         diff: diff,
         formProfiles: profile,
         errors: errors,
         messages: messages,
-        ignoreDateValidation: true,
+        ignoreDateValidation: ignoreDateValidation,
     })),
     loadItem: (itemId, itemType) => dispatch(actions.main.loadItem(itemId, itemType, 'edit')),
     itemActions: actionUtils.getActionDispatches({dispatch: dispatch}),
@@ -79,14 +79,14 @@ const mapDispatchToPropsModal = (dispatch) => ({
     onUnpost: (item) => dispatch(actions.main.unpost(item)),
     onPost: (item) => dispatch(actions.main.post(item)),
     openCancelModal: (modalProps) => dispatch(actions.main.openIgnoreCancelSaveModal(modalProps)),
-    onValidate: (type, item, diff, profile, errors, messages) => dispatch(validateItem({
+    onValidate: (type, item, diff, profile, errors, messages, ignoreDateValidation = false) => dispatch(validateItem({
         profileName: type,
         item: item,
         diff: diff,
         formProfiles: profile,
         errors: errors,
         messages: messages,
-        ignoreDateValidation: true,
+        ignoreDateValidation: ignoreDateValidation,
     })),
     loadItem: (itemId, itemType) => dispatch(actions.main.loadItem(itemId, itemType, 'edit')),
     itemActions: actionUtils.getActionDispatches({dispatch: dispatch}),

diff --git a/client/components/Main/ItemEditor/Editor.jsx b/client/components/Main/ItemEditor/Editor.jsx
@@ -239,7 +239,8 @@ export class EditorComponent extends React.Component {
             diff,
             this.props.formProfiles,
             errors,
-            errorMessages
+            errorMessages,
+            !isTemporaryId(this.props.itemId)
         );
 
         const newState = {diff, errors, errorMessages};
@@ -315,7 +316,8 @@ export class EditorComponent extends React.Component {
             updates,
             this.props.formProfiles,
             errors,
-            errorMessages
+            errorMessages,
+            !isTemporaryId(this.props.itemId)
         );
 
         if (isEqual(errorMessages, [])) {

diff --git a/server/features/events.feature b/server/features/events.feature
@@ -928,4 +928,34 @@ Feature: Events
         Then we get error 400
         """
         {"_message": "Event duration is greater than 7 days.", "_status": "ERR"}
+        """
+
+    @auth
+    Scenario: Create new event fails start date less than end date
+        Given config update
+        """
+        {"MAX_MULTI_DAY_EVENT_DURATION": 7}
+        """
+        When we post to "/events"
+        """
+        [
+            {
+                "guid": "123",
+                "unique_id": "123",
+                "unique_name": "123 name",
+                "name": "event 123",
+                "slugline": "event-123",
+                "definition_short": "short value",
+                "definition_long": "long value",
+                "dates": {
+                    "start": "2099-01-12",
+                    "end": "2099-01-10"
+                },
+                "subject": [{"qcode": "test qcaode", "name": "test name"}]
+            }
+        ]
+        """
+        Then we get error 400
+        """
+        {"_message": "END TIME should be after START TIME", "_status": "ERR"}
         """
diff --git a/server/features/steps/steps.py b/server/features/steps/steps.py
@@ -278,7 +278,7 @@ def step_impl_when_we_duplicate_event(context, event_id):
 
         duplicate_event['duplicate_from'] = event_id
         duplicate_event['dates']['start'] = "2099-01-02"
-        duplicate_event['dates']['start'] = "2099-01-03"
+        duplicate_event['dates']['end'] = "2099-01-03"
         duplicate_event['unique_id'] = 456
         duplicate_event['definition_short'] = 'duplicate'
         duplicate_event['name'] = 'duplicate'

diff --git a/server/planning/commands/flag_expired_items_test.py b/server/planning/commands/flag_expired_items_test.py
@@ -26,7 +26,7 @@
 }
 
 expired = {
-    'event': {'dates': {'start': yesterday, 'end': yesterday - timedelta(hours=1)}},
+    'event': {'dates': {'start': yesterday, 'end': yesterday + timedelta(hours=1)}},
     'plan': {'planning_date': yesterday},
     'coverage': {'planning': {'scheduled': yesterday}}
 }

diff --git a/server/planning/events/events.py b/server/planning/events/events.py
@@ -194,6 +194,21 @@ def validate_event(self, event):
         @:param dict event: event created or updated
         """
         self._validate_multiday_event_duration(event)
+        self._validate_dates(event)
+
+    def _validate_dates(self, event):
+        """Validate the dates
+
+        @:param dict event:
+        """
+        start_date = event.get('dates', {}).get('start')
+        end_date = event.get('dates', {}).get('end')
+
+        if not start_date or not end_date:
+            return
+
+        if end_date < start_date:
+            raise SuperdeskApiError(message="END TIME should be after START TIME")
 
     def _validate_multiday_event_duration(self, event):
         """Validate that the multiday event duration is not greater than PLANNING_MAX_MULTI_DAY_DURATION