telegram msg update

Author: ashit44244

CenterDetails.py

@@ -3,10 +3,12 @@
 
 
 class CenterInfo():
-    def __init__(self, name = None, blockname = None, pincode = None,  feeType = None,
+
+    def __init__(self, name = None, blockname = None, district = None,  pincode = None,  feeType = None,
      capacity = None, dose1 = None, dose2 = None, sessionId = None, vaccine = None, ageLimit = None, date = None):
        self.name = name
        self.blockName = blockname
+       self.district = district
        self.pincode = pincode
        self.feeType = feeType
        self.capacity = capacity
@@ -21,6 +23,7 @@ def __init__(self, name = None, blockname = None, pincode = None,  feeType = Non
     def output(self):
         print("Name:", self.name)
         print("block Name: " , self.blockName)
+        print("district Id: ", self.district)
         print("pincode: " , self.pincode)
         print("fee Type: " , self.feeType)
         print("capacity: " , self.capacity)
@@ -47,5 +50,5 @@ def __hash__(self) -> int:
 
 
 
-#centerInfo = CenterInfo("R C Pura UPHC", "blockname", "", "paid", 100 , 20,30, "Covaccine", 18, "19-05-2021")
+#centerInfo = CenterInfo("R C Pura UPHC", "blockname", "urban", "5555", "paid", 100 , 20,30, "", "Covaccine", 18, "19-05-2021")
 #centerInfo.output()

vaccine-availability-finder-dev.py

@@ -67,6 +67,7 @@ def cowinApiCall(district_id, age, chatId):
                         if session["min_age_limit"] <= age:
                             name = center["name"]
                             block = center["block_name"]
+                            district = center["district_name"]
                             pincode = center["pincode"]
                             feeType = center["fee_type"]
                             capacity = session["available_capacity"]
@@ -95,7 +96,7 @@ def cowinApiCall(district_id, age, chatId):
                             date = session["date"]
                             logger.info('----------------------------------- \n\n ')
                             centerList.append(
-                                CenterInfo(name, block, pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
+                                CenterInfo(name, block, district,  pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
                                            ageLimit, date))
             else:
                 logger.error("No available centers on ", systemDate)
@@ -104,13 +105,13 @@ def cowinApiCall(district_id, age, chatId):
                 if isNotificationRequired(center):
                     logger.info(' slots available - sending telegram msg:  center name : ' + str(center.name) +
                                  ' sessionId: ' + str(center.sessionId))
-                    telegram_bot_sendtext("Center : " + center.name + "\n"
-                                          + "Block : " + center.blockName + "\n"
+                    telegram_bot_sendtext(center.name + "\n"
                                           + "pincode : " + str(center.pincode) + "\n"
-                                          + "available capacity : " + str(center.capacity) + "\n"
-                                          + "available Dose1 : " + str(center.dose1) + "\n"
-                                          + "available Dose2 : " + str(center.dose2) + "\n"
+                                          + "Block : " + center.blockName + " - " + center.district + "\n"
                                           + "vaccine : " + str(center.vaccine) + "\n"
+                                          + "available capacity : " + str(center.capacity) + "\n"
+                                          + "available Dose 1 : " + str(center.dose1) + "\n"
+                                          + "available Dose 2 : " + str(center.dose2) + "\n"
                                           + "age limit : " + str(age_group) + "\n"
                                           + "Date : " + str(center.date) + "\n", str(channel_chatId))
                     logger.info('-------------------------------------- \n\n ')

vaccine-availability-finder.py

@@ -71,6 +71,7 @@ def cowinApiCall(district_id, age, chatId):
                         if session["min_age_limit"] <= age:
                             name = center["name"]
                             block = center["block_name"]
+                            district = center["district_name"]
                             pincode = center["pincode"]
                             feeType = center["fee_type"]
                             capacity = session["available_capacity"]
@@ -99,7 +100,7 @@ def cowinApiCall(district_id, age, chatId):
                             date = session["date"]
                             logger.debug('----------------------------------- \n\n ')
                             centerList.append(
-                                CenterInfo(name, block, pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
+                                CenterInfo(name, block, district, pincode, feeType, capacity, dose1, dose2, sessionId, vaccine,
                                            ageLimit, date))
             else:
                 logger.error("No available centers on ", systemDate)
@@ -108,13 +109,13 @@ def cowinApiCall(district_id, age, chatId):
                 if isNotificationRequired(center):
                     logger.info(' slots available - sending telegram msg:  center name : ' + str(center.name) +
                                  ' sessionId: ' + str(center.sessionId))
-                    telegram_bot_sendtext("Center : " + center.name + "\n"
-                                          + "Block : " + center.blockName + "\n"
+                    telegram_bot_sendtext(center.name + "\n"
                                           + "pincode : " + str(center.pincode) + "\n"
-                                          + "available capacity : " + str(center.capacity) + "\n"
-                                          + "available Dose1 : " + str(center.dose1) + "\n"
-                                          + "available Dose2 : " + str(center.dose2) + "\n"
+                                          + "Block : " + center.blockName + " - " + center.district + "\n"
                                           + "vaccine : " + str(center.vaccine) + "\n"
+                                          + "available capacity : " + str(center.capacity) + "\n"
+                                          + "available Dose 1 : " + str(center.dose1) + "\n"
+                                          + "available Dose 2 : " + str(center.dose2) + "\n"
                                           + "age limit : " + str(age_group) + "\n"
                                           + "Date : " + str(center.date) + "\n", str(channel_chatId))
                     logger.info('-------------------------------------- \n\n ')