From 339640ffce6af5e9cdfcd68b1e12d0e490affd5f Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Tue, 13 Aug 2024 17:04:55 +0200 Subject: [PATCH] Dev (#2489) * fix(chalice): fixed Math-operators validation refactor(chalice): search for sessions that have events for heatmaps * refactor(chalice): search for sessions that have at least 1 location event for heatmaps * fix(chalice): fixed Math-operators validation refactor(chalice): search for sessions that have events for heatmaps * refactor(chalice): search for sessions that have at least 1 location event for heatmaps * feat(chalice): autocomplete return top 10 with stats * fix(chalice): fixed autocomplete top 10 meta-filters * fix(chalice): fixed cards-schema validators for the new Pydantic --- api/schemas/schemas.py | 72 +++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/api/schemas/schemas.py b/api/schemas/schemas.py index 4a092fcad..af213f97e 100644 --- a/api/schemas/schemas.py +++ b/api/schemas/schemas.py @@ -1151,10 +1151,10 @@ class CardTimeSeries(__CardSchema): values["metricValue"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfTimeseries(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfTimeseries(self.metric_of) + return self class CardTable(__CardSchema): @@ -1170,10 +1170,10 @@ class CardTable(__CardSchema): values["metricValue"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfTable(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfTable(self.metric_of) + return self @model_validator(mode="after") def __validator(self): @@ -1200,10 +1200,10 @@ class CardFunnel(__CardSchema): values["series"] = [values["series"][0]] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfFunnels(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfFunnels(self.metric_of) + return self class CardErrors(__CardSchema): @@ -1217,10 +1217,10 @@ class CardErrors(__CardSchema): values["series"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfErrors(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfErrors(self.metric_of) + return self class CardPerformance(__CardSchema): @@ -1234,10 +1234,10 @@ class CardPerformance(__CardSchema): values["series"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfPerformance(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfPerformance(self.metric_of) + return self class CardResources(__CardSchema): @@ -1251,10 +1251,10 @@ class CardResources(__CardSchema): values["series"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfResources(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfResources(self.metric_of) + return self class CardWebVital(__CardSchema): @@ -1268,10 +1268,10 @@ class CardWebVital(__CardSchema): values["series"] = [] return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfWebVitals(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfWebVitals(self.metric_of) + return self class CardHeatMap(__CardSchema): @@ -1284,10 +1284,10 @@ class CardHeatMap(__CardSchema): def __enforce_default(cls, values): return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfHeatMap(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfHeatMap(self.metric_of) + return self class MetricOfInsights(str, Enum): @@ -1305,10 +1305,10 @@ class CardInsights(__CardSchema): values["view_type"] = MetricOtherViewType.LIST_CHART return values - # @model_validator(mode="after") - # def __transform(self): - # self.metric_of = MetricOfInsights(self.metric_of) - # return self + @model_validator(mode="after") + def __transform(self): + self.metric_of = MetricOfInsights(self.metric_of) + return self @model_validator(mode="after") def restrictions(self):