fix: move post-fetch processing inside try in applet_answers_export

Author: sricharan-varanasi

src/apps/answers/api.py

@@ -1006,6 +1006,15 @@ async def applet_answers_export(
         data: AnswerExport = await AnswerService(session, user.id, answer_session).get_export_data(
             applet_id, query_params, activities_last_version
         )
+        total_answers = data.total_answers
+        for answer in data.answers:
+            if answer.is_manager:
+                answer.respondent_secret_id = f"[admin account] ({answer.respondent_secret_id})"
+
+        if activities_last_version:
+            applet = await AppletService(session, user.id).get(applet_id)
+            activities = await ActivityHistoryService(session, applet.id, applet.version).get_full()
+            data.activities = activities
     except BaseError as e:
         await log(
             AuditEvent(
@@ -1016,15 +1025,6 @@ async def applet_answers_export(
             )
         )
         raise
-    total_answers = data.total_answers
-    for answer in data.answers:
-        if answer.is_manager:
-            answer.respondent_secret_id = f"[admin account] ({answer.respondent_secret_id})"
-
-    if activities_last_version:
-        applet = await AppletService(session, user.id).get(applet_id)
-        activities = await ActivityHistoryService(session, applet.id, applet.version).get_full()
-        data.activities = activities
     await log(
         AuditEvent(
             user_id=user.id,

src/apps/workspaces/api.py

@@ -34,6 +34,7 @@
     PublicWorkspaceRespondent,
     WorkspaceAppletPublic,
     WorkspacePrioritizedRole,
+    WorkspaceRespondent,
     WorkspaceSearchAppletPublic,
 )
 from apps.workspaces.filters import WorkspaceUsersQueryParams
@@ -242,7 +243,7 @@ async def workspace_respondents_list(
     session=Depends(get_session),
     answer_session=Depends(get_answer_session_by_owner_id),
 ) -> ResponseMultiOrdering[PublicWorkspaceRespondent]:
-    respondents = []
+    respondents: list[WorkspaceRespondent] = []
     try:
         service = WorkspaceService(session, user.id)
         await service.exists_by_owner_id(owner_id)
@@ -256,18 +257,15 @@ async def workspace_respondents_list(
         respondents = await InvitationsService(session, user).fill_pending_invitations_respondents(respondents)
 
         applet_ids = [
-            detail.applet_id for respondent in respondents if respondent.details for detail in respondent.details
+            r_detail.applet_id for respondent in respondents if respondent.details for r_detail in respondent.details
         ]
 
         accesses = await AppletAccessService(session).get_applet_accesses(applet_ids=applet_ids, user_id=user.id)
         is_super_reviewer = any(access.role in Role.super_reviewers() for access in accesses)
         reviewer_access = next((access for access in accesses if access.role == Role.REVIEWER), None)
     except BaseError as e:
         subject_ids = [
-            detail.subject_id
-            for respondent in respondents
-            if respondent.details
-            for detail in respondent.details
+            r_detail.subject_id for respondent in respondents if respondent.details for r_detail in respondent.details
         ]
         await log(
             AuditEvent(
@@ -282,8 +280,8 @@ async def workspace_respondents_list(
     subjects_by_applet: dict[uuid.UUID, list[uuid.UUID]] = {}
     for respondent in respondents:
         if respondent.details:
-            for detail in respondent.details:
-                subjects_by_applet.setdefault(detail.applet_id, []).append(detail.subject_id)
+            for r_detail in respondent.details:
+                subjects_by_applet.setdefault(r_detail.applet_id, []).append(r_detail.subject_id)
 
     for applet_id in set(applet_ids):
         await log(
@@ -322,7 +320,7 @@ async def workspace_applet_respondents_list(
     session=Depends(get_session),
     answer_session=Depends(get_answer_session_by_owner_id),
 ) -> ResponseMultiOrdering[PublicWorkspaceRespondent]:
-    respondents = []
+    respondents: list[WorkspaceRespondent] = []
     try:
         service = WorkspaceService(session, user.id)
         await service.exists_by_owner_id(owner_id)
@@ -342,10 +340,7 @@ async def workspace_applet_respondents_list(
         reviewer_access = next((access for access in accesses if access.role == Role.REVIEWER), None)
     except BaseError as e:
         subject_ids = [
-            detail.subject_id
-            for respondent in respondents
-            if respondent.details
-            for detail in respondent.details
+            r_detail.subject_id for respondent in respondents if respondent.details for r_detail in respondent.details
         ]
         await log(
             AuditEvent(
@@ -359,10 +354,7 @@ async def workspace_applet_respondents_list(
         raise
 
     subject_ids = [
-        detail.subject_id
-        for respondent in respondents
-        if respondent.details
-        for detail in respondent.details
+        r_detail.subject_id for respondent in respondents if respondent.details for r_detail in respondent.details
     ]
 
     await log(