Changeset dfadd3f in rattail

Timestamp:

07/19/2022 03:50:10 PM (7 months ago)

Author:

Lance Edgar <lance@…>

Branches:

master

Children:

f34703e

Parents:

f97c452

Message:

Make caching products optional, when creating vendor catalog batch

File:

• rattail/batch/vendorcatalog.py (modified) (2 diffs)

rattail/batch/vendorcatalog.py

@@ -71 +71 @@
 
     def setup(self, batch, progress=None):
+        model = self.model
+
+        # TODO: deprecate / remove this
         self.vendor = batch.vendor
-        self.products = {'upc': {}, 'vendor_code': {}}
-        session = self.app.get_session(batch)
-        products = session.query(model.Product)\
-                          .options(orm.joinedload(model.Product.brand))\
-                          .options(orm.joinedload(model.Product.costs))
-
-        def cache(product, i):
-            if product.upc:
-                self.products['upc'][product.upc] = product
-            cost = product.cost_for_vendor(self.vendor)
-            product.vendor_cost = cost
-            if cost and cost.code:
-                self.products['vendor_code'][cost.code] = product
-
-        assert self.progress_loop(cache, products.all(), progress,
-                                  message="Caching products by UPC and vendor code")
+
+        # maybe pre-cache all products
+        if batch.get_param('cache_products'):
+
+            self.products = {'upc': {}, 'vendor_code': {}}
+            session = self.app.get_session(batch)
+            products = session.query(model.Product)\
+                              .options(orm.joinedload(model.Product.brand))\
+                              .options(orm.joinedload(model.Product.costs))\
+                              .all()
+
+            def cache(product, i):
+                if product.upc:
+                    self.products['upc'][product.upc] = product
+                cost = product.cost_for_vendor(batch.vendor)
+                product.vendor_cost = cost
+                if cost and cost.code:
+                    self.products['vendor_code'][cost.code] = product
+
+            self.progress_loop(cache, products, progress,
+                               message="Caching products by UPC and vendor code")
 
     setup_populate = setup
@@ -205 +213 @@
                 product = self.products['vendor_code'].get(row.vendor_code)
             else:
-                product = products_handler.locate_product_for_entry(
-                    session, row.vendor_code, product_key='ignore',
-                    lookup_vendor_code=True, vendor=row.batch.vendor)
+                product = products_handler.locate_product_for_vendor_code(
+                    session, row.vendor_code, vendor=row.batch.vendor)
 
         return product