From b40f142d334f9d8416ef8ee44f3276b8bba204ec Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (ACSONE)" Date: Thu, 31 Oct 2019 15:08:47 +0100 Subject: [PATCH 1/3] [IMP] base_jsonify: Serialize Date and Datetime into ISO 8601 format --- base_jsonify/models/models.py | 4 ++-- base_jsonify/tests/test_get_parser.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base_jsonify/models/models.py b/base_jsonify/models/models.py index 14e00e103..ad1abf803 100644 --- a/base_jsonify/models/models.py +++ b/base_jsonify/models/models.py @@ -72,9 +72,9 @@ class Base(models.AbstractModel): if value is False and field_type != 'boolean': value = None elif field_type == "date": - value = fields.Date.to_string(value) + value = fields.Date.to_date(value).isoformat() elif field_type == "datetime": - value = fields.Datetime.to_string(value) + value = fields.Datetime.to_datetime(value).isoformat() res[json_key] = value result.append(res) return result diff --git a/base_jsonify/tests/test_get_parser.py b/base_jsonify/tests/test_get_parser.py index 5aea2d55f..fc08952bd 100644 --- a/base_jsonify/tests/test_get_parser.py +++ b/base_jsonify/tests/test_get_parser.py @@ -70,7 +70,7 @@ class TestParser(TransactionCase): 'country_id': self.env.ref('base.fr').id }) ], - 'date': fields.Date.today() + 'date': fields.Date.from_string("2019-10-31") }) expected_json = { 'lang': 'en_US', @@ -96,8 +96,8 @@ class TestParser(TransactionCase): 'name': 'Sebatien Beau', 'email': None }], - 'create_date': fields.Datetime.to_string(partner.create_date), - 'date': fields.Date.to_string(partner.date) + 'create_date': partner.create_date.isoformat(), + 'date': "2019-10-31" } json_partner = partner.jsonify(parser) From 74218643b11a4200a65d147a88245f8ddf5e6eec Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (ACSONE)" Date: Thu, 31 Oct 2019 15:46:33 +0100 Subject: [PATCH 2/3] [FIX] base_jsonify: Add tz info into serialized datetime --- base_jsonify/models/models.py | 8 +++++++- base_jsonify/tests/test_get_parser.py | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/base_jsonify/models/models.py b/base_jsonify/models/models.py index ad1abf803..6cc2c3bd6 100644 --- a/base_jsonify/models/models.py +++ b/base_jsonify/models/models.py @@ -3,6 +3,8 @@ # Raphaël Reverdy # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import pytz + from odoo import api, fields, models from odoo.exceptions import UserError from odoo.tools.translate import _ @@ -74,7 +76,11 @@ class Base(models.AbstractModel): elif field_type == "date": value = fields.Date.to_date(value).isoformat() elif field_type == "datetime": - value = fields.Datetime.to_datetime(value).isoformat() + value = ( + fields.Datetime.to_datetime(value) + .replace(tzinfo=pytz.utc) + .isoformat() + ) res[json_key] = value result.append(res) return result diff --git a/base_jsonify/tests/test_get_parser.py b/base_jsonify/tests/test_get_parser.py index fc08952bd..fe4198acc 100644 --- a/base_jsonify/tests/test_get_parser.py +++ b/base_jsonify/tests/test_get_parser.py @@ -72,6 +72,11 @@ class TestParser(TransactionCase): ], 'date': fields.Date.from_string("2019-10-31") }) + self.env.cr.execute( + "update res_partner set create_date=%s where id=%s", + ("2019-10-31 14:39:49", partner.id), + ) + partner.refresh() expected_json = { 'lang': 'en_US', 'comment': None, @@ -96,8 +101,8 @@ class TestParser(TransactionCase): 'name': 'Sebatien Beau', 'email': None }], - 'create_date': partner.create_date.isoformat(), - 'date': "2019-10-31" + "create_date": "2019-10-31T14:39:49+00:00", + "date": "2019-10-31", } json_partner = partner.jsonify(parser) From b5543b68cbcf69312b5949214bb306e012f6e471 Mon Sep 17 00:00:00 2001 From: "Laurent Mignon (ACSONE)" Date: Thu, 31 Oct 2019 16:32:21 +0100 Subject: [PATCH 3/3] [FIX] base_jsonify: Serialize datetime into the user's timezone --- base_jsonify/models/models.py | 14 +++++++------- base_jsonify/tests/test_get_parser.py | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/base_jsonify/models/models.py b/base_jsonify/models/models.py index 6cc2c3bd6..a235fed74 100644 --- a/base_jsonify/models/models.py +++ b/base_jsonify/models/models.py @@ -3,8 +3,6 @@ # Raphaël Reverdy # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import pytz - from odoo import api, fields, models from odoo.exceptions import UserError from odoo.tools.translate import _ @@ -76,11 +74,13 @@ class Base(models.AbstractModel): elif field_type == "date": value = fields.Date.to_date(value).isoformat() elif field_type == "datetime": - value = ( - fields.Datetime.to_datetime(value) - .replace(tzinfo=pytz.utc) - .isoformat() - ) + # Ensures value is a datetime + value = fields.Datetime.to_datetime(value) + # Get the timestamp converted to the client's timezone. + # This call also add the tzinfo into the datetime + # object + value = fields.Datetime.context_timestamp(rec, value) + value = value.isoformat() res[json_key] = value result.append(res) return result diff --git a/base_jsonify/tests/test_get_parser.py b/base_jsonify/tests/test_get_parser.py index fe4198acc..c1cff67d2 100644 --- a/base_jsonify/tests/test_get_parser.py +++ b/base_jsonify/tests/test_get_parser.py @@ -40,6 +40,8 @@ class TestParser(TransactionCase): self.assertEqual(parser, expected_parser) def test_json_export(self): + # Enforces TZ to validate the serialization result of a Datetime + self.env.user.tz = "Europe/Brussels" parser = [ 'lang', 'comment', @@ -101,7 +103,7 @@ class TestParser(TransactionCase): 'name': 'Sebatien Beau', 'email': None }], - "create_date": "2019-10-31T14:39:49+00:00", + "create_date": "2019-10-31T15:39:49+01:00", "date": "2019-10-31", } json_partner = partner.jsonify(parser)