DmitrMakeev commited on
Commit
88d9be5
·
verified ·
1 Parent(s): 874f52b

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +16 -3
app.py CHANGED
@@ -1075,9 +1075,19 @@ def get_order():
1075
  return jsonify(response), 200
1076
 
1077
  shop_st = result[0] if result[0] else '{}'
1078
- shop_st_data = json.loads(shop_st)
 
 
 
 
 
1079
  logging.debug(f"Existing record found. Loaded JSON: {shop_st_data}")
1080
 
 
 
 
 
 
1081
  # Ищем значение по ключу order
1082
  value = shop_st_data.get(order, 'not')
1083
 
@@ -1085,9 +1095,12 @@ def get_order():
1085
  response = {order: value}
1086
  return jsonify(response), 200
1087
 
 
 
 
1088
  except Exception as e:
1089
- logging.error(f"An error occurred: {str(e)}")
1090
- return json.dumps({"error": str(e)}), 500
1091
 
1092
 
1093
 
 
1075
  return jsonify(response), 200
1076
 
1077
  shop_st = result[0] if result[0] else '{}'
1078
+ try:
1079
+ shop_st_data = json.loads(shop_st)
1080
+ except json.JSONDecodeError as e:
1081
+ logging.error(f"JSON decoding error for shop_st: {e}")
1082
+ return jsonify({"error": f"Invalid JSON format for shop_st: {e}"}), 400
1083
+
1084
  logging.debug(f"Existing record found. Loaded JSON: {shop_st_data}")
1085
 
1086
+ # Проверяем, есть ли в данных необходимый ордер
1087
+ if order not in shop_st_data:
1088
+ logging.error(f"Order '{order}' not found in shop_st data")
1089
+ return jsonify({"error": f"Order '{order}' not found"}), 400
1090
+
1091
  # Ищем значение по ключу order
1092
  value = shop_st_data.get(order, 'not')
1093
 
 
1095
  response = {order: value}
1096
  return jsonify(response), 200
1097
 
1098
+ except KeyError as e:
1099
+ logging.error(f"KeyError: Missing key {e}")
1100
+ return jsonify({"error": f"Missing key: {e}"}), 400
1101
  except Exception as e:
1102
+ logging.error(f"An unexpected error occurred: {str(e)}")
1103
+ return jsonify({"error": f"An unexpected error occurred: {str(e)}"}), 500
1104
 
1105
 
1106