Merge branch '12.0-T01206-redis-session-storage-fix-pc' into '12.0'

Make the config_session store json-serializable / string key vs int & search...

See merge request pledra/odoo-product-configurator!89

Author: PCatinean

product_configurator/models/product_config.py

@@ -911,10 +911,14 @@ def get_variant_vals(self, value_ids=None, custom_vals=None, **kwargs):
 
     @api.multi
     def get_session_search_domain(self, product_tmpl_id, state='draft',
-                                  parent_id=None):
+                                  parent_id=None, user_id=None):
+
+        if not user_id:
+            user_id = self.env.uid
+
         domain = [
             ('product_tmpl_id', '=', product_tmpl_id),
-            ('user_id', '=', self.env.uid),
+            ('user_id', '=', user_id),
             ('state', '=', state),
         ]
         if parent_id:
@@ -1422,10 +1426,11 @@ def search_variant(
         return products
 
     @api.multi
-    def search_session(self, product_tmpl_id, parent_id=None):
+    def search_session(self, product_tmpl_id, parent_id=None, user_id=None):
         domain = self.get_session_search_domain(
             product_tmpl_id=product_tmpl_id,
-            parent_id=parent_id
+            parent_id=parent_id,
+            user_id=user_id
         )
         session = self.search(domain, order='create_date desc', limit=1)
         return session
@@ -1436,7 +1441,8 @@ def create_get_session(self, product_tmpl_id, parent_id=None,
         if not force_create:
             session = self.search_session(
                 product_tmpl_id=product_tmpl_id,
-                parent_id=parent_id
+                parent_id=parent_id,
+                user_id=user_id,
             )
             if session:
                 return session

website_product_configurator/controllers/main.py

@@ -30,7 +30,7 @@ def get_config_session(self, product_tmpl_id):
             {}
         )
         is_public_user = request.env.user.has_group('base.group_public')
-        cfg_session_id = product_config_sessions.get(product_tmpl_id.id)
+        cfg_session_id = product_config_sessions.get(str(product_tmpl_id.id))
         if cfg_session_id:
             cfg_session = cfg_session_obj.browse(int(cfg_session_id))
 
@@ -42,7 +42,7 @@ def get_config_session(self, product_tmpl_id):
                 user_id=request.env.user.id
             )
             product_config_sessions.update({
-                product_tmpl_id.id: cfg_session.id
+                str(product_tmpl_id.id): cfg_session.id
             })
             request.session['product_config_session'] = product_config_sessions
 
@@ -513,12 +513,12 @@ def cfg_session(self, product_id, **post):
             key=lambda obj: obj.attribute_id.sequence
         )
         pricelist = get_pricelist()
-        product_config_session = request.session.get('product_config_session')
-        if (product_config_session and
-                product_config_session.get(product_tmpl_id.id)):
-
+        product_config_session = request.session.get(
+            'product_config_session', {}
+        )
+        if product_config_session.get(str(product_tmpl_id.id)):
             # Bizzappdev end code
-            del product_config_session[product_tmpl_id.id]
+            del product_config_session[str(product_tmpl_id.id)]
             request.session['product_config_session'] = product_config_session
         values = {
             'product_id': product_id,