From b7e50f876b42971d579bb0812a9034848b81686f Mon Sep 17 00:00:00 2001 From: Aaron Herman Date: Mon, 28 Apr 2025 16:30:36 -0500 Subject: [PATCH 1/3] fix: add participants to GET `/cases` --- src/dispatch/case/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dispatch/case/models.py b/src/dispatch/case/models.py index ce1359ae5e4b..c019297d2a8d 100644 --- a/src/dispatch/case/models.py +++ b/src/dispatch/case/models.py @@ -305,6 +305,7 @@ class CaseReadMinimal(CaseBase): project: ProjectRead assignee: ParticipantReadMinimal | None case_costs: list[CaseCostReadMinimal] = [] + participants: Optional[List[ParticipantRead]] = [] CaseReadMinimal.update_forward_refs() From c0a3aa20ddb4afa1c3219c883b8723aa873b4cea Mon Sep 17 00:00:00 2001 From: Aaron Herman Date: Mon, 28 Apr 2025 17:28:24 -0500 Subject: [PATCH 2/3] Use CaseExpandedPagination --- src/dispatch/case/models.py | 1 - src/dispatch/case/views.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dispatch/case/models.py b/src/dispatch/case/models.py index c019297d2a8d..ce1359ae5e4b 100644 --- a/src/dispatch/case/models.py +++ b/src/dispatch/case/models.py @@ -305,7 +305,6 @@ class CaseReadMinimal(CaseBase): project: ProjectRead assignee: ParticipantReadMinimal | None case_costs: list[CaseCostReadMinimal] = [] - participants: Optional[List[ParticipantRead]] = [] CaseReadMinimal.update_forward_refs() diff --git a/src/dispatch/case/views.py b/src/dispatch/case/views.py index 34de7640e621..9ed6bdeec378 100644 --- a/src/dispatch/case/views.py +++ b/src/dispatch/case/views.py @@ -132,7 +132,7 @@ def get_cases( "page": ..., "total": ..., } - return json.loads(CasePagination(**pagination).json(include=include_fields)) + return json.loads(CaseExpandedPagination(**pagination).json(include=include_fields)) return json.loads(CasePagination(**pagination).json()) From 3b92c8e02defdab360f1e432b9215ef54949ca28 Mon Sep 17 00:00:00 2001 From: Aaron Herman Date: Mon, 28 Apr 2025 17:45:27 -0500 Subject: [PATCH 3/3] use `IncidentExpandedPagination` for Incidents w/ include[] --- src/dispatch/incident/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dispatch/incident/views.py b/src/dispatch/incident/views.py index ccc24eb6daf7..838188579589 100644 --- a/src/dispatch/incident/views.py +++ b/src/dispatch/incident/views.py @@ -92,7 +92,7 @@ def get_incidents( "page": ..., "total": ..., } - return json.loads(IncidentPagination(**pagination).json(include=include_fields)) + return json.loads(IncidentExpandedPagination(**pagination).json(include=include_fields)) return json.loads(IncidentPagination(**pagination).json())