[19.0][MIG] fs_storage Migration 19.0

Author: cyrilmanuel

.pre-commit-config.yaml

@@ -1,7 +1,6 @@
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
-  ^fs_attachment/|
   ^fs_attachment_s3/|
   ^fs_file/|
   ^fs_folder/|

fs_attachment/__manifest__.py

@@ -17,7 +17,7 @@
         "views/fs_storage.xml",
     ],
     "external_dependencies": {"python": ["python_slugify", "fsspec>=2025.3.0"]},
-    "installable": False,
+    "installable": True,
     "auto_install": False,
     "maintainers": ["lmignon"],
     "pre_init_hook": "pre_init_hook",

fs_attachment/models/fs_file_gc.py

@@ -17,13 +17,10 @@ class FsFileGC(models.Model):
     store_fname = fields.Char("Stored Filename")
     fs_storage_code = fields.Char("Storage Code")
 
-    _sql_constraints = [
-        (
-            "store_fname_uniq",
-            "unique (store_fname)",
-            "The stored filename must be unique!",
-        ),
-    ]
+    _store_fname_uniq = models.Constraint(
+        'unique (store_fname)',
+        'The stored filename must be unique!',
+    )
 
     def _is_test_mode(self) -> bool:
         """Return True if we are running the tests, so we do not mark files for
@@ -101,7 +98,7 @@ def _gc_files(self) -> None:
         # the LOCK statement will wait until those concurrent transactions end.
         # But this transaction will not see the new attachements if it has done
         # other requests before the LOCK (like the method _storage() above).
-        cr = self._cr
+        cr = self.env.cr
         cr.commit()  # pylint: disable=invalid-commit
 
         # prevent all concurrent updates on ir_attachment and fs_file_gc
@@ -125,7 +122,7 @@ def _gc_files_unsafe(self) -> None:
         if not codes:
             return
         # we process by batch of storage codes.
-        self._cr.execute(
+        self.env.cr.execute(
             """
             SELECT
                 fs_storage_code,
@@ -145,7 +142,7 @@ def _gc_files_unsafe(self) -> None:
             """,
             (tuple(codes),),
         )
-        for code, store_fnames in self._cr.fetchall():
+        for code, store_fnames in self.env.cr.fetchall():
             self.env["fs.storage"].get_by_code(code)
             fs = self.env["fs.storage"].get_fs_by_code(code)
             for store_fname in store_fnames:
@@ -156,7 +153,7 @@ def _gc_files_unsafe(self) -> None:
                     _logger.debug("Failed to remove file %s", store_fname)
 
         # delete the records from the table fs_file_gc
-        self._cr.execute(
+        self.env.cr.execute(
             """
             DELETE FROM
                 fs_file_gc

fs_attachment/models/fs_storage.py

@@ -132,7 +132,7 @@ def write(self, vals):
             if not vals["use_as_default_for_attachments"]:
                 vals["force_db_for_default_attachment_rules"] = None
         res = super().write(vals)
-        self._create_write_check_constraints(vals)
+        self.env.create_write_check_constraints(vals)
         return res
 
     def _create_write_check_constraints(self, vals):

fs_attachment/models/ir_attachment.py

@@ -20,7 +20,7 @@
 import odoo
 from odoo import _, api, fields, models
 from odoo.exceptions import AccessError, UserError
-from odoo.osv.expression import AND, OR, normalize_domain
+from odoo.fields import Domain
 
 from .strtobool import strtobool
 
@@ -169,9 +169,9 @@ def _store_in_db_instead_of_object_storage_domain(self):
         for mimetype_key, limit in storage_config.items():
             part = [("mimetype", "=like", f"{mimetype_key}%")]
             if limit:
-                part = AND([part, [("file_size", "<=", limit)]])
+                part = Domain.AND([part, [("file_size", "<=", limit)]])
             # OR simplifies to [(1, '=', 1)] if a domain being OR'ed is empty
-            domain = OR([domain, part]) if domain else part
+            domain = Domain.OR([domain, part]) if domain else part
         return domain
 
     def _store_in_db_instead_of_object_storage(self, data, mimetype):
@@ -762,9 +762,9 @@ def force_storage_to_db_for_special_fields(
             )
             return
 
-        domain = AND(
+        domain = Domain.AND(
             (
-                normalize_domain(
+                Domain.normalize_domain(
                     [
                         ("store_fname", "=like", f"{storage}://%"),
                         # for res_field, see comment in
@@ -774,7 +774,7 @@ def force_storage_to_db_for_special_fields(
                         ("res_field", "!=", False),
                     ]
                 ),
-                normalize_domain(self._store_in_db_instead_of_object_storage_domain()),
+                Domain.normalize_domain(self._store_in_db_instead_of_object_storage_domain()),
             )
         )
 

fs_attachment/tests/test_fs_attachment.py

@@ -396,7 +396,7 @@ def test_create_attachments_basic_user(self):
         group_user = self.env.ref("base.group_user")
         group_partner_manager = self.env.ref("base.group_partner_manager")
         demo_user.write(
-            {"groups_id": [(6, 0, [group_user.id, group_partner_manager.id])]}
+            {"groups_ids": [(6, 0, [group_user.id, group_partner_manager.id])]}
         )
         # Create basic attachment
         self.ir_attachment_model.with_user(demo_user).create(

fs_attachment/tests/test_fs_attachment_file_like_adapter.py

@@ -16,7 +16,7 @@ def prepareClass(cls):
         cls.new_content = b"This is a new test attachment"
 
     def prepare(self):
-        self.attachment = self._create_attachment()
+        self.attachment = self.env.create_attachment()
 
     def open(self, attachment=None, mode="rb", new_version=False, **kwargs):
         return AttachmentFileLikeAdapter(

fs_attachment/tests/test_stream.py

@@ -170,7 +170,7 @@ def test_serving_field_image(self):
         demo_partner = self.env.ref("base.partner_demo")
         demo_partner.with_context(
             storage_location=self.temp_backend.code,
-        ).write({"image_128": base64.encodebytes(self._create_image(128, 128))})
+        ).write({"image_128": base64.encodebytes(self.env.create_image(128, 128))})
         url = f"/web/image/{demo_partner._name}/{demo_partner.id}/image_128"
         res = self.assertDownload(
             url,

fs_storage/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "Filesystem Storage Backend",
     "summary": "Implement the concept of Storage with amazon S3, sftp...",
-    "version": "18.0.2.0.1",
+    "version": "19.0.1.0.0",
     "category": "FS Storage",
     "website": "https://github.com/OCA/storage",
     "author": " ACSONE SA/NV, Odoo Community Association (OCA)",

fs_storage/tests/test_fs_storage.py

@@ -82,7 +82,12 @@ def test_ensure_one_fs_by_record(self):
         for i in range(4):
             backend_ids.append(
                 self.backend.create(
-                    {"name": f"name{i}", "directory_path": f"{i}", "code": f"code{i}"}
+                     {
+                        "name": f"name{i}",
+                        "directory_path": f"{i}",
+                        "code": f"code{i}",
+                        "protocol": "odoofs",
+                    }
                 ).id
             )
         records = self.backend.browse(backend_ids)