better eager support

hivesolutions · Mar 23, 2016 · 98bc80c · 98bc80c
1 parent 1b0015e
commit 98bc80c
Showing 1 changed file with 5 additions and 46 deletions.
diff --git a/src/budy/controllers/api/order.py b/src/budy/controllers/api/order.py
@@ -49,16 +49,7 @@ class OrderApiController(root.RootApiController):
     @appier.ensure(token = "admin")
     def list(self):
         object = appier.get_object(alias = True, find = True)
-        orders = budy.Order.find(
-            eager = (
-                "lines",
-                "lines.product",
-                "shipping_address",
-                "billing_address"
-            ),
-            map = True,
-            **object
-        )
+        orders = budy.Order.find(eager_l = True, map = True, **object)
         return orders
 
     @appier.route("/api/orders/<str:key>", "GET", json = True)
@@ -80,15 +71,7 @@ def set_shipping_address(self, key):
         order = budy.Order.get(key = key, rules = False)
         order.shipping_address = address
         order.save()
-        order = order.reload(
-            eager = (
-                "lines",
-                "lines.product",
-                "shipping_address",
-                "billing_address"
-            ),
-            map = True
-        )
+        order = order.reload(map = True)
         return order
 
     @appier.route("/api/orders/<str:key>/billing_address", "PUT", json = True)
@@ -99,15 +82,7 @@ def set_billing_address(self, key):
         order = budy.Order.get(key = key, rules = False)
         order.billing_address = address
         order.save()
-        order = order.reload(
-            eager = (
-                "lines",
-                "lines.product",
-                "shipping_address",
-                "billing_address"
-            ),
-            map = True
-        )
+        order = order.reload(map = True)
         return order
 
     @appier.route("/api/orders/<str:key>/email", "PUT", json = True)
@@ -118,15 +93,7 @@ def set_email(self, key):
         order = budy.Order.get(key = key, rules = False)
         order.email = email
         order.save()
-        order = order.reload(
-            eager = (
-                "lines",
-                "lines.product",
-                "shipping_address",
-                "billing_address"
-            ),
-            map = True
-        )
+        order = order.reload(map = True)
         return order
 
     @appier.route("/api/orders/<str:key>/pay", "PUT", json = True)
@@ -138,13 +105,5 @@ def pay(self, key):
         order.pay_s(data)
         bag = budy.Bag.from_session()
         if empty_bag and bag: bag.empty_bag_s()
-        order = order.reload(
-            eager = (
-                "lines",
-                "lines.product",
-                "shipping_address",
-                "billing_address"
-            ),
-            map = True
-        )
+        order = order.reload(map = True)
         return order