Skip to content

Commit 992c1dd

Browse files
committed
Remove nerver reaching except blocks.
1 parent 5dcde8b commit 992c1dd

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

backend/api/projects/teams.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from schematics.exceptions import DataError
33

44
from backend.exceptions import Forbidden
5-
from backend.services.team_service import TeamService, TeamServiceError
5+
from backend.services.team_service import TeamService
66
from backend.services.project_admin_service import ProjectAdminService
77
from backend.services.project_service import ProjectService
88
from backend.services.users.authentication_service import token_auth
@@ -180,16 +180,13 @@ def patch(self, team_id, project_id):
180180
current_app.logger.error(f"Error validating request: {str(e)}")
181181
return {"Error": str(e), "SubCode": "InvalidData"}, 400
182182

183-
try:
184-
if not ProjectAdminService.is_user_action_permitted_on_project(
185-
token_auth.current_user, project_id
186-
):
187-
raise Forbidden(sub_code="USER_NOT_PROJECT_MANAGER")
183+
if not ProjectAdminService.is_user_action_permitted_on_project(
184+
token_auth.current_user, project_id
185+
):
186+
raise Forbidden(sub_code="USER_NOT_PROJECT_MANAGER")
188187

189-
TeamService.change_team_role(team_id, project_id, role)
190-
return {"Status": "Team role updated successfully."}, 200
191-
except TeamServiceError as e:
192-
return str(e), 402 # FLAGGED FOR STATUS CODE/UNREACHABLE
188+
TeamService.change_team_role(team_id, project_id, role)
189+
return {"Status": "Team role updated successfully."}, 200
193190

194191
@token_auth.login_required
195192
def delete(self, team_id, project_id):

backend/api/tasks/actions.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flask_restful import Resource, current_app, request
22
from schematics.exceptions import DataError
33

4-
from backend.exceptions import NotFound, Forbidden
4+
from backend.exceptions import Forbidden
55
from backend.models.dtos.grid_dto import SplitTaskDTO
66
from backend.models.postgis.utils import InvalidGeoJson
77
from backend.services.grid.split_service import SplitService, SplitServiceError
@@ -262,15 +262,6 @@ def post(self, project_id, task_id):
262262
return task.to_primitive(), 200
263263
except MappingServiceError as e:
264264
return {"Error": str(e).split("-")[1], "SubCode": str(e).split("-")[0]}, 409
265-
except NotFound as e: # FLAGGED IF THIS CATCH IS NEEDED
266-
return e.to_dict()
267-
except Exception as e: # FLAGGED IF THIS CATCH IS NEEDED
268-
error_msg = f"Task Lock API - unhandled error: {str(e)}"
269-
current_app.logger.critical(error_msg)
270-
return {
271-
"Error": "Task unlock failed",
272-
"SubCode": "InternalServerError",
273-
}, 500
274265
finally:
275266
# Refresh mapper level after mapping
276267
UserService.check_and_update_mapper_level(authenticated_user_id)

backend/services/mapping_service.py

-4
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ def get_task_locked_by_user(project_id: int, task_id: int, user_id: int) -> Task
198198
:raises: MappingServiceError
199199
"""
200200
task = MappingService.get_task(task_id, project_id)
201-
if task is None: # FLAGGED: CHECK IF THIS CONDITION IS EVER REACHED
202-
raise NotFound(
203-
sub_code="TASK_NOT_FOUND", project_id=project_id, task_id=task_id
204-
)
205201
current_state = TaskStatus(task.task_status)
206202
if current_state != TaskStatus.LOCKED_FOR_MAPPING:
207203
raise MappingServiceError(

0 commit comments

Comments
 (0)