Ver Fonte

orders parsing improved

Dev Server há 1 ano atrás
pai
commit
5f078fb8f9
1 ficheiros alterados com 82 adições e 39 exclusões
  1. 82 39
      jsonAndRequest.py

+ 82 - 39
jsonAndRequest.py

@@ -2,49 +2,92 @@ import json
 import requests
 #Тестовый класс User и Address (ВАЖНО!!!) поля классов должны называться также как и поля json объекта
 
+#Full json example
+'''
+{
 
-#{
-#    
-#    "ticket": null,
-#    "state": "",
-#    "id_metaservice": null,
-#    "is_global": false,
-#    "is_visible": false,
-#    "service": null,
-#    "service_type": null,
-#
-#    "time_placed": null,
-#    "time_start": null,
-#    "time_start_predicted": null
-#    "time_finish_predicted": null,
-#    "time_start_real":
-#    "time_finish_real": null,
-#    
-#    "order_place_start": "р-н Беговой",
-#    "order_place_start_gps": "р-н Беговой",
-#    "order_place_start_real": "р-н Беговой",
-#    "order_place_start_real_gps": "р-н Беговой",
-#    "order_place_finish_predicted": "р-н Мещанский",
-#    "order_place_finish_predicted_gps": "р-н Мещанский",
-#    "order_place_finish_real": "р-н Мещанский",
-#    "order_place_finish_real_gps": "р-н Мещанский",
-#
-#    "predicted_price": null,
-#    "real_price": null,
-#    "payment_transaction_id"
-#    "rating_id"
-#
-#    "provider": null,
-#    "provider_screen_name": null
-#    "receiver": null,
-#    "receiver_screen_name": nulll
-#    "client_id": null
-#    "resource_id"
-#}
+"ticket": 123,
+"state": 111,
+"id_metaservice": 1,
+"is_global": false,
+"is_visible": false,
+"service": 1,
+"service_type": 1,
 
+"time_placed": "2023-05-15T16:40:32.179777Z",
+"time_start": "2023-05-15T16:40:32.179777Z",
+"time_start_predicted": "2023-05-15T16:40:32.179777Z",
+"time_finish_predicted": "2023-05-15T16:40:32.179777Z",
+"time_start_real": "2023-05-15T16:40:32.179777Z",
+"time_finish_real": "2023-05-15T16:40:32.179777Z",
+
+"order_place_start": "р-н Беговой",
+"order_place_start_gps": "55.751941, 37.607513",
+"order_place_start_real": "р-н Беговой",
+"order_place_start_real_gps": "55.751941, 37.607513",
+"order_place_finish_predicted": "р-н Мещанский",
+"order_place_finish_predicted_gps": "55.751941, 37.607513",
+"order_place_finish_real": "р-н Мещанский",
+"order_place_finish_real_gps": "55.751941, 37.607513",
+
+"predicted_price": 1000,
+"real_price": 1001,
+"payment_transaction_id": 1,
+"rating_id": 1,
+
+"provider": 1,
+"provider_screen_name": "Vasya Ispolnitelev",
+"receiver": 1,
+"receiver_screen_name": "Marfa Clientovna",
+"client_id": 1,
+"resource_id": 1
+}
+'''
+
+#minimal acceptable as order json example
+
+'''
+{
+"ticket": 123,
+"state": 111,
+"id_metaservice": 1,
+"is_global": false,
+"is_visible": false,
+"service": 1,
+"service_type": 1,
+
+"time_placed": "2023-05-15T16:40:32.179777Z",
+"time_start": null,
+"time_start_predicted": null,
+"time_finish_predicted": null,
+"time_start_real": null,
+"time_finish_real": null,
+
+"order_place_start": null,
+"order_place_start_gps": null,
+"order_place_start_real": null,
+"order_place_start_real_gps": null,
+"order_place_finish_predicted": null,
+"order_place_finish_predicted_gps": null,
+"order_place_finish_real": null,
+"order_place_finish_real_gps": null,
+
+"predicted_price": null,
+"real_price": null,
+"payment_transaction_id": null,
+"rating_id": null,
+
+"provider": null,
+"provider_screen_name": null,
+"receiver": null,
+"receiver_screen_name": null,
+"client_id": null,
+"resource_id": null
+}
+'''
 
 class Order(object):
-    def __init__(self, ticket, state, id_metaservice, is_global, is_visible, service, service_type, time_placed, time_start, time_start_predicted, time_finish_predicted, time_start_real, time_finish_real, order_place_start, order_place_start_gps, order_place_start_real, order_place_start_real_gps, order_place_finish_predicted, order_place_finish_predicted_gps, order_place_finish_real, order_place_finish_real_gps, predicted_price, real_price, payment_transaction_id, rating_id, provider, provider_screen_name, receiver, receiver_screen_name, client_id, resource_id):
+    def __init__(self, ticket, state, id_metaservice, is_global, is_visible, service, service_type, time_placed, time_start=None, time_start_predicted=None, time_finish_predicted=None, time_start_real=None, time_finish_real=None, order_place_start=None, order_place_start_gps=None, order_place_start_real=None, order_place_start_real_gps=None, order_place_finish_predicted=None, order_place_finish_predicted_gps=None, order_place_finish_real=None, order_place_finish_real_gps=None, predicted_price=None, real_price=None, payment_transaction_id=None, rating_id=None, provider=None, provider_screen_name=None, receiver=None, receiver_screen_name=None, client_id=None, resource_id=None):
         self.ticket = ticket
         self.state = state
         self.id_metaservice = id_metaservice