From 94642d287158561dc114c05450964694219bbbfa Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 22 Apr 2025 18:25:25 +0100 Subject: [PATCH] fix(chalice): enforce AND operator for table of requests and table of pages --- api/schemas/schemas.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/api/schemas/schemas.py b/api/schemas/schemas.py index 88c66fbe1..83ef0032e 100644 --- a/api/schemas/schemas.py +++ b/api/schemas/schemas.py @@ -1103,6 +1103,16 @@ class CardTable(__CardSchema): values["metricValue"] = [] return values + @model_validator(mode="after") + def __enforce_AND_operator(self): + self.metric_of = MetricOfTable(self.metric_of) + if self.metric_of in (MetricOfTable.VISITED_URL, MetricOfTable.FETCH, \ + MetricOfTable.VISITED_URL.value, MetricOfTable.FETCH.value): + for s in self.series: + if s.filter is not None: + s.filter.events_order = SearchEventOrder.AND + return self + @model_validator(mode="after") def __transform(self): self.metric_of = MetricOfTable(self.metric_of)