Merge PR #411 into 14.0

Signed-off-by pedrobaeza

attachment_zipped_download/models/ir_attachment.py

@@ -28,9 +28,16 @@ class IrAttachment(models.Model):
         zip_buffer = BytesIO()
         with zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED, False) as zip_file:
             for attachment in self:
-                zip_file.write(
+                attachment.check("read")
-                    attachment._full_path(attachment.store_fname), attachment.name
+                zip_file.writestr(
+                    attachment._compute_zip_file_name(),
+                    attachment.raw,
                 )
             zip_buffer.seek(0)
             zip_file.close()
         return zip_buffer
+
+    def _compute_zip_file_name(self):
+        """Give a chance of easily changing the name of the file inside the ZIP."""
+        self.ensure_one()
+        return self.name

attachment_zipped_download/tests/test_attachment_zipped_download.py

@@ -1,12 +1,30 @@
 # Copyright 2022-2023 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 import base64
+from unittest import TestCase
 
-import odoo.tests
+from odoo.exceptions import AccessError
-from odoo.tests import new_test_user
+from odoo.tests import HttpCase, SavepointCase, new_test_user
 
 
-class TestAttachmentZippedDownload(odoo.tests.HttpCase):
+class TestAttachmentZippedDownloadBase(TestCase):
+    @classmethod
+    def _create_attachment(cls, env, user, name, model=False, res_id=False):
+        return (
+            env["ir.attachment"]
+            .with_user(user)
+            .create(
+                {
+                    "name": name,
+                    "datas": base64.b64encode(b"\xff data"),
+                    "res_model": model,
+                    "res_id": res_id,
+                }
+            )
+        )
+
+
+class TestAttachmentZippedDownload(HttpCase, TestAttachmentZippedDownloadBase):
     def setUp(self):
         super().setUp()
         ctx = {
@@ -21,24 +39,56 @@ class TestAttachmentZippedDownload(odoo.tests.HttpCase):
             password="test-user",
             context=ctx,
         )
-        test_1 = self._create_attachment(self.user, "test1.txt")
+        test_1 = self._create_attachment(self.env, self.user, "test1.txt")
-        test_2 = self._create_attachment(self.user, "test2.txt")
+        test_2 = self._create_attachment(self.env, self.user, "test2.txt")
         self.attachments = test_1 + test_2
 
-    def _create_attachment(self, user, name):
-        return (
-            self.env["ir.attachment"]
-            .with_user(user)
-            .create(
-                {
-                    "name": name,
-                    "datas": base64.b64encode(b"\xff data"),
-                }
-            )
-        )
-
     def test_action_attachments_download(self):
         self.authenticate("test-user", "test-user")
         res = self.attachments.action_attachments_download()
         response = self.url_open(res["url"], timeout=20)
         self.assertEqual(response.status_code, 200)
+
+
+class TestAttachmentZipped(SavepointCase, TestAttachmentZippedDownloadBase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        ctx = {
+            "mail_create_nolog": True,
+            "mail_create_nosubscribe": True,
+            "mail_notrack": True,
+            "no_reset_password": True,
+        }
+        cls.user = new_test_user(
+            cls.env,
+            login="test-user",
+            password="test-user",
+            groups="base.group_user,base.group_partner_manager",
+            context=ctx,
+        )
+        test_1 = cls._create_attachment(cls.env, cls.user, "test1.txt")
+        test_2 = cls._create_attachment(cls.env, cls.user, "test2.txt")
+        test_3 = cls._create_attachment(
+            cls.env,
+            cls.user,
+            "test3.txt",
+            model="res.partner",
+            res_id=cls.user.partner_id.id,
+        )
+        cls.attachments = test_1 + test_2 + test_3
+
+    def test_create_temp_zip(self):
+        res = self.attachments._create_temp_zip()
+        self.assertTrue(res)
+
+    def test_create_temp_zip_access_denined(self):
+        attachments = self.attachments | self._create_attachment(
+            self.env,
+            self.uid,
+            "test4.txt",
+            model="ir.ui.view",
+            res_id=self.env.ref("base.view_view_form").id,
+        )
+        with self.assertRaises(AccessError):
+            attachments._create_temp_zip()