codingcoffee/bullish
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor: cleanup unused vars

Browse source 
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
This commit is contained in:
Ameya Shenoy 2021-02-15 00:58:45 +05:30
parent d79a13b080
commit 193bdb1112
Signed by: codingcoffee
GPG key ID: F7D58AAC5DACF8D3
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
backend/app/utils.py
View file

@ -158,6 +158,7 @@ def verify_date(date: str, ret_message: str) -> Tuple[datetime.datetime, str]:
""" """
# Verify Date # Verify Date
logger.info('Verifying date %s', date) logger.info('Verifying date %s', date)
# IST
curr_datetime = datetime.datetime.now() - datetime.timedelta(hours=5, minutes=30) curr_datetime = datetime.datetime.now() - datetime.timedelta(hours=5, minutes=30)
req_datetime = datetime.datetime.strptime(date, '%Y-%m-%d') req_datetime = datetime.datetime.strptime(date, '%Y-%m-%d')
next_publish_time = curr_datetime.replace(hour=6, minute=0, second=0, next_publish_time = curr_datetime.replace(hour=6, minute=0, second=0,
@ -166,17 +167,17 @@ def verify_date(date: str, ret_message: str) -> Tuple[datetime.datetime, str]:
curr_datetime, req_datetime, next_publish_time) curr_datetime, req_datetime, next_publish_time)
# Check for future date # Check for future date
if req_datetime.date() > curr_datetime.date(): if req_datetime.date() > curr_datetime.date():
ret_message = "Time travel not yet invented! Returning latest available data." ret_message += "Time travel not yet invented! Returning latest available data. "
req_datetime = curr_datetime req_datetime = curr_datetime
# Check for weekend # Check for weekend
day_num = req_datetime.weekday() day_num = req_datetime.weekday()
if day_num in [5, 6]: if day_num in [5, 6]:
ret_message = "Markets are closed on weekends. Returning data for Friday." ret_message += "Markets are closed on weekends. Returning data for Friday. "
req_datetime -= datetime.timedelta(days=day_num-4) # change req to Friday req_datetime -= datetime.timedelta(days=day_num-4) # change req to Friday
# Check for day # Check for day
if (req_datetime.date() == curr_datetime.date() if (req_datetime.date() == curr_datetime.date()
and curr_datetime < next_publish_time): and curr_datetime < next_publish_time):
ret_message = "Today's data not yet published, returning yesterday's data." ret_message += "Today's data not yet published, returning yesterday's data. "
req_datetime -= datetime.timedelta(days=1) req_datetime -= datetime.timedelta(days=1)
return req_datetime, ret_message return req_datetime, ret_message

9
backend/app/views.py
View file

@ -40,8 +40,7 @@ class EmptyRespoinseView(generics.RetrieveAPIView):
@api_view(['GET']) @api_view(['GET'])
def dbBhavCopyEquityList(request): def dbBhavCopyEquityList(request):
ret_message = "" req_date, ret_message = verify_date(request.query_params.get('date'), "")
req_date, ret_message = verify_date(request.query_params.get('date'), ret_message)
queryset = BhavCopyEquity.objects.all().filter(date=req_date) queryset = BhavCopyEquity.objects.all().filter(date=req_date)
serializer = BhavCopyEquitySerializer(queryset, many=True) serializer = BhavCopyEquitySerializer(queryset, many=True)
@ -60,9 +59,8 @@ def dbBhavCopyEquityList(request):
@api_view(['GET']) @api_view(['GET'])
def cacheBhavCopyEquityListV1(request): def cacheBhavCopyEquityListV1(request):
ret_message = ""
date = request.query_params.get('date') date = request.query_params.get('date')
req_date, ret_message = verify_date(date, ret_message) req_date, ret_message = verify_date(date, "")
datestr = req_date.strftime("%d%m%y") datestr = req_date.strftime("%d%m%y")
stocks = cache.lrange(f"stocks:{datestr}", 0, -1) stocks = cache.lrange(f"stocks:{datestr}", 0, -1)
@ -82,9 +80,8 @@ def cacheBhavCopyEquityListV1(request):
@api_view(['GET']) @api_view(['GET'])
def cacheBhavCopyEquityListV2(request): def cacheBhavCopyEquityListV2(request):
ret_message = ""
date = request.query_params.get('date') date = request.query_params.get('date')
req_date, ret_message = verify_date(date, ret_message) req_date, ret_message = verify_date(date, "")
datestr = req_date.strftime("%d%m%y") datestr = req_date.strftime("%d%m%y")
stocks = cache.get(f"stocks:v2:{datestr}") stocks = cache.get(f"stocks:v2:{datestr}")