Skip to content

Commit 830ef0f

Browse files
committed
address review - survive non-existing project version
1 parent 2223ded commit 830ef0f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

server/mergin/sync/public_api_v2_controller.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,10 @@ def get_project(id, files_at_version=None):
139139
if files_at_version:
140140
pv = ProjectVersion.query.filter_by(
141141
project_id=project.id, name=ProjectVersion.from_v_name(files_at_version)
142-
).first_or_404()
143-
data["files"] = ProjectFileSchema(
144-
only=("path", "mtime", "size", "checksum"), many=True
145-
).dump(pv.files)
142+
).first()
143+
if pv:
144+
data["files"] = ProjectFileSchema(
145+
only=("path", "mtime", "size", "checksum"), many=True
146+
).dump(pv.files)
146147

147148
return data, 200

server/mergin/sync/schemas_v2.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class ProjectSchema(ma.SQLAlchemyAutoSchema):
3030

3131
def _role(self, obj):
3232
role = ProjectPermissions.get_user_project_role(obj, current_user)
33-
if not role:
34-
return None
35-
return role.value
33+
return role.value if role else None
3634

3735
class Meta:
3836
model = Project

0 commit comments

Comments
 (0)