Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaces ProductController.attach_user_remainders with ProductController.user_remainders

Browse source
This commit is contained in:
Christopher Neugebauer 2016-04-30 20:30:21 +10:00
parent 6956c78b0d
commit 941caa30d9
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
registrasion/controllers/cart.py
View file

@ -217,16 +217,14 @@ class CartController(object):
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((

25
registrasion/controllers/product.py
View file

@ -38,14 +38,13 @@ class ProductController(object):
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(
@ -59,17 +58,15 @@ class ProductController(object):
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) &
@ -93,12 +90,4 @@ class ProductController(object):
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)