Added extra key lookups for customer and product routes.

Now the CRUD routes for these objects can leverage UUIDs of various related
objects in addition to the primary object.  More should be done with this, but
at least we have a start.

rattail/pyramid/views/crud.py

@@ -171,9 +171,13 @@ class CrudView(View):
     def create(self):
         return self.crud(self.mapped_class)
 
+    def get_model(self, key):
+        model = Session.query(self.mapped_class).get(key)
+        return model
+
     def read(self):
-        uuid = self.request.matchdict['uuid']
+        key = self.request.matchdict['uuid']
-        model = Session.query(self.mapped_class).get(uuid) if uuid else None
+        model = self.get_model(key)
         if not model:
             return HTTPFound(location=self.home_url)
         return self.crud(model, readonly=True)

rattail/pyramid/views/customers.py

@@ -29,15 +29,20 @@
 from sqlalchemy import and_
 
 import edbob
-from edbob.pyramid.views import SearchableAlchemyGridView, CrudView
+from edbob.pyramid.views import SearchableAlchemyGridView
 from edbob.pyramid.forms import EnumFieldRenderer
 
 import rattail
+from rattail.pyramid import Session
+from rattail.db.model import (
+    Customer, CustomerPerson, CustomerGroupAssignment,
+    CustomerEmailAddress, CustomerPhoneNumber)
+from rattail.pyramid.views import CrudView
 
 
 class CustomersGrid(SearchableAlchemyGridView):
 
-    mapped_class = rattail.Customer
+    mapped_class = Customer
     config_prefix = 'customers'
     sort = 'name'
     clickable = True
@@ -45,21 +50,21 @@ class CustomersGrid(SearchableAlchemyGridView):
     def join_map(self):
         return {
             'email':
-                lambda q: q.outerjoin(rattail.CustomerEmailAddress, and_(
+                lambda q: q.outerjoin(CustomerEmailAddress, and_(
-                    rattail.CustomerEmailAddress.parent_uuid == rattail.Customer.uuid,
+                    CustomerEmailAddress.parent_uuid == Customer.uuid,
-                    rattail.CustomerEmailAddress.preference == 1)),
+                    CustomerEmailAddress.preference == 1)),
             'phone':
-                lambda q: q.outerjoin(rattail.CustomerPhoneNumber, and_(
+                lambda q: q.outerjoin(CustomerPhoneNumber, and_(
-                    rattail.CustomerPhoneNumber.parent_uuid == rattail.Customer.uuid,
+                    CustomerPhoneNumber.parent_uuid == Customer.uuid,
-                    rattail.CustomerPhoneNumber.preference == 1)),
+                    CustomerPhoneNumber.preference == 1)),
             }
 
     def filter_map(self):
         return self.make_filter_map(
             exact=['id'],
             ilike=['name'],
-            email=self.filter_ilike(rattail.CustomerEmailAddress.address),
+            email=self.filter_ilike(CustomerEmailAddress.address),
-            phone=self.filter_ilike(rattail.CustomerPhoneNumber.number))
+            phone=self.filter_ilike(CustomerPhoneNumber.number))
 
     def filter_config(self):
         return self.make_filter_config(
@@ -72,8 +77,8 @@ class CustomersGrid(SearchableAlchemyGridView):
     def sort_map(self):
         return self.make_sort_map(
             'id', 'name',
-            email=self.sorter(rattail.CustomerEmailAddress.address),
+            email=self.sorter(CustomerEmailAddress.address),
-            phone=self.sorter(rattail.CustomerPhoneNumber.number))
+            phone=self.sorter(CustomerPhoneNumber.number))
 
     def grid(self):
         g = self.make_grid()
@@ -91,9 +96,24 @@ class CustomersGrid(SearchableAlchemyGridView):
 
 class CustomerCrud(CrudView):
 
-    mapped_class = rattail.Customer
+    mapped_class = Customer
     home_route = 'customers'
 
+    def get_model(self, key):
+        model = super(CustomerCrud, self).get_model(key)
+        if model:
+            return model
+        model = Session.query(Customer).filter_by(id=key).first()
+        if model:
+            return model
+        model = Session.query(CustomerPerson).get(key)
+        if model:
+            return model.customer
+        model = Session.query(CustomerGroupAssignment).get(key)
+        if model:
+            return model.customer
+        return None
+
     def fieldset(self, model):
         fs = self.make_fieldset(model)
         fs.email_preference.set(renderer=EnumFieldRenderer(edbob.EMAIL_PREFERENCE))
@@ -108,14 +128,17 @@ class CustomerCrud(CrudView):
         return fs
 
 
-def includeme(config):
+def add_routes(config):
-
     config.add_route('customers', '/customers')
+    config.add_route('customer.read', '/customers/{uuid}')
+
+
+def includeme(config):
+    add_routes(config)
+
     config.add_view(CustomersGrid, route_name='customers',
                     renderer='/customers/index.mako',
                     permission='customers.list')
-
-    config.add_route('customer.read', '/customers/{uuid}')
     config.add_view(CustomerCrud, attr='read', route_name='customer.read',
                     renderer='/customers/read.mako',
                     permission='customers.read')

rattail/pyramid/views/products.py

@@ -35,9 +35,8 @@ from pyramid.httpexceptions import HTTPFound
 from pyramid.renderers import render_to_response
 
 import edbob
-from edbob.pyramid import Session
 from edbob.pyramid.progress import SessionProgress
-from edbob.pyramid.views import SearchableAlchemyGridView, CrudView
+from edbob.pyramid.views import SearchableAlchemyGridView
 
 import rattail
 import rattail.labels
@@ -45,7 +44,11 @@ from rattail import sil
 from rattail import batches
 from rattail.threads import Thread
 from rattail.exceptions import LabelPrintingError
+from rattail.db.model import ProductPrice
+
+from rattail.pyramid import Session
 from rattail.pyramid.forms import GPCFieldRenderer, PriceFieldRenderer
+from rattail.pyramid.views import CrudView
 
 
 class ProductsGrid(SearchableAlchemyGridView):
@@ -197,6 +200,15 @@ class ProductCrud(CrudView):
     mapped_class = rattail.Product
     home_route = 'products'
 
+    def get_model(self, key):
+        model = super(ProductCrud, self).get_model(key)
+        if model:
+            return model
+        model = Session.query(ProductPrice).get(key)
+        if model:
+            return model.product
+        return None
+
     def fieldset(self, model):
         fs = self.make_fieldset(model)
         fs.upc.set(renderer=GPCFieldRenderer)
@@ -312,37 +324,35 @@ class CreateProductsBatch(ProductsGrid):
         return {'providers': providers}
 
 
-def includeme(config):
+def add_routes(config):
-
     config.add_route('products', '/products')
+    config.add_route('products.print_labels', '/products/labels')
+    config.add_route('products.create_batch', '/products/batch')
+    config.add_route('product.create', '/products/new')
+    config.add_route('product.read', '/products/{uuid}')
+    config.add_route('product.update', '/products/{uuid}/edit')
+    config.add_route('product.delete', '/products/{uuid}/delete')
+    
+
+def includeme(config):
+    add_routes(config)
+
     config.add_view(ProductsGrid, route_name='products',
                     renderer='/products/index.mako',
                     permission='products.list')
-
-    config.add_route('products.print_labels', '/products/labels')
     config.add_view(print_labels, route_name='products.print_labels',
                     renderer='json', permission='products.print_labels')
-
-    config.add_route('products.create_batch', '/products/batch')
     config.add_view(CreateProductsBatch, route_name='products.create_batch',
                     renderer='/products/batch.mako',
                     permission='batches.create')
-
-    config.add_route('product.create', '/products/new')
     config.add_view(ProductCrud, attr='create', route_name='product.create',
                     renderer='/products/crud.mako',
                     permission='products.create')
-
-    config.add_route('product.read', '/products/{uuid}')
     config.add_view(ProductCrud, attr='read', route_name='product.read',
                     renderer='/products/read.mako',
                     permission='products.read')
-
-    config.add_route('product.update', '/products/{uuid}/edit')
     config.add_view(ProductCrud, attr='update', route_name='product.update',
                     renderer='/products/crud.mako',
                     permission='products.update')
-
-    config.add_route('product.delete', '/products/{uuid}/delete')
     config.add_view(ProductCrud, attr='delete', route_name='product.delete',
                     permission='products.delete')