Merge pull request #4805 from opensafely-core/release-file-reuploads

Allow release file reuploads to different workspaces

jobserver/releases.py

@@ -69,23 +69,24 @@ def build_outputs_zip(release_files, url_builder_func):
     return in_memory_zf
 
 
-def check_not_already_uploaded(filename, filehash, backend):
-    """Check if this filename/filehash combination has been uploaded before."""
+def check_not_already_uploaded(workspace, filename, filehash, backend):
+    """Check if this workspace/filename/filehash combination has been uploaded before."""
     duplicate = ReleaseFile.objects.filter(
         release__backend=backend,
+        workspace=workspace,
         name=filename,
         filehash=filehash,
     )
     if duplicate.exists():
         raise ReleaseFileAlreadyExists(
-            f"This version of '{filename}' has already been uploaded from backend '{backend.slug}'"
+            f"This version of '{filename}' in workspace {workspace} has already been uploaded from backend '{backend.slug}'"
         )
 
 
 @transaction.atomic
 def create_release(workspace, backend, created_by, requested_files, **kwargs):
     for f in requested_files:
-        check_not_already_uploaded(f["name"], f["sha256"], backend)
+        check_not_already_uploaded(workspace, f["name"], f["sha256"], backend)
 
     release = Release.objects.create(
         workspace=workspace,

tests/unit/jobserver/api/test_releases.py

@@ -818,10 +818,10 @@ def test_releaseworkspaceapi_post_create_release_with_oversized_file(
 
 def test_releaseworkspaceapi_post_release_already_exists(api_rf, project_membership):
     user = UserFactory(roles=[OutputChecker])
-
     release = ReleaseFactory()
     rfile = ReleaseFileFactory(
         release=release,
+        workspace=release.workspace,
         created_by=user,
         name="file.txt",
         filehash="hash",

tests/unit/jobserver/test_releases.py

@@ -84,7 +84,8 @@ def test_build_outputs_zip_with_missing_files(build_release_with_files):
 
 
 def test_create_release_reupload():
-    rfile = ReleaseFileFactory(name="file1.txt", filehash="hash")
+    workspace = WorkspaceFactory(name="workspace")
+    rfile = ReleaseFileFactory(workspace=workspace, name="file1.txt", filehash="hash")
 
     files = [
         {
@@ -93,20 +94,51 @@ def test_create_release_reupload():
             "url": "",
             "size": 4,
             "sha256": "hash",
-            "mtime": "2022-08-17T13:37Z",
+            "date": "2022-08-17T13:37Z",
             "metadata": {},
         }
     ]
 
     with pytest.raises(releases.ReleaseFileAlreadyExists):
         releases.create_release(
-            rfile.release.workspace,
+            workspace,
             rfile.release.backend,
             rfile.release.created_by,
             files,
         )
 
 
+def test_create_release_reupload_to_different_workspace():
+    workspace = WorkspaceFactory(name="workspace")
+    another_workspace = WorkspaceFactory(name="another_workspace")
+    rfile = ReleaseFileFactory(workspace=workspace, name="file1.txt", filehash="hash")
+
+    files = [
+        {
+            "name": "file1.txt",
+            "path": "path/to/file1.txt",
+            "url": "",
+            "size": 4,
+            "sha256": "hash",
+            "date": "2022-08-17T13:37Z",
+            "metadata": {},
+        }
+    ]
+
+    release = releases.create_release(
+        another_workspace,
+        rfile.release.backend,
+        rfile.release.created_by,
+        files,
+    )
+    assert release.requested_files == files
+    assert release.files.count() == 1
+
+    rfile = release.files.first()
+    rfile.filehash == "hash"
+    rfile.size == 4
+
+
 def test_create_release_success():
     backend = BackendFactory()
     workspace = WorkspaceFactory()