Refactor + tests WIP

Author: chris-adam

imio/dms/mail/adapters.py

@@ -1606,7 +1606,7 @@ def approve_file(self, afile, userid, values=None, transition=None, c_a=None):
         self.annot["approval"][c_a][f_index]["approved_on"] = datetime.datetime.now()
         self.annot["approval"][c_a][f_index]["approved_by"] = userid
         self.annot["current_nb"] = self.calculate_current_nb()
-        pc = getToolByName(self.context, "portal_catalog")
+        pc = getToolByName(api.portal.get(), "portal_catalog")
         if self.is_file_approved(f_uid):
             afile.approved = True
             if values is not None:

imio/dms/mail/configure.zcml

@@ -314,7 +314,6 @@
         class=".utils.OdmUtilsMethods"
         permission="zope2.View"
         allowed_attributes="
-            duplicate
             get_object_from_relation
             get_om_folder
             highest_scan_id

imio/dms/mail/dmsmail.py

@@ -887,46 +887,6 @@ def wf_conditions(self):
     def has_mailing(self, document):
         return need_mailing_value(document=document)
 
-    def copy_dms_files(self, original_mail):
-        """Re-generate DMS files on self from templates used in original_mail."""
-        mainfile_type = "dmsommainfile"
-        dms_files = [sub for sub in original_mail.values() if sub.portal_type == mainfile_type]
-        used_template_uids = set()
-        # If no mail date, import it from source mail. Otherwise, the generated mails might be broken
-        if dms_files and not self.mail_date:
-            self.mail_date = original_mail.mail_date
-            api.portal.show_message(
-                translate(
-                    'The mail date was missing and has been updating following the source mail (${date}).',
-                    domain='imio.dms.mail',
-                    context=self.REQUEST,
-                    mapping={"date": self.mail_date.strftime("%d/%m/%Y")},
-                ),
-                request=self.REQUEST,
-                type='warn',
-            )
-        for dms_file in dms_files:
-            annot = IAnnotations(dms_file).get('documentgenerator', {})
-            if not annot:
-                api.content.copy(source=dms_file, target=self)
-                continue
-            if not annot.get('template_uid') or annot.get('template_uid') in used_template_uids:
-                continue
-            document_generation_helper_view = getMultiAdapter(
-                (self, self.REQUEST), name="document_generation_helper_view")
-            requires_mailing = len(document_generation_helper_view.mailing_list()) > 1
-            if requires_mailing and not annot.get('need_mailing'):
-                continue
-            template_uid = annot.get('template_uid')
-            generation_view = getMultiAdapter((self, self.REQUEST), name="persistent-document-generation")
-            pod_template = generation_view.get_pod_template(template_uid)
-            if IMailingLoopTemplate.providedBy(pod_template):
-                continue
-            generation_view.pod_template = pod_template
-            generation_view.output_format = 'odt'
-            generation_view.generate_persistent_doc(pod_template, 'odt')
-            used_template_uids.add(template_uid)
-
 
 class ImioDmsOutgoingMailWfConditionsAdapter(object):
     implements(IImioDmsOutgoingMailWfConditions)

imio/dms/mail/subscribers.py

@@ -480,7 +480,8 @@ def dmsoutgoingmail_modified(mail, event):
         del annot['copy_dms_files_from']
         try:
             original_mail = uuidToObject(copy_dms_files_from, unrestricted=True)
-            mail.copy_dms_files(original_mail)
+            odm_utils = getMultiAdapter((mail, mail.REQUEST), name="odm-utils")
+            odm_utils.copy_dms_files(original_mail)
         except Exception as e:
             logger.exception('An error occured when copying DMS files')
             api.portal.show_message(

imio/dms/mail/tests/test_adapters.py

@@ -26,12 +26,12 @@
 from imio.dms.mail.adapters import TaskValidationCriterion
 from imio.dms.mail.browser.settings import IImioDmsMailConfig
 from imio.dms.mail.content.behaviors import ISigningBehavior
+from imio.dms.mail.Extensions.demo import activate_signing
 from imio.dms.mail.testing import DMSMAIL_INTEGRATION_TESTING
 from imio.dms.mail.testing import reset_dms_config
 from imio.dms.mail.utils import DummyView
 from imio.dms.mail.utils import set_dms_config
 from imio.dms.mail.utils import sub_create
-from imio.esign.config import set_registry_file_url
 from imio.esign.utils import get_session_annotation
 from imio.helpers.test_helpers import ImioTestHelpers
 from plone import api
@@ -470,11 +470,8 @@ class TestOMApprovalAdapter(unittest.TestCase, ImioTestHelpers):
     def setUp(self):
         self.portal = self.layer["portal"]
         self.pw = self.portal.portal_workflow
+        activate_signing(self.portal)
         self.change_user("admin")
-        self.portal.portal_setup.runImportStepFromProfile(
-            "profile-imio.dms.mail:singles", "imiodmsmail-activate-esigning", run_dependencies=False
-        )
-        set_registry_file_url("https://downloads.files.com")
         # Create outgoing mail with two eSign signers and two files to approve
         intids = getUtility(IIntIds)
         self.pgof = self.portal["contacts"]["plonegroup-organization"]

imio/dms/mail/tests/test_dmsmail.py

@@ -31,7 +31,6 @@
 from plone.namedfile.file import NamedBlobFile
 from z3c.relationfield.relation import RelationValue
 from zc.relation.interfaces import ICatalog
-from zope.annotation.interfaces import IAnnotations
 from zope.component import getUtility
 from zope.interface import Invalid
 from zope.intid.interfaces import IIntIds
@@ -643,43 +642,3 @@ def test_AssignedUserValidator(self):
         self.assertRaises(Invalid, auv.validate, "agent1")
         # we check assigned_user requirement if the imail state will be changed
         # this test is done in im wfadaptation test
-
-    def test_ImioDmsOutgoingMail_copy_dms_files(self):
-        """Test ImioDmsOutgoingMail.copy_dms_files"""
-        # Create fresh source and destination mails
-        original = sub_create(self.portal["outgoing-mail"], "dmsoutgoingmail", datetime.now(), "test-orig-dms")
-        pc = api.portal.get_tool("portal_catalog")
-
-        # No dmsommainfile on original → copy_dms_files is a no-op
-        new_mail = sub_create(self.portal["outgoing-mail"], "dmsoutgoingmail", datetime.now(), "test-copy-dms-1")
-        new_mail.mail_date = date.today()
-        new_mail.copy_dms_files(original)
-        self.assertEqual(len(pc(portal_type="dmsommainfile", path="/".join(new_mail.getPhysicalPath()))), 0)
-
-        # Add a dmsommainfile without documentgenerator annotation → direct copy
-        new_mail2 = sub_create(self.portal["outgoing-mail"], "dmsoutgoingmail", datetime.now(), "test-copy-dms-2")
-        new_mail2.mail_date = date.today()
-        filename = u"Réponse salle.odt"
-        with open("%s/batchimport/toprocess/outgoing-mail/%s" % (PRODUCT_DIR, filename), "rb") as fo:
-            mainfile = createContentInContainer(
-                original, "dmsommainfile", file=NamedBlobFile(fo.read(), filename=filename))
-        self.assertNotIn("documentgenerator", IAnnotations(mainfile))
-        new_mail2.copy_dms_files(original)
-        self.assertEqual(len([s for s in new_mail2.values() if s.portal_type == "dmsommainfile"]), 1)
-
-        # Add a dmsommainfile generated from a template → regenerate the file on new_mail
-        new_mail3 = sub_create(self.portal["outgoing-mail"], "dmsoutgoingmail", datetime.now(), "test-copy-dms-3")
-        new_mail3.mail_date = date.today()
-        dgv = getMultiAdapter((original, self.request), name="persistent-document-generation")
-        template_uid = self.portal["templates"]["om"]["main"].UID()
-        dgv(template_uid=template_uid, output_format='odt')
-        new_mail3.copy_dms_files(original)
-        self.assertEqual(len(pc(portal_type="dmsommainfile", path="/".join(new_mail3.getPhysicalPath()))), 1)
-
-        # mail_date missing on new_mail → gets copied from original (with warn message)
-        new_mail4 = sub_create(self.portal["outgoing-mail"], "dmsoutgoingmail", datetime.now(), "test-copy-dms-4")
-        original.mail_date = date(2024, 1, 15)
-        self.assertIsNone(new_mail4.mail_date)
-        new_mail4.copy_dms_files(original)
-        self.assertEqual(new_mail4.mail_date, date(2024, 1, 15))
-        self.assertEqual(len(pc(portal_type="dmsommainfile", path="/".join(new_mail4.getPhysicalPath()))), 1)