| Line 843... |
Line 843... |
| 843 |
#Critical alert time is taken as 26 hrs
|
843 |
#Critical alert time is taken as 26 hrs
|
| 844 |
critical_time = (sec + timedelta(days=(adjustedDeliveryDays-1)) + timedelta(hours=26))
|
844 |
critical_time = (sec + timedelta(days=(adjustedDeliveryDays-1)) + timedelta(hours=26))
|
| 845 |
monitoredEntity.warnExpiryTime = int(warn_time.strftime("%s"))*1000
|
845 |
monitoredEntity.warnExpiryTime = int(warn_time.strftime("%s"))*1000
|
| 846 |
monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
|
846 |
monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
|
| 847 |
monitoredEntity.description="warehouseId = " + str(warehouseId) + " providerId = " + str(providerId) + " orderId = " + str(order.id);
|
847 |
monitoredEntity.description="warehouseId = " + str(warehouseId) + " providerId = " + str(providerId) + " orderId = " + str(order.id);
|
| 848 |
print monitoredEntity
|
- |
|
| 849 |
print monitoredEntity.description
|
- |
|
| 850 |
print monitoredEntity.warnExpiryTime
|
- |
|
| 851 |
print monitoredEntity.entityIdentifier
|
- |
|
| 852 |
alert_client = AlertClient().get_client()
|
848 |
alert_client = AlertClient().get_client()
|
| 853 |
alert_client.scheduleAlert(monitoredEntity)
|
849 |
alert_client.scheduleAlert(monitoredEntity)
|
| 854 |
except Exception as e:
|
850 |
except Exception as e:
|
| 855 |
print e
|
851 |
print e
|
| 856 |
session.commit()
|
852 |
session.commit()
|
| Line 932... |
Line 928... |
| 932 |
continue
|
928 |
continue
|
| 933 |
#raise TransactionServiceException(103, "No order found for the awb:" + awb)
|
929 |
#raise TransactionServiceException(103, "No order found for the awb:" + awb)
|
| 934 |
if order.pickupStoreId:
|
930 |
if order.pickupStoreId:
|
| 935 |
order.status = OrderStatus.DELIVERED_AT_STORE
|
931 |
order.status = OrderStatus.DELIVERED_AT_STORE
|
| 936 |
order.statusDescription = "Order delivered At Store"
|
932 |
order.statusDescription = "Order delivered At Store"
|
| - |
|
933 |
try:
|
| - |
|
934 |
monitoredEntity = MonitoredEntity();
|
| - |
|
935 |
monitoredEntity.entityType=EntityType.COURIER;
|
| - |
|
936 |
monitoredEntity.eventType=OrderStatus.RECEIVED_AT_STORE;
|
| - |
|
937 |
monitoredEntity.entityIdentifier="orderId = " + str(order.id);
|
| - |
|
938 |
#adjustedDeliveryDays = adjust_delivery_time(datetime.datetime.now(), 1);
|
| - |
|
939 |
sec = datetime.datetime.now()
|
| - |
|
940 |
#Critical alert time is taken as 26 hrs
|
| - |
|
941 |
critical_time = (sec + timedelta(hours=4))
|
| - |
|
942 |
monitoredEntity.criticalExpiryTime = int(critical_time.strftime("%s"))*1000
|
| - |
|
943 |
monitoredEntity.description="deliveryTimeAtStore = " + str(order.delivery_timestamp) + " orderId = " + str(order.id);
|
| - |
|
944 |
alert_client = AlertClient().get_client()
|
| - |
|
945 |
alert_client.updateMonitoredObject(monitoredEntity)
|
| - |
|
946 |
except Exception as e:
|
| - |
|
947 |
print e
|
| 937 |
else:
|
948 |
else:
|
| 938 |
order.status = OrderStatus.DELIVERY_SUCCESS
|
949 |
order.status = OrderStatus.DELIVERY_SUCCESS
|
| 939 |
order.statusDescription = "Order delivered"
|
950 |
order.statusDescription = "Order delivered"
|
| - |
|
951 |
update_trust_level(order)
|
| - |
|
952 |
try:
|
| - |
|
953 |
alert_client = AlertClient().get_client()
|
| - |
|
954 |
alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
|
| - |
|
955 |
except Exception as e:
|
| - |
|
956 |
print e
|
| 940 |
timestamp, receiver = detail.split('|')
|
957 |
timestamp, receiver = detail.split('|')
|
| 941 |
if order.first_dlvyatmp_timestamp is None:
|
958 |
if order.first_dlvyatmp_timestamp is None:
|
| 942 |
order.first_dlvyatmp_timestamp = timestamp
|
959 |
order.first_dlvyatmp_timestamp = timestamp
|
| 943 |
order.delivery_timestamp = timestamp
|
960 |
order.delivery_timestamp = timestamp
|
| 944 |
order.receiver = receiver
|
961 |
order.receiver = receiver
|
| 945 |
update_trust_level(order)
|
- |
|
| 946 |
try:
|
- |
|
| 947 |
alert_client = AlertClient().get_client()
|
- |
|
| 948 |
alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
|
- |
|
| 949 |
except Exception as e:
|
- |
|
| 950 |
print e
|
- |
|
| 951 |
|
962 |
|
| 952 |
session.commit()
|
963 |
session.commit()
|
| 953 |
|
964 |
|
| 954 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
965 |
def mark_order_as_delivered(orderId, deliveryTimestamp, receiver):
|
| 955 |
order = Order.get_by(id=orderId)
|
966 |
order = Order.get_by(id=orderId)
|
| Line 989... |
Line 1000... |
| 989 |
order.status = OrderStatus.RECEIVED_AT_STORE
|
1000 |
order.status = OrderStatus.RECEIVED_AT_STORE
|
| 990 |
order.statusDescription = "Order received at store"
|
1001 |
order.statusDescription = "Order received at store"
|
| 991 |
order.delivery_timestamp = deliveryTimestamp
|
1002 |
order.delivery_timestamp = deliveryTimestamp
|
| 992 |
session.commit()
|
1003 |
session.commit()
|
| 993 |
try:
|
1004 |
try:
|
| - |
|
1005 |
alert_client = AlertClient().get_client()
|
| - |
|
1006 |
alert_client.endMonitoringEntity(EntityType.COURIER, "orderId = " + str(order.id))
|
| - |
|
1007 |
except Exception as e:
|
| - |
|
1008 |
print e
|
| - |
|
1009 |
|
| - |
|
1010 |
try:
|
| 994 |
enqueue_received_at_store_email(order)
|
1011 |
enqueue_received_at_store_email(order)
|
| 995 |
except Exception as e:
|
1012 |
except Exception as e:
|
| 996 |
print e
|
1013 |
print e
|
| 997 |
|
1014 |
|
| 998 |
def enqueue_received_at_store_email(order):
|
1015 |
def enqueue_received_at_store_email(order):
|