Merge pull request #8232 from 4teamwork/ran/TI-3178/dossier-resolve-end

Add automatically set end date feature

Author: Acrop146

changes/TI-3178.feature

@@ -0,0 +1 @@
+Implement automatically set dossier end date during resolve feature flag. [ran]

opengever/api/tests/test_config.py

@@ -66,6 +66,7 @@ def test_config_contains_features(self, browser):
                 u'activity': False,
                 u'archival_file_conversion': False,
                 u'archival_file_conversion_blacklist': [],
+                u'automatically_set_end_date': False,
                 u'changed_for_end_date': True,
                 u'classic_ui_enabled': True,
                 u'contacts': 'plone',

opengever/base/configuration.py

@@ -196,6 +196,7 @@ def get_features(self):
             interface=IOfficeConnectorSettings
         )
         features['sign'] = is_sign_feature_enabled()
+        features['automatically_set_end_date'] = api.portal.get_registry_record('automatically_set_end_date', interface=IDossierResolveProperties)  # noqa
 
         return features
 

opengever/base/tests/test_configuration_adapter.py

@@ -112,6 +112,7 @@ def test_configuration(self):
                 ('multiple_dossier_types', False),
                 ('oc_plugin_check_enabled', False),
                 ('sign', False),
+                ('automatically_set_end_date', False),
                 ])),
             ('root_url', 'http://nohost/plone'),
             ('portal_url', 'http://nohost/portal'),

opengever/core/upgrades/20260316153724__add_automatically_set_end_date_feature_flag/__init__.py

@@ -0,0 +1,5 @@
+<registry>
+  <records interface="opengever.dossier.interfaces.IDossierResolveProperties">
+    <value key="automatically_set_end_date">False</value>
+  </records>
+</registry>

opengever/core/upgrades/20260316153724__add_automatically_set_end_date_feature_flag/registry.xml

@@ -0,0 +1,9 @@
+from ftw.upgrade import UpgradeStep
+
+
+class addAutomaticallySetEndDate(UpgradeStep):
+    """Add automactically set end date feature flag.
+    """
+
+    def __call__(self):
+        self.install_upgrade_profile()

opengever/core/upgrades/20260316153724__add_automatically_set_end_date_feature_flag/upgrade.py

@@ -264,6 +264,14 @@ class IDossierResolveProperties(Interface):
         default=True
     )
 
+    automatically_set_end_date = schema.Bool(
+        title=u"Set earliest possible end date if original end date is too early",
+        description=u'When True, if invalid end date is set, it is automatically '
+        'corrected to earliest possible end date. If set to False, the '
+        'resolve operation will throw invalid end date error.',
+        default=False
+    )
+
 
 class IDossierType(Interface):
     """plone.app.registry schema for the dossier types setting."""

opengever/dossier/interfaces.py

@@ -89,6 +89,12 @@ def is_archive_form_needed(dossier):
         return True
 
 
+def is_automatically_set_end_date_enabled():
+    return api.portal.get_registry_record(
+        'automatically_set_end_date',
+        IDossierResolveProperties)
+
+
 class ValidResolverNamesVocabularyFactory(object):
     """Return a vocabulary that contains the names of all named-adapters
     registered as IDossierResolver for IDossierMarker.
@@ -341,7 +347,11 @@ def resolve(self, end_date=None, auto_close_tasks=False, **kwargs):
         elif is_archive_form_needed(self.context) and not end_date:
             raise TypeError
 
-        end_date = end_date or self.context.earliest_possible_end_date()
+        if end_date is None:
+            end_date = self.context.earliest_possible_end_date()
+        elif is_automatically_set_end_date_enabled():
+            end_date = max(end_date, self.context.earliest_possible_end_date())
+
         self._recursive_resolve(
             self.context, end_date, triggering_dossier=True, **kwargs)
 
@@ -607,7 +617,8 @@ def _recursive_date_validation(self, dossier):
             # invalid. In this case, should allow the resolving the main dossier
             # anyway, and correct the invalid end date during dossier resolution.
             if not dossier.is_resolved() and not dossier.has_valid_enddate():
-                self._invalid_dates.append(dossier.title)
+                if not is_automatically_set_end_date_enabled():
+                    self._invalid_dates.append(dossier.title)
 
         # recursively check subdossiers
         subdossiers = dossier.get_subdossiers(depth=1)

opengever/dossier/resolve.py

@@ -71,6 +71,7 @@
     'bumblebee-open-pdf-new-tab': 'opengever.bumblebee.interfaces.IGeverBumblebeeSettings.open_pdf_in_a_new_window',
     'bumblebee-auto-refresh': 'opengever.bumblebee.interfaces.IGeverBumblebeeSettings.is_auto_refresh_enabled',
     'changed_for_end_date': 'opengever.dossier.interfaces.IDossierResolveProperties.use_changed_for_end_date',
+    'automatically_set_end_date': 'opengever.dossier.interfaces.IDossierResolveProperties.automatically_set_end_date',
     'disposition-disregard-retention-period': 'opengever.disposition.interfaces.IDispositionSettings.disregard_retention_period',  # noqa
     'doc-properties': 'opengever.dossier.interfaces.ITemplateFolderProperties.create_doc_properties',
     'docugate': 'opengever.docugate.interfaces.IDocugateSettings.is_feature_enabled',