Update response codes

Author: harminius

server/mergin/sync/private_api.yaml

@@ -424,10 +424,10 @@ paths:
       description: Prepare project zip archive to download
       operationId: prepare_archive
       responses:
-        "200":
-          description: Archive is already prepared
-        "202":
-          description: Accepted
+        "201":
+          description: Project archive creation started
+        "204":
+          $ref: "#/components/responses/NoContent"
         "400":
           $ref: "#/components/responses/BadStatusResp"
         "422":
@@ -456,7 +456,9 @@ components:
     UnsupportedMediaType:
       description: Payload format is in an unsupported format.
     ConflictResp:
-      description: Request could not be processed becuase of conflict in resources
+      description: Request could not be processed because of conflict in resources
+    NoContent:
+      description: Success. No content returned.
   parameters:
     Page:
       name: page

server/mergin/sync/private_api_controller.py

@@ -331,9 +331,6 @@ def download_project(id: str, version=None):  # noqa: E501 # pylint: disable=W06
         project_id=project.id, name=lookup_version
     ).first_or_404("Project version does not exist")
 
-    if project_version.project_size > current_app.config["MAX_DOWNLOAD_ARCHIVE_SIZE"]:
-        abort(400)
-
     # check zip is already created
     if os.path.exists(project_version.zip_path):
         if current_app.config["USE_X_ACCEL"]:
@@ -370,7 +367,7 @@ def prepare_archive(id: str, version=None):
         abort(400)
 
     if os.path.exists(pv.zip_path):
-        return "Project archive already ready", 200
+        return NoContent, 204
 
     # trigger job if no recent partial
     temp_zip_path = pv.zip_path + ".partial"
@@ -380,7 +377,8 @@ def prepare_archive(id: str, version=None):
     ) < datetime.now(timezone.utc) - timedelta(
         seconds=current_app.config["PARTIAL_ZIP_EXPIRATION"]
     )
-    if not partial_exists or is_expired:
-        create_project_version_zip.delay(pv.id)
+    if partial_exists and not is_expired:
+        return NoContent, 204
 
-    return "Project zip being prepared", 202
+    create_project_version_zip.delay(pv.id)
+    return "Project zip creation started", 201

server/mergin/tests/test_private_project_api.py

@@ -456,21 +456,21 @@ def test_download_project(
     assert resp.status_code == 200
 
 
-def test_large_project_download_fail(client, diff_project):
-    """Test downloading too large project is refused"""
-    resp = client.get(
+def test_prepare_large_project_fail(client, diff_project):
+    """Test asking for too large project is refused"""
+    resp = client.post(
         url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
+            "/app.mergin_sync_private_api_controller_prepare_archive",
             id=diff_project.id,
             version="v1",
         )
     )
-    assert resp.status_code == 202
+    assert resp.status_code == 201
     # pretend testing project to be too large by lowering limit
     client.application.config["MAX_DOWNLOAD_ARCHIVE_SIZE"] = 10
-    resp = client.get(
+    resp = client.post(
         url_for(
-            "/app.mergin_sync_private_api_controller_download_project",
+            "/app.mergin_sync_private_api_controller_prepare_archive",
             id=diff_project.id,
             version="v1",
         )
@@ -480,17 +480,17 @@ def test_large_project_download_fail(client, diff_project):
 
 test_prepare_proj_data = [
     # zips do not exist, version not specified -> trigger celery to create zip with latest version
-    (0, 0, 0, None, 202, 1),
+    (0, 0, 0, None, 201, 1),
     # expired partial zip exists -> call celery task
-    (0, 1, 1, None, 202, 1),
+    (0, 1, 1, None, 201, 1),
     # valid partial zip exists -> do not call celery
-    (0, 1, 0, None, 202, 0),
+    (0, 1, 0, None, 204, 0),
     # zips do not exist, version specified -> call celery task with specified version
-    (0, 0, 0, "v1", 202, 1),
+    (0, 0, 0, "v1", 201, 1),
     # specified version does not exist -> 404
     (0, 0, 0, "v100", 404, 0),
     # zip is already prepared to download -> do not call celery
-    (1, 0, 0, None, 200, 0),
+    (1, 0, 0, None, 204, 0),
 ]
 
 

web-app/packages/lib/src/modules/project/store.ts

@@ -707,7 +707,6 @@ export const useProjectStore = defineStore('projectModule', {
     },
 
     async downloadArchive(payload: DownloadPayload) {
-      console.log("You are here")
       const notificationStore = useNotificationStore()
       await this.cancelDownloadArchive()
       this.projectDownloadingVersion = payload.versionId