OCA / queue / 122

pending completion

Build # 122

Build Type

Pull #50

travis-ci

Committed by

web-flow

Commit Message

[FIX] Get attributes on the class instead of recordsets

Even if the recordset is empty, this is still an instance of the class,
so the @property methods are called. As this type of method is usually
run on a single record, they need self.ensure_one(), which crashes when
evaluated on a recordset, preventing the server to start when queue_job
is installed.

Getting the attributes on the class itself instead of using an empty
recordset avoids evaluating property methods.

This reverts commit 49d8f37b8.

Pull Request Pull Request #50: [FIX] Get attributes on the class instead of recordsets

Run Details

1 of 1 new or added line in 1 file covered. (100.0%)

922 of 1180 relevant lines covered (78.14%)

1.56 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.02

/queue_job/fields.py

# -*- coding: utf-8 -*-
# copyright 2016 Camptocamp
# license agpl-3.0 or later (http://www.gnu.org/licenses/agpl.html)

import json
from datetime import datetime, date

import dateutil

from odoo import fields, models


class JobSerialized(fields.Field):
    """ Serialized fields provide the storage for sparse fields. """
    type = 'job_serialized'
    column_type = ('text', 'text')

    def convert_to_column(self, value, record, values=None):
        return json.dumps(value, cls=JobEncoder)

    def convert_to_cache(self, value, record, validate=True):
        # cache format: dict
        value = value or {}
        if isinstance(value, dict):
            return value
        else:
            return json.loads(value, cls=JobDecoder, env=record.env)


class JobEncoder(json.JSONEncoder):
    """ Encode Odoo recordsets so that we can later recompose them """

    def default(self, obj):
        if isinstance(obj, models.BaseModel):
            return {'_type': 'odoo_recordset',
                    'model': obj._name,
                    'ids': obj.ids,
                    'uid': obj.env.uid,
                    }
        elif isinstance(obj, datetime):
            return {'_type': 'datetime_isoformat',
                    'value': obj.isoformat()}
        elif isinstance(obj, date):
            return {'_type': 'date_isoformat',
                    'value': obj.isoformat()}
        return json.JSONEncoder.default(self, obj)


class JobDecoder(json.JSONDecoder):
    """ Decode json, recomposing recordsets """

    def __init__(self, *args, **kwargs):
        env = kwargs.pop('env')
        super(JobDecoder, self).__init__(
            object_hook=self.object_hook, *args, **kwargs
        )
        assert env
        self.env = env

    def object_hook(self, obj):
        if '_type' not in obj:
            return obj
        type_ = obj['_type']
        if type_ == 'odoo_recordset':
            model = self.env[obj['model']]
            if obj.get('uid'):
                model = model.sudo(obj['uid'])
            return model.browse(obj['ids'])
        elif type_ == 'datetime_isoformat':
            return dateutil.parser.parse(obj['value'])
        elif type_ == 'date_isoformat':
            return dateutil.parser.parse(obj['value']).date()
        return obj

1	# -- coding: utf-8 --
2	# copyright 2016 Camptocamp
3	# license agpl-3.0 or later (http://www.gnu.org/licenses/agpl.html)
4
5	import json	2✔
6	from datetime import datetime, date	2✔
7
8	import dateutil	2✔
9
10	from odoo import fields, models	2✔
11
12
13	class JobSerialized(fields.Field):	2✔
14	""" Serialized fields provide the storage for sparse fields. """
15	type = 'job_serialized'	2✔
16	column_type = ('text', 'text')	2✔
17
18	def convert_to_column(self, value, record, values=None):	2✔
19	return json.dumps(value, cls=JobEncoder)	2✔
20
21	def convert_to_cache(self, value, record, validate=True):	2✔
22	# cache format: dict
23	value = value or {}	2✔
24	if isinstance(value, dict):	2✔
25	return value	×
26	else:
27	return json.loads(value, cls=JobDecoder, env=record.env)	2✔
28
29
30	class JobEncoder(json.JSONEncoder):	2✔
31	""" Encode Odoo recordsets so that we can later recompose them """
32
33	def default(self, obj):	2✔
34	if isinstance(obj, models.BaseModel):	2✔
35	return {'_type': 'odoo_recordset',	2✔
36	'model': obj._name,
37	'ids': obj.ids,
38	'uid': obj.env.uid,
39	}
40	elif isinstance(obj, datetime):	2✔
41	return {'_type': 'datetime_isoformat',	2✔
42	'value': obj.isoformat()}
43	elif isinstance(obj, date):	2✔
44	return {'_type': 'date_isoformat',	2✔
45	'value': obj.isoformat()}
46	return json.JSONEncoder.default(self, obj)	×
47
48
49	class JobDecoder(json.JSONDecoder):	2✔
50	""" Decode json, recomposing recordsets """
51
52	def __init__(self, args, *kwargs):	2✔
53	env = kwargs.pop('env')	2✔
54	super(JobDecoder, self).__init__(	2✔
55	object_hook=self.object_hook, args, *kwargs
56	)
57	assert env	2✔
58	self.env = env	2✔
59
60	def object_hook(self, obj):	2✔
61	if '_type' not in obj:	2✔
62	return obj	2✔
63	type_ = obj['_type']	2✔
64	if type_ == 'odoo_recordset':	2✔
65	model = self.env[obj['model']]	2✔
66	if obj.get('uid'):	2✔
67	model = model.sudo(obj['uid'])	2✔
68	return model.browse(obj['ids'])	2✔
69	elif type_ == 'datetime_isoformat':	2✔
70	return dateutil.parser.parse(obj['value'])	2✔
71	elif type_ == 'date_isoformat':	2✔
72	return dateutil.parser.parse(obj['value']).date()	2✔
73	return obj	×

OCA / queue / 122

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous