From 193bdb111297cba10fcd0ea9bbf7b1587e12c3b0 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Mon, 15 Feb 2021 00:58:45 +0530 Subject: [PATCH] refactor: cleanup unused vars Signed-off-by: Ameya Shenoy --- backend/app/utils.py | 7 ++++--- backend/app/views.py | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/app/utils.py b/backend/app/utils.py index 1f2254c..e3f38e6 100644 --- a/backend/app/utils.py +++ b/backend/app/utils.py @@ -158,6 +158,7 @@ def verify_date(date: str, ret_message: str) -> Tuple[datetime.datetime, str]: """ # Verify Date logger.info('Verifying date %s', date) + # IST curr_datetime = datetime.datetime.now() - datetime.timedelta(hours=5, minutes=30) req_datetime = datetime.datetime.strptime(date, '%Y-%m-%d') 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) # Check for future 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 # Check for weekend day_num = req_datetime.weekday() 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 # Check for day if (req_datetime.date() == curr_datetime.date() 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) return req_datetime, ret_message diff --git a/backend/app/views.py b/backend/app/views.py index bf49d72..93b54e8 100644 --- a/backend/app/views.py +++ b/backend/app/views.py @@ -40,8 +40,7 @@ class EmptyRespoinseView(generics.RetrieveAPIView): @api_view(['GET']) def dbBhavCopyEquityList(request): - ret_message = "" - req_date, ret_message = verify_date(request.query_params.get('date'), ret_message) + req_date, ret_message = verify_date(request.query_params.get('date'), "") queryset = BhavCopyEquity.objects.all().filter(date=req_date) serializer = BhavCopyEquitySerializer(queryset, many=True) @@ -60,9 +59,8 @@ def dbBhavCopyEquityList(request): @api_view(['GET']) def cacheBhavCopyEquityListV1(request): - ret_message = "" 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") stocks = cache.lrange(f"stocks:{datestr}", 0, -1) @@ -82,9 +80,8 @@ def cacheBhavCopyEquityListV1(request): @api_view(['GET']) def cacheBhavCopyEquityListV2(request): - ret_message = "" 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") stocks = cache.get(f"stocks:v2:{datestr}")