Merge PR #290 into 16.0

Signed-off-by lmignon

fs_file/fields.py

@@ -327,8 +327,16 @@ def write(self, records, value):
             # determine records that are known to be not null
             not_null = cache.get_records_different_from(records, self, None)
 
-        cache.update(records, self, itertools.repeat(cache_value))
-
+        if self.store:
+            # Be sure to invalidate the cache for the modified records since
+            # the value of the field has changed and the new value will be linked
+            # to the attachment record used to store the file in the storage.
+            cache.remove(records, self)
+        else:
+            # if the field is not stored and a value is set, we need to
+            # set the value in the cache since the value (the case for computed
+            # fields)
+            cache.update(records, self, itertools.repeat(cache_value))
         # retrieve the attachments that store the values, and adapt them
         if self.store and any(records._ids):
             real_records = records.filtered("id")
@@ -353,6 +361,14 @@ def write(self, records, value):
                 # update the existing attachments
                 atts.write({"raw": content, "name": filename})
                 atts_records = records.browse(atts.mapped("res_id"))
+                # set new value in the cache since we have the reference to the
+                # attachment record and a new access to the field will nomore
+                # require to load the attachment record
+                for record in atts_records:
+                    new_cache_value = self._convert_attachment_to_cache(
+                        atts.filtered(lambda att: att.res_id == record.id)
+                    )
+                    cache.update(record, self, [new_cache_value], dirty=False)
                 # create the missing attachments
                 missing = real_records - atts_records
                 if missing:

fs_file/readme/newsfragments/290.bugfix

@@ -0,0 +1,4 @@
+Ensure the cache is properly set when a new value is assigned to a FSFile field.
+If the field is stored the value to the cache must be a FSFileValue object
+linked to the attachment record used to store the file. Otherwise the value
+must be one given since it could be the result of a compute method.

fs_file/tests/test_fs_file.py

@@ -175,3 +175,17 @@ def test_fs_value_mimetype(self):
         # from the content
         value = FSFileValue(name="test", value=self.png_content)
         self.assertEqual(value.mimetype, "image/png")
+
+    def test_cache_invalidation(self):
+        """Test that the cache is invalidated when the FSFileValue is modified
+        When we assign a FSFileValue to a field, the value in the cache  must
+        be invalidated and the new value must be computed. This is required
+        because the FSFileValue from the cache should always be linked to the
+        attachment record used to store the file in the storage.
+        """
+        value = FSFileValue(name="test.png", value=self.create_content)
+        instance = self.env["test.model"].create({"fs_file": value})
+        self.assertNotEqual(instance.fs_file, value)
+        value = FSFileValue(name="test.png", value=self.write_content)
+        instance.write({"fs_file": value})
+        self.assertNotEqual(instance.fs_file, value)