From e7b0cdaf0c01c25a2ae86cae0703cec839fa735b Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Sun, 14 Feb 2021 16:58:50 +0530 Subject: [PATCH] refactor: rename helper function Signed-off-by: Ameya Shenoy --- backend/app/views.py | 13 ++++++++----- frontend/src/views/BhavCopy.vue | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/app/views.py b/backend/app/views.py index 4d64767..bf49d72 100644 --- a/backend/app/views.py +++ b/backend/app/views.py @@ -51,7 +51,7 @@ def dbBhavCopyEquityList(request): logger.info('Enqueue background task to populate Postgres DB') django_rq.enqueue(populate_bhav_copy_data_into_postgres, args=(None, req_date)) logger.info('Data not available in Postgres, redirecting to BSE') - return _bseBhavCopyEquityList(request) + return _bse_bhav_copy_equity_list(request) return Response({ "data": serializer.data, "message": ret_message @@ -70,7 +70,7 @@ def cacheBhavCopyEquityListV1(request): logger.info('Enqueue background task to populate Redis') django_rq.enqueue(populate_bhav_copy_data_into_redis_v1, args=(None, req_date)) logger.info('Data not available in Redis, trying to fetch from BSE') - return _bseBhavCopyEquityList(request) + return _bse_bhav_copy_equity_list(request) pipe = cache.pipeline() for stock in stocks: pipe.hgetall(f"stock:{datestr}:{stock}") @@ -92,7 +92,7 @@ def cacheBhavCopyEquityListV2(request): logger.info('Enqueue background task to populate Redis') django_rq.enqueue(populate_bhav_copy_data_into_redis_v2, args=(None, req_date)) logger.info('Data not available in Redis, trying to fetch from BSE') - return _bseBhavCopyEquityList(request) + return _bse_bhav_copy_equity_list(request) return Response({ "data": json.loads(stocks), "message": ret_message @@ -101,9 +101,12 @@ def cacheBhavCopyEquityListV2(request): @api_view(['GET']) def bseBhavCopyEquityList(request): - return _bseBhavCopyEquityList(request) + """Fetch and return data from BSE.""" + return _bse_bhav_copy_equity_list(request) -def _bseBhavCopyEquityList(request): + +def _bse_bhav_copy_equity_list(request): + """Fetchinig data from BSE helper.""" date = request.query_params.get('date') req_date, _ = verify_date(date, "") try: diff --git a/frontend/src/views/BhavCopy.vue b/frontend/src/views/BhavCopy.vue index 60a513a..3bda6c0 100644 --- a/frontend/src/views/BhavCopy.vue +++ b/frontend/src/views/BhavCopy.vue @@ -116,6 +116,7 @@ name: 'BhavStock', methods: { allowedDates: val => { + // Block out weekends, since market is not open var day = new Date(val).getDay(); return !(day == 6 || day == 0); },