From 9d193303cec60dea18b279041ae25b5e4ea82ed5 Mon Sep 17 00:00:00 2001 From: wuaho Date: Mon, 23 Aug 2021 16:05:52 +0800 Subject: [PATCH] 1 --- models/user_analysis.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/models/user_analysis.py b/models/user_analysis.py index 61ac4b9..cfbc4e5 100644 --- a/models/user_analysis.py +++ b/models/user_analysis.py @@ -1,5 +1,6 @@ from typing import Tuple +import arrow import sqlalchemy as sa import json @@ -9,8 +10,10 @@ import pandas as pd from sqlalchemy import func, or_, and_, not_ +import crud import schemas from core.config import settings +from db import get_database from db.redisdb import get_redis_pool, RedisDrive @@ -23,6 +26,7 @@ class UserAnalysis: self.events = data_in.events self.zone_time: int = 0 + self.data_in = data_in self.global_filters = None self.groupby = None @@ -31,6 +35,16 @@ class UserAnalysis: self.unit_num = None async def init(self): + if self.data_in.report_id: + db = get_database() + report = await crud.report.get(db, id=self.data_in.report_id) + self.event_view = report['query']['eventView'] + self.events = report['query']['events'] + + else: + self.event_view = self.data_in.eventView + self.events = self.data_in.events + await self._init_table() self.zone_time = self._get_zone_time() self.time_particle = self._get_time_particle_size()