Merge pull request #138 from Kinto/137-keep-old-files-on-delete

Do not delete attachment when record is deleted if keep_old_files setting is true (#137)

CHANGELOG.rst

@@ -4,7 +4,9 @@ Changelog
 3.1.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+**Bug fix**
+
+- Do not delete attachment when record is deleted if ``keep_old_files`` setting is true (#137)
 
 
 3.0.0 (2018-04-10)

kinto_attachment/listeners.py

@@ -2,6 +2,7 @@
 from kinto.core.errors import http_error
 from pyramid.events import subscriber
 from pyramid.exceptions import HTTPBadRequest
+from pyramid.settings import asbool
 
 from . import utils
 
@@ -15,6 +16,11 @@ def on_delete_record(event):
     When a bucket or collection is deleted, it removes the attachments of
     every underlying records.
     """
+    settings = event.request.registry.settings
+    keep_old_files = asbool(settings.get('attachment.keep_old_files', False))
+    if keep_old_files:
+        return
+
     # Retrieve attachments for these records using links.
     resource_name = event.payload['resource_name']
     filter_field = '%s_uri' % resource_name

kinto_attachment/tests/test_views_attachment.py

@@ -475,6 +475,24 @@ def test_files_are_kept_when_attachment_is_replaced(self):
         self.assertTrue(self.backend.exists(location2))
         self.assertTrue(self.backend.exists(location1))
 
+    def test_files_are_kept_when_attachment_is_deleted(self):
+        resp = self.upload(status=201)
+        location = resp.json["location"]
+        self.assertTrue(self.backend.exists(location))
+
+        self.app.delete(self.record_uri + "/attachment", headers=self.headers)
+
+        self.assertTrue(self.backend.exists(location))
+
+    def test_files_are_kept_when_record_is_deleted(self):
+        resp = self.upload(status=201)
+        location = resp.json["location"]
+        self.assertTrue(self.backend.exists(location))
+
+        self.app.delete(self.record_uri, headers=self.headers)
+
+        self.assertTrue(self.backend.exists(location))
+
 
 class HeartbeartTest(BaseWebTestS3, unittest.TestCase):
     def test_attachments_is_added_to_heartbeat_view(self):

kinto_attachment/views/__init__.py

@@ -99,7 +99,12 @@ def post_attachment_view(request, file_field):
 
 
 def delete_attachment_view(request, file_field):
-    utils.delete_attachment(request)
+    settings = request.registry.settings
+    keep_old_files = asbool(settings.get('attachment.keep_old_files', False))
+
+    print(keep_old_files)
+    if not keep_old_files:
+        utils.delete_attachment(request)
 
     # Remove metadata.
     record = {"data": {}}