Skip to content

Commit 5928b4c

Browse files
ashit44244ashit44244
committed
bug fix
1 parent 3f2eaca commit 5928b4c

File tree

5 files changed

+49
-46
lines changed

5 files changed

+49
-46
lines changed

‎global_list.dat

4.58 KB
Binary file not shown.

‎global_list_bUrban.dat

Whitespace-only changes.

‎telegram_bot_rest_call_bot.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
def telegram_bot_sendtext(bot_message, bot_chatID):
77

8-
bot_token = '1755134661:AAE4ysHFi75lUqF2o2H_Fs3Or3jHDlfKUjM'
8+
bot_token = '1755134661:AAHAXJhDZfdinst1gzqp6MCpT9EAnYKDBUY'
99
# cowin U45 bangalore chat id
1010
#bot_chatID = '-1001129827963'
11-
send_text = 'https://api.telegram.org/bot' + bot_token + '/sendMessage?chat_id=' + bot_chatID + '&parse_mode=Markdown&text=' + bot_message
11+
send_text = 'https://api.telegram.org/bot' + bot_token + '/sendMessage?chat_id=' + bot_chatID +\
12+
'&parse_mode=Markdown&text=' + bot_message
1213

1314
response = requests.get(send_text)
1415

‎vaccine-availability-finder-dev.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def cowinApiCall(district_id, age, chatId):
4747
logging.info('response: ' + str(response))
4848
if response.ok:
4949
resp_json = response.json()
50-
if resp_json["centers"]:
50+
if 'centers' in resp_json:
5151
logging.info('Available on: ' + str(systemDate) +
5252
' for ' + age_group + ' age group ,user age: ' + str(age))
5353
for center in resp_json["centers"]:
@@ -86,27 +86,28 @@ def cowinApiCall(district_id, age, chatId):
8686
CenterInfo(name, block, pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
8787
ageLimit, date))
8888
else:
89-
logging.info("No available centers on ", systemDate)
90-
91-
for center in centerList:
92-
if isNotificationRequired(center):
93-
logging.info(' slots available - sending telegram msg: center name : ' + str(center.name) +
94-
' sessionId: ' + str(center.sessionId))
95-
telegram_bot_sendtext("Center : " + center.name + "\n"
96-
+ "Block : " + center.blockName + "\n"
97-
+ "pincode : " + str(center.pincode) + "\n"
98-
+ "available capacity : " + str(center.capacity) + "\n"
99-
+ "available Dose1 : " + str(center.dose1) + "\n"
100-
+ "available Dose2 : " + str(center.dose2) + "\n"
101-
+ "vaccine : " + str(center.vaccine) + "\n"
102-
+ "age limit : " + str(age_group) + "\n"
103-
+ "Date : " + str(center.date) + "\n", str(channel_chatId))
104-
logging.info('-------------------------------------- \n\n ')
105-
else:
106-
# telegram_bot_sendtext("No vaccine available at center " + center.name)
107-
logging.info("No vaccine available at center " + center.name)
108-
logging.info('-------------------------------------- \n\n ')
109-
89+
logging.error("No available centers on ", systemDate)
90+
if centerList:
91+
for center in centerList:
92+
if isNotificationRequired(center):
93+
logging.info(' slots available - sending telegram msg: center name : ' + str(center.name) +
94+
' sessionId: ' + str(center.sessionId))
95+
telegram_bot_sendtext("Center : " + center.name + "\n"
96+
+ "Block : " + center.blockName + "\n"
97+
+ "pincode : " + str(center.pincode) + "\n"
98+
+ "available capacity : " + str(center.capacity) + "\n"
99+
+ "available Dose1 : " + str(center.dose1) + "\n"
100+
+ "available Dose2 : " + str(center.dose2) + "\n"
101+
+ "vaccine : " + str(center.vaccine) + "\n"
102+
+ "age limit : " + str(age_group) + "\n"
103+
+ "Date : " + str(center.date) + "\n", str(channel_chatId))
104+
logging.info('-------------------------------------- \n\n ')
105+
else:
106+
# telegram_bot_sendtext("No vaccine available at center " + center.name)
107+
logging.info("No vaccine available at center " + center.name)
108+
logging.info('-------------------------------------- \n\n ')
109+
else:
110+
logging.error("No available centers on ", systemDate)
110111
saveGlobalListState()
111112
logging.info('-------xxxxxxxx--------- END of cowinApiCall ----------xxxxx--------- \n\n ')
112113

‎vaccine-availability-finder.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def cowinApiCall(district_id, age, chatId):
4949
logging.info('response: ' + str(response))
5050
if response.ok:
5151
resp_json = response.json()
52-
if resp_json["centers"]:
52+
if 'centers' in resp_json:
5353
logging.debug('Available on: ' + str(systemDate) +
5454
' for ' + age_group + ' age group ,user age: ' + str(age))
5555
for center in resp_json["centers"]:
@@ -88,27 +88,28 @@ def cowinApiCall(district_id, age, chatId):
8888
CenterInfo(name, block, pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
8989
ageLimit, date))
9090
else:
91-
logging.debug("No available centers on ", systemDate)
92-
93-
for center in centerList:
94-
if isNotificationRequired(center):
95-
logging.info(' slots available - sending telegram msg: center name : ' + str(center.name) +
96-
' sessionId: ' + str(center.sessionId))
97-
telegram_bot_sendtext("Center : " + center.name + "\n"
98-
+ "Block : " + center.blockName + "\n"
99-
+ "pincode : " + str(center.pincode) + "\n"
100-
+ "available capacity : " + str(center.capacity) + "\n"
101-
+ "available Dose1 : " + str(center.dose1) + "\n"
102-
+ "available Dose2 : " + str(center.dose2) + "\n"
103-
+ "vaccine : " + str(center.vaccine) + "\n"
104-
+ "age limit : " + str(age_group) + "\n"
105-
+ "Date : " + str(center.date) + "\n", str(channel_chatId))
106-
logging.info('-------------------------------------- \n\n ')
107-
else:
108-
# telegram_bot_sendtext("No vaccine available at center " + center.name)
109-
logging.debug("No vaccine available at center " + center.name)
110-
logging.debug('-------------------------------------- \n\n ')
111-
91+
logging.error("No available centers on ", systemDate)
92+
if centerList:
93+
for center in centerList:
94+
if isNotificationRequired(center):
95+
logging.info(' slots available - sending telegram msg: center name : ' + str(center.name) +
96+
' sessionId: ' + str(center.sessionId))
97+
telegram_bot_sendtext("Center : " + center.name + "\n"
98+
+ "Block : " + center.blockName + "\n"
99+
+ "pincode : " + str(center.pincode) + "\n"
100+
+ "available capacity : " + str(center.capacity) + "\n"
101+
+ "available Dose1 : " + str(center.dose1) + "\n"
102+
+ "available Dose2 : " + str(center.dose2) + "\n"
103+
+ "vaccine : " + str(center.vaccine) + "\n"
104+
+ "age limit : " + str(age_group) + "\n"
105+
+ "Date : " + str(center.date) + "\n", str(channel_chatId))
106+
logging.info('-------------------------------------- \n\n ')
107+
else:
108+
# telegram_bot_sendtext("No vaccine available at center " + center.name)
109+
logging.debug("No vaccine available at center " + center.name)
110+
logging.debug('-------------------------------------- \n\n ')
111+
else:
112+
logging.error("No available centers on ", systemDate)
112113
saveGlobalListState()
113114
logging.debug('-------xxxxxxxx--------- END of cowinApiCall ----------xxxxx--------- \n\n ')
114115

0 commit comments

Comments
 (0)