Skip to content

fix: return 404 for deleted activity in activity_retrieve endpoint #2037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
divbzero merged 1 commit into from
Apr 10, 2026
Merged

fix: return 404 for deleted activity in activity_retrieve endpoint #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/apps/activities/api/activities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from apps.activities.domain.activity_item import (
ActivityItemSingleLanguageDetail,
)
from apps.activities.errors import ActivityDoeNotExist
from apps.activities.filters import AppletActivityFilter
from apps.activities.services.activity import ActivityItemService, ActivityService
from apps.activity_assignments.service import ActivityAssignmentService
Expand Down Expand Up @@ -126,6 +127,8 @@ async def activity_retrieve(
await CheckAccessService(session, user.id).check_applet_detail_access(applet_id)
else:
schema = await ActivitiesCRUD(session).get_by_id(activity_id)
if schema is None:
raise ActivityDoeNotExist()
await CheckAccessService(session, user.id).check_applet_detail_access(schema.applet_id)
activity = await ActivityService(session, user.id).get_single_language_by_id(activity_id, language)
result = ActivitySingleLanguageWithItemsDetailPublic.model_validate(activity)
Expand Down
4 changes: 2 additions & 2 deletions src/apps/answers/tests/test_cross_version_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ async def test_fetch_deleted_activity_from_history(
update_data = AppletUpdate(**data)
await srv.update(applet_with_flow.id, update_data)

# Fetching the deleted activity without version should fail
# Fetching the deleted activity without version should return 404
response = await client.get(
self.activity_url.format(activity_id=original_activity.id),
)
assert response.status_code != http.HTTPStatus.OK
assert response.status_code == http.HTTPStatus.NOT_FOUND

# Fetching with the original version should succeed from history
response = await client.get(
Expand Down
Loading