From c3534a717368a18f92071c0b95a03235f96b5808 Mon Sep 17 00:00:00 2001
From: wuaho <wuaho@legu.cc>
Date: Thu, 9 Sep 2021 17:14:04 +0800
Subject: [PATCH] 1

---
 api/api_v1/endpoints/query.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py
index 40794d1..2549b9c 100644
--- a/api/api_v1/endpoints/query.py
+++ b/api/api_v1/endpoints/query.py
@@ -58,7 +58,7 @@ async def event_model_export(request: Request,
                              current_user: schemas.UserDB = Depends(deps.get_current_user)
                              ):
     """ 事件分析模型 数据导出"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     sqls = analysis.event_model_sql()
     file_name = quote(f'{sqls[0]["report_name"]}.xlsx')
     mime = mimetypes.guess_type(file_name)[0]
@@ -85,7 +85,7 @@ async def event_model_export(request: Request,
 #                              ):
 #     """ 事件分析模型 数据导出"""
 #     analysis = BehaviorAnalysis(game, schemas.CkQuery(report_id=report_id), get_redis_pool())
-#     await analysis.init()
+#     await analysis.init(data_where=current_user.data_where)
 #     sqls = analysis.event_model_sql()
 #     res = []
 #     file_name = f'{sqls[0]["report_name"]}.xlsx'
@@ -109,7 +109,7 @@ async def event_model(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """ 事件分析"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     sqls = analysis.event_model_sql()
     res = []
     for item in sqls:
@@ -221,7 +221,7 @@ async def retention_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """留存查询 sql"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.retention_model_sql2()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -234,7 +234,7 @@ async def retention_model(request: Request,
                           analysis: BehaviorAnalysis = Depends(BehaviorAnalysis),
                           current_user: schemas.UserDB = Depends(deps.get_current_user)
                           ) -> schemas.Msg:
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.retention_model_sql2()
     sql = res['sql']
     df = await ckdb.query_dataframe(sql)
@@ -297,7 +297,7 @@ async def retention_model_export(request: Request,
                                  current_user: schemas.UserDB = Depends(deps.get_current_user)
                                  ):
     """ 留存分析模型 数据导出"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.retention_model_sql2()
     file_name = quote(f'留存分析.xlsx')
     mime = mimetypes.guess_type(file_name)[0]
@@ -320,7 +320,7 @@ async def retention_model_del(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """留存数据模型"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.retention_model_sql()
     sql = res['sql']
     date_range = res['date_range']
@@ -393,7 +393,7 @@ async def funnel_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """漏斗数据模型 sql"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.funnel_model_sql()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -408,7 +408,7 @@ async def funnel_model(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """漏斗数据模型"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.funnel_model_sql()
     sql = res['sql']
     date_range = res['date_range']
@@ -540,7 +540,7 @@ async def scatter_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """分布分析 sql"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.scatter_model_sql()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -555,7 +555,7 @@ async def scatter_model(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """分布分析 模型"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.scatter_model_sql()
     sql = res['sql']
     df = await ckdb.query_dataframe(sql)
@@ -626,7 +626,7 @@ async def trace_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """路径分析 sql"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.trace_model_sql()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -640,7 +640,7 @@ async def trace_model_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """路径分析"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.trace_model_sql()
     sql = res['sql']
     df = await ckdb.query_dataframe(sql)
@@ -688,7 +688,7 @@ async def user_property_sql(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """用户属性sql"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     data = analysis.property_model()
     return schemas.Msg(code=0, msg='ok', data=[data])
 
@@ -702,7 +702,7 @@ async def user_property_model(
         current_user: schemas.UserDB = Depends(deps.get_current_user)
 ) -> schemas.Msg:
     """用户属性分析"""
-    await analysis.init()
+    await analysis.init(data_where=current_user.data_where)
     res = analysis.property_model()
     sql = res['sql']
     quota = res['quota']