Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions server/mergin/sync/public_api_v2_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,8 @@ def create_project_version(id):
if ProjectVersion.query.filter_by(
project_id=project.id, name=next_version
).count():
return UploadError(
error=f"Version {v_next_version} already exists"
).response(409)
upload.clear()
return ProjectVersionExists(version, next_version).response(409)
move_to_tmp(version_dir)

try:
Expand Down
8 changes: 8 additions & 0 deletions server/mergin/tests/test_public_api_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,14 @@ def test_create_version_failures(client):
response = client.post(f"v2/projects/{project.id}/versions", json=data)
assert response.status_code == 409

# target version already exists on server (both on disk and in db), upload is released
with patch.object(Project, "next_version", return_value=1):
response = client.post(f"v2/projects/{project.id}/versions", json=data)
assert response.status_code == 409
assert response.json["code"] == ProjectVersionExists.code
assert not Upload.query.filter_by(project_id=project.id).first()
assert project.latest_version == 1


def test_create_version_permanent_error_takes_priority(client):
"""Permanent errors (e.g. storage limit) must be reported before a
Expand Down
Loading