From 94091e48ec88896302d28e96eac5bfffe8eb475a Mon Sep 17 00:00:00 2001
From: wuaho <wuaho@legu.cc>
Date: Tue, 28 Sep 2021 12:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_v1/check_data/controller.py | 24 ++++++++++++++++--------
 api/api_v1/check_data/service.py    | 13 +++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/api/api_v1/check_data/controller.py b/api/api_v1/check_data/controller.py
index 744c38b..d9a5d91 100644
--- a/api/api_v1/check_data/controller.py
+++ b/api/api_v1/check_data/controller.py
@@ -1,7 +1,9 @@
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends
+from motor.motor_asyncio import AsyncIOMotorDatabase
 
 import schemas
 from api.api_v1.check_data import service
+from db import get_database
 
 router = APIRouter()
 
@@ -11,7 +13,7 @@ async def check(request: Request,
                 data_in: schemas.CheckData,
                 game: str,
                 ) -> schemas.Msg:
-    res = await service.check_data( game, data_in)
+    res = await service.check_data(game, data_in)
     return schemas.Msg(code=0, msg='ok', data=res)
 
 
@@ -19,21 +21,27 @@ async def check(request: Request,
 async def save(request: Request,
                data_in: schemas.AddTemplate,
                game: str,
-               db_name: str = 'debug'
+               db: AsyncIOMotorDatabase = Depends(get_database),
                ) -> schemas.Msg:
-    res = await service.save_template(data_in, game, db_name)
+    res = await service.save_template(db, data_in, game)
     return schemas.Msg(code=0, msg='ok', data=res)
 
 
 @router.get('/template')
-async def template(request: Request, game: str) -> schemas.Msg:
-    data = await service.get_template(dict(request.query_params))
+async def template(request: Request, game: str,
+                   db: AsyncIOMotorDatabase = Depends(get_database),
+
+                   ) -> schemas.Msg:
+    data = await service.get_template(db, game)
     return schemas.Msg(code=0, msg='ok', data=data)
 
 
 @router.post('/del_template')
-async def del_template(request: Request, game: str, data_in: schemas.DelTemplate) -> schemas.Msg:
-    data = await service.del_template(data_in)
+async def del_template(request: Request, game: str, data_in: schemas.DelTemplate,
+                       db: AsyncIOMotorDatabase = Depends(get_database),
+
+                       ) -> schemas.Msg:
+    data = await service.del_template(db, data_in)
     return schemas.Msg(code=0, msg='ok', data=data)
 
 
diff --git a/api/api_v1/check_data/service.py b/api/api_v1/check_data/service.py
index b16c1c5..1cddbe5 100644
--- a/api/api_v1/check_data/service.py
+++ b/api/api_v1/check_data/service.py
@@ -12,6 +12,7 @@ import clickhouse_driver
 
 import schemas
 from core.config import settings
+from db import get_database
 from db.ckdb import ckdb as ck_client
 import crud
 
@@ -84,19 +85,19 @@ async def check_data(game, data_in: schemas.CheckData):
     return report
 
 
-async def save_template(data_in: schemas.AddTemplate,
+async def save_template(db, data_in: schemas.AddTemplate,
                         game: str,
                         ):
-    res = await crud.check_data.update_one({'title': data_in.title},
+    res = await crud.check_data.update_one(db, {'title': data_in.title, 'game': game},
                                            {'$set': {'game': game,
                                                      'check': data_in.check.dict()}},
                                            upsert=True)
     return True
 
 
-async def get_template(*args, **kwargs):
+async def get_template(db, game, **kwargs):
     res = []
-    async for doc in crud.check_data.find(*args, {'_id': False}, **kwargs):
+    async for doc in crud.check_data.find(db, {'game': game}, {'_id': False}, **kwargs):
         res.append(doc)
     return res
 
@@ -105,6 +106,6 @@ def get_default_field():
     return settings.DEFAULT_FIELD
 
 
-async def del_template(data_id: schemas.DelTemplate):
-    await crud.check_data.delete_one(data_id.dict())
+async def del_template(db, data_id: schemas.DelTemplate):
+    await crud.check_data.delete(db, data_id.dict())
     return True