DBMISVC-119 - Added async copy/move endpoints

Dockerfile

@@ -42,6 +42,9 @@ RUN pip install --no-index \
         # and Pip errors out on the mismatches.
         -r /requirements.in
 
+# Setup entry scripts
+ADD docker-entrypoint-init.d/* /docker-entrypoint-init.d/
+
 # Copy app source
 COPY /fileservice /app
 

docker-entrypoint-init.d/45-django-q.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+# Create the Django cache table as needed by Q
+python ${DBMI_APP_ROOT}/manage.py createcachetable
+
+# Start the Q cluster
+python ${DBMI_APP_ROOT}/manage.py qcluster &

fileservice/filemaster/admin.py

@@ -7,6 +7,7 @@
 from filemaster.models import CustomUser
 from filemaster.models import DownloadLog
 from filemaster.models import FileLocation
+from filemaster.models import FileOperation
 
 from guardian.admin import GuardedModelAdmin
 
@@ -22,7 +23,7 @@ class CustomUserAdmin(admin.ModelAdmin):
 admin.site.register(CustomUser, CustomUserAdmin)
 
 
-class BucketAdmin(admin.ModelAdmin):
+class BucketAdmin(GuardedModelAdmin):
     list_display = ('name', )
 
 
@@ -34,7 +35,7 @@ class ArchiveFileAdmin(GuardedModelAdmin):
     list_display = ('filename', 'uuid', 'creationdate', 'owner')
     readonly_fields = ('uuid', 'creationdate')
     sortable_by = ('owner', 'creationdate', 'modifydate')
-    search_fields = ('owner__email', 'owner__username', 'filename', 'metadata', )
+    search_fields = ('uuid', 'owner__email', 'owner__username', 'filename', 'metadata', )
 
 
 admin.site.register(ArchiveFile, ArchiveFileAdmin)
@@ -62,6 +63,15 @@ class DownloadLogAdmin(admin.ModelAdmin):
 admin.site.register(DownloadLog, DownloadLogAdmin)
 
 
+class FileOperationAdmin(admin.ModelAdmin):
+    fields = ('uuid', 'archivefile', 'task_id', 'creationdate', 'modifydate', 'origin', 'destination', 'origin_location', 'destination_location')
+    readonly_fields = ('completed', 'task_id', 'uuid', 'creationdate', 'modifydate', 'archivefile',  'origin', 'destination', 'origin_location', 'destination_location')
+    list_display = ('uuid', 'operation', 'archivefile', 'origin', 'destination', 'completed', 'creationdate', 'modifydate', )
+    sortable_by = ('creationdate', 'modifydate', 'archivefile', 'origin', 'destination', )
+
+admin.site.register(FileOperation, FileOperationAdmin)
+
+
 def patch_admin(model, admin_site=None):
     """
     Enables version control with full admin integration for a model that has

fileservice/filemaster/aws.py

@@ -8,7 +8,7 @@
 from boto.s3.connection import S3Connection
 from django.conf import settings
 
-from .models import FileLocation
+from .models import ArchiveFile, FileLocation
 
 import logging
 log = logging.getLogger(__name__)
@@ -132,7 +132,10 @@ def signedUrlDownload(archiveFile=None, hours=24):
     return False
 
 
-def awsCopyFile(archive_file, destination, origin):
+def awsCopyFile(archive_file_uuid, destination, origin):
+
+    # Fetch it
+    archive_file = ArchiveFile.objects.get(uuid=archive_file_uuid)
 
     # Get the location
     location = archive_file.get_location(origin)
@@ -167,7 +170,7 @@ def awsCopyFile(archive_file, destination, origin):
     # Add it
     archive_file.locations.add(new_location)
 
-    return new_location
+    return new_location.id
 
 
 def awsRemoveFile(location):
@@ -188,7 +191,10 @@ def awsRemoveFile(location):
     return True
 
 
-def awsMoveFile(archive_file, destination, origin):
+def awsMoveFile(archive_file_uuid, destination, origin):
+
+    # Fetch it
+    archive_file = ArchiveFile.objects.get(uuid=archive_file_uuid)
 
     # Get the current location
     location = archive_file.get_location(origin)
@@ -197,7 +203,7 @@ def awsMoveFile(archive_file, destination, origin):
         return False
 
     # Call other methods
-    new_location = awsCopyFile(archive_file, destination, origin)
+    new_location = awsCopyFile(archive_file.uuid, destination, origin)
     if new_location:
 
         # File was copied, remove from origin
@@ -210,7 +216,7 @@ def awsMoveFile(archive_file, destination, origin):
         else:
             log.error(f'Could not delete original file after move: {archive_file.uuid}')
 
-        return new_location
+        return new_location.id
 
     return False