fixup! [FIX] queue job pass stored context

Author: KKamaa

queue_job/job.py

@@ -358,15 +358,6 @@ def enqueue(cls, func, args=None, kwargs=None,
     def db_record_from_uuid(env, job_uuid):
         model = env['queue.job'].sudo()
         record = model.search([('uuid', '=', job_uuid)], limit=1)
-        if record.context:
-            try:
-                ctx = json.loads(record.context)
-            except Exception as e:
-                _logger.error('\n\nERROR Due to JSON CONVERSION: %s\n\n' % e)
-                return record.with_env(env)
-            else:
-                _logger.info("\n\nCONTEXT: %s\n\n" % ctx)
-                return record.with_context(ctx).with_env(env)
         return record.with_env(env)
 
     def __init__(self, func,
@@ -518,15 +509,13 @@ def store(self):
                 'date_done': False,
                 'eta': False,
                 'identity_key': False,
-                'context': '{}',
                 }
 
         dt_to_string = odoo.fields.Datetime.to_string
         context = {}
         if self.keep_context:
             context = self.env.context.copy()
             vals.update({"context": json.dumps(context)})
-            _logger.info("\n\nCURRENT CONTEXT: %s\n\n" % context)
         if self.date_enqueued:
             vals['date_enqueued'] = dt_to_string(self.date_enqueued)
         if self.date_started:
@@ -543,6 +532,9 @@ def store(self):
             db_record.write(vals)
         else:
             date_created = dt_to_string(self.date_created)
+            # We store the original context used at import on create
+            ctx = self.env.context.copy() or '{}'
+            vals.update({'original_context': json.dumps(ctx) or ''})
             # The following values must never be modified after the
             # creation of the job
             vals.update({'uuid': self.uuid,
@@ -560,27 +552,34 @@ def store(self):
                 vals.update({'channel': self.channel})
 
             job = self.env[self.job_model_name].sudo().create(vals)
-            _logger.info('\n\nJOB: %s CONTEXT: %s' % (job, context))
 
     def db_record(self):
         return self.db_record_from_uuid(self.env, self.uuid)
 
+    def _get_abs_context(self, original_ctx, ctx):
+        try:
+            import_ctx = json.loads(original_ctx)
+            current_ctx = json.loads(ctx)
+        except Exception as e:
+            _logger.error("\n\nERROR CONTEXT JSON CONVERSION: %s\n\n" % e)
+            return self.env.context.copy()
+        else:
+            if isinstance(import_ctx, dict) and isinstance(current_ctx, dict):
+                import_ctx.update(current_ctx)
+                return import_ctx
+        return self.env.context.copy()
+
     def _get_record_context(self):
         """
         Get the context to execute the job
         """
-        # return {}
-        company_ids = []
+        ctx = self._get_abs_context(self.db_record().original_context,
+                                    self.db_record().context)
         if self.company_id:
-            company_ids = [self.company_id]
-        context_txt = self.db_record().context or {}
-        if isinstance(context_txt, str):
-            context = json.loads(context_txt)
-        else:
-            context = json.loads(context_txt)
-        context.update(
-            {"job_uuid": self.uuid, "allowed_company_ids": company_ids})
-        return context
+            ctx.update({'allowed_company_ids': [self.company_id]})
+        if self.uuid:
+            ctx.update({"job_uuid": self.uuid})
+        return ctx
 
     @property
     def func(self):

queue_job/models/queue_job.py

@@ -51,6 +51,11 @@ class QueueJob(models.Model):
              "(Default: {})",
         readonly=True,
     )
+    original_context = fields.Char(
+        string="Original Context Value",
+        default="{}",
+        help="This is the context dictionary that was used on import"
+    )
 
     model_name = fields.Char(string='Model', readonly=True)
     method_name = fields.Char(readonly=True)

queue_job/views/queue_job_views.xml

@@ -55,6 +55,7 @@
                     </group>
                     <group name="context_grp">
                         <field name="context"/>
+                        <field name="original_context"/>
                     </group>
                     <group colspan="4">
                         <div>