From b0beff5b1d15946ec4e23a8796f5e9fc874991b3 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 28 Jul 2022 18:12:49 +0200 Subject: [PATCH 1/2] commit validation imei for mobiles --- ereuse_devicehub/resources/device/schemas.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/resources/device/schemas.py b/ereuse_devicehub/resources/device/schemas.py index 2cc8e65d..f1e22d51 100644 --- a/ereuse_devicehub/resources/device/schemas.py +++ b/ereuse_devicehub/resources/device/schemas.py @@ -291,7 +291,8 @@ class Mobile(Device): @pre_load def convert_check_imei(self, data): if data.get('imei', None): - data['imei'] = int(imei.validate(data['imei'])) + # data['imei'] = int(imei.validate(data['imei'])) + data['imei'] = int(data['imei']) return data @pre_load From 637308ee8ffad3a012337e19dd66df7de56a8495 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 28 Jul 2022 18:34:34 +0200 Subject: [PATCH 2/2] drop required of imei and meid --- ereuse_devicehub/resources/device/models.py | 4 ++-- ereuse_devicehub/resources/device/schemas.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 0703359d..56fd6de9 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -1076,13 +1076,13 @@ class Mobile(Device): @validates('imei') def validate_imei(self, _, value: int): - if not imei.is_valid(str(value)): + if value and not imei.is_valid(str(value)): raise ValidationError('{} is not a valid imei.'.format(value)) return value @validates('meid') def validate_meid(self, _, value: str): - if not meid.is_valid(value): + if value and not meid.is_valid(value): raise ValidationError('{} is not a valid meid.'.format(value)) return value diff --git a/ereuse_devicehub/resources/device/schemas.py b/ereuse_devicehub/resources/device/schemas.py index f1e22d51..2cc8e65d 100644 --- a/ereuse_devicehub/resources/device/schemas.py +++ b/ereuse_devicehub/resources/device/schemas.py @@ -291,8 +291,7 @@ class Mobile(Device): @pre_load def convert_check_imei(self, data): if data.get('imei', None): - # data['imei'] = int(imei.validate(data['imei'])) - data['imei'] = int(data['imei']) + data['imei'] = int(imei.validate(data['imei'])) return data @pre_load