Merged PR 2605: updated query to include consultationclosed check

updated query to include consultationclosed check Related work items: #24836
2026-09-07 10:46:32 +00:00
parent 4e9d585566
commit fdeff5b898
1 changed files with 17 additions and 3 deletions
@@ -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}`