From 2c1a9986f4758459aeebe7dabb8457cb823f3971 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 19 Sep 2019 15:22:09 +0530 Subject: [PATCH] Use refactored method + improved ordered_at time shown to user --- ucloud_pay.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ucloud_pay.py b/ucloud_pay.py index 2a5a907..ae4a55f 100644 --- a/ucloud_pay.py +++ b/ucloud_pay.py @@ -81,18 +81,9 @@ class ListProducts(Resource): products = client.get_prefix("/v1/products/", value_in_json=False) prod_dict = {} for p in products: - p_json = json.loads(p.value) - product_id = p.key[p.key.rindex("/")+1:] - actual_product = { - "name": p_json["name"], - "description": p_json["description"], - "product_id": product_id, - "pricing": get_pricing(p_json["price"], p_json["type"], - p_json["recurring_period"]), - "minimum_subscription_period": - p_json["minimum_subscription_period"] - } - prod_dict[product_id] = actual_product + p_dict = json.loads(p.value) + uf_product = get_user_friendly_product(p_dict) + prod_dict[uf_product["product_id"]] = uf_product logging.debug("Products = {}".format(prod_dict)) return prod_dict, 200 @@ -344,6 +335,11 @@ class ProductOrder(Resource): client.put("/v1/user/{}/orders".format( data['name']), json.dumps(order_obj), value_in_json=True) + order_obj["ordered_at"] = datetime.fromtimestamp( + order_obj["ordered_at"]).strftime("%c") + order_obj["product"] = get_user_friendly_product( + product_obj + ) return {"message": "Order successful", "order_details": order_obj}, 200 else: