From c12ace57c6c8272420160b83fd2228725204d793 Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Thu, 9 Sep 2021 15:18:13 +0300 Subject: [PATCH 1/6] CTD-130 add search by order number to order model --- livestyled/__init__.py | 2 +- livestyled/models/order.py | 10 ++++++++++ livestyled/resource_client.py | 11 ++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/livestyled/__init__.py b/livestyled/__init__.py index 6ac3a6a..bd7baf8 100644 --- a/livestyled/__init__.py +++ b/livestyled/__init__.py @@ -1 +1 @@ -__version__ = '1.1.34' +__version__ = '1.1.35' diff --git a/livestyled/models/order.py b/livestyled/models/order.py index 86b61a0..b9a6ea4 100644 --- a/livestyled/models/order.py +++ b/livestyled/models/order.py @@ -157,3 +157,13 @@ def placeholder(cls, id): external_id=None, seat_info=None ) + + def diff(self, other): + differences = {} + fields = ( + 'external_id', 'status' + ) + for field in fields: + if getattr(self, field) != getattr(other, field): + differences[field] = getattr(self, field) + return differences diff --git a/livestyled/resource_client.py b/livestyled/resource_client.py index 37ec698..fcb05bf 100644 --- a/livestyled/resource_client.py +++ b/livestyled/resource_client.py @@ -868,9 +868,18 @@ def get_order( def get_orders( self, external_id: str or None = None, + filters: Dict or None = None ) -> Generator[Order, None, None]: + filter_param = {} + + if filters: + filter_param = filters + if external_id: - return self._get_resource_list(OrderSchema, external_id) + filter_param['externalId'] = external_id + + if filters: + return self._get_resource_list(OrderSchema, filters=filter_param) else: return self._get_resource_list(OrderSchema) From ce8b7e193d8add2e726f0b4cb535278652a50090 Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Thu, 9 Sep 2021 15:48:13 +0300 Subject: [PATCH 2/6] CTD-132 fix comment --- livestyled/resource_client.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/livestyled/resource_client.py b/livestyled/resource_client.py index fcb05bf..20c0bcf 100644 --- a/livestyled/resource_client.py +++ b/livestyled/resource_client.py @@ -878,10 +878,9 @@ def get_orders( if external_id: filter_param['externalId'] = external_id - if filters: - return self._get_resource_list(OrderSchema, filters=filter_param) - else: - return self._get_resource_list(OrderSchema) + + return self._get_resource_list(OrderSchema, filters=filter_param or None) + def update_order( self, From 34689a2d7e4411b3a630576ab1ee0bad5004bf9c Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Thu, 9 Sep 2021 15:52:41 +0300 Subject: [PATCH 3/6] CTD-132 fix tests --- livestyled/resource_client.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestyled/resource_client.py b/livestyled/resource_client.py index 20c0bcf..6303123 100644 --- a/livestyled/resource_client.py +++ b/livestyled/resource_client.py @@ -878,10 +878,8 @@ def get_orders( if external_id: filter_param['externalId'] = external_id - return self._get_resource_list(OrderSchema, filters=filter_param or None) - def update_order( self, order: Order, From 68296694950f1893f5af35f0cbd214963115ff06 Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Fri, 10 Sep 2021 16:34:59 +0300 Subject: [PATCH 4/6] CTD-130 fixed comment --- livestyled/resource_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestyled/resource_client.py b/livestyled/resource_client.py index 6303123..7b7fb3e 100644 --- a/livestyled/resource_client.py +++ b/livestyled/resource_client.py @@ -878,7 +878,7 @@ def get_orders( if external_id: filter_param['externalId'] = external_id - return self._get_resource_list(OrderSchema, filters=filter_param or None) + return self._get_resource_list(OrderSchema, filters=filter_param) def update_order( self, From 3249c3645eb3685ceb8d824444be9d720fd0e0b5 Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Fri, 10 Sep 2021 17:22:21 +0300 Subject: [PATCH 5/6] CTD-130 move to one line --- livestyled/models/order.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/livestyled/models/order.py b/livestyled/models/order.py index b9a6ea4..ed92cca 100644 --- a/livestyled/models/order.py +++ b/livestyled/models/order.py @@ -160,9 +160,7 @@ def placeholder(cls, id): def diff(self, other): differences = {} - fields = ( - 'external_id', 'status' - ) + fields = ('external_id', 'status') for field in fields: if getattr(self, field) != getattr(other, field): differences[field] = getattr(self, field) From 1198e830aba58349dfa485a66e5b5a4656dff13a Mon Sep 17 00:00:00 2001 From: Dasha Syvyuk Date: Fri, 10 Sep 2021 17:29:15 +0300 Subject: [PATCH 6/6] CTD-130 add all exist and update fields to diff --- livestyled/models/order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestyled/models/order.py b/livestyled/models/order.py index ed92cca..004b68a 100644 --- a/livestyled/models/order.py +++ b/livestyled/models/order.py @@ -160,7 +160,7 @@ def placeholder(cls, id): def diff(self, other): differences = {} - fields = ('external_id', 'status') + fields = ('external_id', 'status', 'collection_preference_type', 'check_in_time') for field in fields: if getattr(self, field) != getattr(other, field): differences[field] = getattr(self, field)