Skip to content

Commit 9b0f82b

Browse files
authoredMar 10, 2025··
Merge pull request #6778 from hotosm/fastapi-refactor
pre-commit over-indent check failure fixed
2 parents 2278ac8 + 44b4092 commit 9b0f82b

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed
 

‎backend/services/project_search_service.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,18 @@ async def filter_by_user_permission(user, permission: str):
715715
TeamRoles.PROJECT_MANAGER.value,
716716
]
717717

718+
if user.mapping_level == MappingLevel.BEGINNER.value:
719+
permission_condition = (
720+
f"AND p.{permission} = {permission_class.TEAMS.value}"
721+
)
722+
else:
723+
permission_condition = ""
724+
725+
if user.mapping_level != MappingLevel.BEGINNER.value:
726+
level_condition = f", {permission_class.LEVEL.value}"
727+
else:
728+
level_condition = ""
729+
718730
condition = f"""
719731
(
720732
p.id IN (
@@ -725,19 +737,10 @@ async def filter_by_user_permission(user, permission: str):
725737
AND tm.active = True
726738
AND pt.role = ANY(:team_roles)
727739
)
728-
{
729-
"AND p." + permission + f" = {permission_class.TEAMS.value}"
730-
if user.mapping_level == MappingLevel.BEGINNER.value
731-
else ""
732-
}
740+
{permission_condition}
733741
)
734742
OR p.{permission} IN (
735-
{permission_class.ANY.value}
736-
{
737-
", " + str(permission_class.LEVEL.value)
738-
if user.mapping_level != MappingLevel.BEGINNER.value
739-
else ""
740-
}
743+
{permission_class.ANY.value}{level_condition}
741744
)
742745
"""
743746

0 commit comments

Comments
 (0)
Please sign in to comment.