Merge remote-tracking branch 'origin/main'

api/nav.py

+import datetime
+
 from fastapi import APIRouter, Depends
 from motor.core import AgnosticCollection
 
 from dependencies import get_nav_collect
-from model import SortParams, FilterTime, Page, PageResponse
+from model import SortParams, FilterTime, Page, PageResponse, Response
 from model.fund import StakingFundNav
+from service.nav import calculate_nav
 
 router = APIRouter()
 
@@ -26,3 +29,13 @@ async def nav(
     result = await cursor.to_list(length=None)
     response = PageResponse[StakingFundNav](data=result, **page.dict(), total=count)
     return response
+
+
+@router.post("/{fund_id}/", response_model=Response[StakingFundNav], summary="插入净值记录")
+async def insert_nav(
+        fund_id: str,
+        calc_time: datetime.datetime,
+):
+    fund_nav = await calculate_nav(fund_id=fund_id, calc_time=calc_time)
+    response = Response[StakingFundNav](data=fund_nav)
+    return response

service/nav.py

@@ -11,9 +11,13 @@ from service.beacon import BeaconChaService
 from service.price import get_price
 
 
-async def calculate_nav(fund_id, calc_time=None, beach_service=BeaconChaService()):
+async def calculate_nav(fund_id, calc_time: datetime.datetime = None, beach_service=BeaconChaService()):
     # todo 测试
-    calc_time = datetime.datetime.utcnow().replace(minute=0, second=0, microsecond=0, tzinfo=pytz.UTC)
+    calc_time = calc_time.replace(minute=0, second=0, microsecond=0,
+                                  tzinfo=pytz.UTC) if calc_time else datetime.datetime.utcnow().replace(minute=0,
+                                                                                                        second=0,
+                                                                                                        microsecond=0,
+                                                                                                        tzinfo=pytz.UTC)
     from main import app
     fund_collect = get_fund_collect(app.state.mongodb_manager)
     logger.info(f'[定时任务开始执行] [计算净值] {fund_id} ')
@@ -70,7 +74,12 @@ async def calculate_nav(fund_id, calc_time=None, beach_service=BeaconChaService(
     net_value = round(value / total_fund_share, 2) if total_fund_share > 0 else fund_data["base_nav"]
     await fund_collect.update_one({'id': fund_id}, {"$set": {"nva": net_value}})
     nav_collect = get_nav_collect(app.state.mongodb_manager)
-    date = datetime.datetime.utcnow().replace(hour=0, minute=0, second=0, microsecond=0, tzinfo=pytz.UTC)
+
+    date = calc_time.replace(hour=0, minute=0, second=0, microsecond=0,
+                             tzinfo=pytz.UTC) if calc_time else datetime.datetime.utcnow().replace(hour=0, minute=0,
+                                                                                                   second=0,
+                                                                                                   microsecond=0,
+                                                                                                   tzinfo=pytz.UTC)
     if fund_data["settlement_time"] == "00:00":
         date -= datetime.timedelta(days=1)
     nav_record = await nav_collect.find_one({"fund_id": fund_id, "record_date": date})