Changeset 8340661 in OpenWorkouts-current

Timestamp:

Oct 13, 2019, 8:12:17 PM (4 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current

Children:

9cc65af

Parents:

6211162

Message:

(#77) Bulk workouts upload:

• added option to delete existing bulk files

Location:

ow

Files:

• templates/bulk_files.pt (modified) (1 diff)
• templates/delete_bulk_file.pt (added)
• tests/views/test_bulk.py (modified) (1 diff)
• views/bulk.py (modified) (1 diff)

ow/templates/bulk_files.pt

@@ -60 +60 @@
           </p>
 
+          <p>
+            <a href="" tal:attributes="href request.resource_url(bulk_file, 'delete')"
+               i18n:translate="">delete</a>
+          </p>
+
           <!--!
                <tal:workouts tal:condition="bulk_file.loaded and bulk_file.workout_ids">

ow/tests/views/test_bulk.py

@@ -216 +216 @@
         assert response == {'bulk_files': [bulk_file]}
         assert response['bulk_files'][0].uid == str(user.uid)
+
+    def test_delete_bulk_file_get(self, dummy_request):
+        request = dummy_request
+        user = request.root.users[0]
+        # let's add one bulk file
+        uid = str(user.uid)
+        bulk_file = BulkFile(uid=uid)
+        bulk_file_path = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)),
+            'fixtures/bulk-fit.zip')
+        with open(bulk_file_path, 'rb') as _bulk_file:
+            bulk_file.compressed_file = create_blob(
+                _bulk_file.read(), file_extension='zip', binary=True)
+        bulk_file.file_name = 'bulk-fit.zip'
+        bulk_file.file_type = 'zip'
+        request.root['_bulk_files'].add_bulk_file(bulk_file)
+        assert len(request.root['_bulk_files']) == 1
+        response = bulk_views.delete_bulk_file(bulk_file, request)
+        assert response == {'user': user}
+        assert len(request.root['_bulk_files']) == 1
+
+    def test_delete_bulk_file_post_invalid(self, dummy_request):
+        request = dummy_request
+        request.method = 'POST'
+        # invalid, missing confirmation delete hidden value
+        request.POST = MultiDict({'submit': True})
+        user = request.root.users[0]
+        # let's add one bulk file
+        uid = str(user.uid)
+        bulk_file = BulkFile(uid=uid)
+        bulk_file_path = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)),
+            'fixtures/bulk-fit.zip')
+        with open(bulk_file_path, 'rb') as _bulk_file:
+            bulk_file.compressed_file = create_blob(
+                _bulk_file.read(), file_extension='zip', binary=True)
+        bulk_file.file_name = 'bulk-fit.zip'
+        bulk_file.file_type = 'zip'
+        request.root['_bulk_files'].add_bulk_file(bulk_file)
+        assert len(request.root['_bulk_files']) == 1
+        response = bulk_views.delete_bulk_file(bulk_file, request)
+        assert response == {'user': user}
+        assert len(request.root['_bulk_files']) == 1
+
+    def test_delete_bulk_file_post_valid(self, dummy_request):
+        request = dummy_request
+        request.method = 'POST'
+        # invalid, missing confirmation delete hidden value
+        request.POST = MultiDict({'submit': True, 'delete': 'yes'})
+        user = request.root.users[0]
+        # let's add one bulk file
+        uid = str(user.uid)
+        bulk_file = BulkFile(uid=uid)
+        bulk_file_path = os.path.join(
+            os.path.dirname(os.path.dirname(__file__)),
+            'fixtures/bulk-fit.zip')
+        with open(bulk_file_path, 'rb') as _bulk_file:
+            bulk_file.compressed_file = create_blob(
+                _bulk_file.read(), file_extension='zip', binary=True)
+        bulk_file.file_name = 'bulk-fit.zip'
+        bulk_file.file_type = 'zip'
+        request.root['_bulk_files'].add_bulk_file(bulk_file)
+        assert len(request.root['_bulk_files']) == 1
+        response = bulk_views.delete_bulk_file(bulk_file, request)
+        # after a successful delete, we send the user back to his dashboard
+        assert isinstance(response, HTTPFound)
+        assert response.location == request.resource_url(user, 'bulk-files')
+        assert len(request.root['_bulk_files']) == 0

ow/views/bulk.py

@@ -54 +54 @@
 
 @view_config(
+    context=BulkFile,
+    permission='delete',
+    name='delete',
+    renderer='ow:templates/delete_bulk_file.pt')
+def delete_bulk_file(context, request):
+    """
+    Delete a bulk file
+    """
+    uid = context.uid
+    user = request.root.get_user_by_uid(uid)
+    if 'submit' in request.POST:
+        if request.POST.get('delete', None) == 'yes':
+            del request.root['_bulk_files'][str(context.bfid)]
+            return HTTPFound(location=request.resource_url(user, 'bulk-files'))
+    return {'user': user}
+
+
+@view_config(
     context=User,
     permission='edit',