symposion_app Changeset - 941caa30d9f4

Changeset - 941caa30d9f4

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Neugebauer - 8 years ago 2016-04-30 10:30:21
chrisjrn@gmail.com

Replaces ProductController.attach_user_remainders with ProductController.user_remainders

2 files changed with 9 insertions and 22 deletions:

registrasion/controllers/cart.py

registrasion/controllers/product.py

0 comments (0 inline, 0 general)

registrasion/controllers/cart.py

➞

Show inline comments

@@ ... / @@ -214,22 +214,20 @@ class CartController(object): @@
         ''' Tests that the quantity changes we intend to make do not violate
         the limits and flag conditions imposed on the products. '''
         errors = []
         # Pre-annotate products
         products = [p for (p, q) in product_quantities]
         r = ProductController.attach_user_remainders(self.cart.user, products)
         with_remainders = dict((p, p) for p in r)
         remainders = ProductController.user_remainders(self.cart.user)
         # Test each product limit here
         for product, quantity in product_quantities:
             if quantity < 0:
                 errors.append((product, "Value must be zero or greater."))
-            limit = with_remainders[product].remainder
+            limit = remainders[product.id]
             if quantity > limit:
                 errors.append((
                     product,
                     "You may only have %d of product: %s" % (
                         limit, product,

registrasion/controllers/product.py

➞

Show inline comments

@@ ... / @@ -35,20 +35,19 @@ class ProductController(object): @@
             all_products = set(itertools.chain(all_products, products))
         categories = set(product.category for product in all_products)
         r = CategoryController.attach_user_remainders(user, categories)
         cat_quants = dict((c, c) for c in r)
         r = ProductController.attach_user_remainders(user, all_products)
         prod_quants = dict((p, p) for p in r)
         product_remainders = ProductController.user_remainders(user)
         passed_limits = set(
             product
             for product in all_products
             if cat_quants[product.category].remainder > 0
-            if prod_quants[product].remainder > 0
+            if product_remainders[product.id] > 0
+        )
         failed_and_messages = FlagController.test_flags(
             user, products=passed_limits
+        )
         failed_conditions = set(i[0] for i in failed_and_messages)
@@ ... / @@ -56,23 +55,21 @@ class ProductController(object): @@
         out = list(passed_limits - failed_conditions)
         out.sort(key=lambda product: product.order)
         return out
     @classmethod
-    def attach_user_remainders(cls, user, products):
+    def user_remainders(cls, user):
         '''
         Return:
             queryset(inventory.Product): A queryset containing items from
             ``product``, with an extra attribute -- remainder = the amount of
             this item that is remaining.
             Mapping[int->int]: A dictionary that maps the product ID to the
             user's remainder for that product.
         '''
         ids = [product.id for product in products]
         products = inventory.Product.objects.filter(id__in=ids)
         products = inventory.Product.objects.all()
         cart_filter = (
             Q(productitem__cart__user=user) &
             Q(productitem__cart__status=commerce.Cart.STATUS_PAID)
+        )
@@ ... / @@ -90,15 +87,7 @@ class ProductController(object): @@
             When(limit_per_user=None, then=Value(99999999)),
             default=F('limit_per_user') - Sum(quantity_or_zero),
+        )
         products = products.annotate(remainder=remainder)
         return products
     def user_quantity_remaining(self, user):
         ''' Returns the quantity of this product that the user add in the
         current cart. '''
         with_remainders = self.attach_user_remainders(user, [self.product])
         return with_remainders[0].remainder
         return dict((product.id, product.remainder) for product in products)

0 comments (0 inline, 0 general)