From fdeff5b898112ca3d4bae757f42b3d491ff2f5dd Mon Sep 17 00:00:00 2001
From: Robert Bond <Robert.Bond@gov.wales>
Date: Mon, 7 Sep 2026 10:46:32 +0000
Subject: [PATCH] Merged PR 2605: updated query to include consultationclosed
 check

updated query to include consultationclosed check

Related work items: #24836
---
 pages/api/email/getall.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/api/email/getall.js b/pages/api/email/getall.js
index 3d7a4bda..1ab3a981 100644
--- a/pages/api/email/getall.js
+++ b/pages/api/email/getall.js
@@ -372,16 +372,30 @@ export default async function CombinedApiProxy(req, res) {
                 }
 
                 // === Fetch Reps open events ===
-                let repsPeriods;
+                let repsPeriods = [];
 
                 try {
-                    const repsQuery = `pinswg_sipses?$filter=_pinswg_sipscase_value eq ${incidentID} and pinswg_consultationopen ne null &$select=pinswg_consultationopen,pinswg_consultationclose`;
+                    const repsQuery =
+                        `pinswg_sipses?` +
+                        `$filter=_pinswg_sipscase_value eq ${incidentID} ` +
+                        `and pinswg_consultationopen ne null ` +
+                        `and (pinswg_consultationclose eq null or pinswg_consultationclose ge ${nowStr})` +
+                        `&$select=pinswg_consultationopen,pinswg_consultationclose`;
+
                     const repsRes = await axios.get(
                         WEBAPI_URL + repsQuery + hashAPIPath(repsQuery),
                         azureHeaders(token.access_token)
                     );
 
-                    repsPeriods = repsRes.data.value;
+                    const repsRecords = repsRes.data.value;
+
+                    repsPeriods = repsRecords.filter((period) => {
+                        if (!period.pinswg_consultationclose) {
+                            return true;
+                        }
+
+                        return new Date(period.pinswg_consultationclose) >= now;
+                    });
                 } catch (err) {
                     consoleLogger(
                         `Reps fetch failed for incidentID: ${incidentID}`