From 97d79c771bde4dce59205e79035cd6ca2a3a2923 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Thu, 3 Aug 2023 15:01:27 +0200 Subject: [PATCH] Meta data checking now in order --- camisatoshi_wordpress_reports/controllers.py | 7 ++----- camisatoshi_wordpress_reports/order.py | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/camisatoshi_wordpress_reports/controllers.py b/camisatoshi_wordpress_reports/controllers.py index ec76bfc..a991426 100644 --- a/camisatoshi_wordpress_reports/controllers.py +++ b/camisatoshi_wordpress_reports/controllers.py @@ -107,15 +107,12 @@ def filter_orders_by_sku(orders: List[Order], skus: List[str]) -> List[Order]: return filtered_orders -def find_orders_without_sats_received(orders: List[Dict]) -> List[Dict]: +def find_orders_without_sats_received(orders: List[Order]) -> List[Order]: orders_without_sats_received = [] for order in orders: - meta_data_entries = {meta_data_entry["key"]: meta_data_entry["value"] for meta_data_entry in order["meta_data"]} - if "sats_received" not in meta_data_entries.keys(): + if not order.contains_meta_data_entry("sats_received"): orders_without_sats_received.append(order) continue - if int(meta_data_entries["sats_received"]) < 0: - orders_without_sats_received.append(order) return orders_without_sats_received diff --git a/camisatoshi_wordpress_reports/order.py b/camisatoshi_wordpress_reports/order.py index 6b9ba49..246200f 100644 --- a/camisatoshi_wordpress_reports/order.py +++ b/camisatoshi_wordpress_reports/order.py @@ -15,6 +15,12 @@ class Order: return True return False + def contains_meta_data_entry(self, meta_data_entry_key: str) -> bool: + meta_data_entries = {meta_data_entry["key"]: meta_data_entry["value"] for meta_data_entry in self["meta_data"]} + if meta_data_entry_key in meta_data_entries.keys(): + return True + return False + @classmethod def from_api_response(cls, raw_data) -> "Order": return Order(raw_data)