From 9917bb71e897113253c720e7bc21767e99683c59 Mon Sep 17 00:00:00 2001 From: counterweight Date: Wed, 6 Sep 2023 14:23:41 +0200 Subject: [PATCH] Minor logging stuff. --- camisatoshi_wordpress_reports/order.py | 25 +++++++++++-------- .../report_building.py | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/camisatoshi_wordpress_reports/order.py b/camisatoshi_wordpress_reports/order.py index d2182af..edce067 100644 --- a/camisatoshi_wordpress_reports/order.py +++ b/camisatoshi_wordpress_reports/order.py @@ -1,12 +1,13 @@ import logging from typing import Dict, Collection -from camisatoshi_wordpress_reports.constants import order_keys, custom_meta_data_keys +from camisatoshi_wordpress_reports.constants import ( + order_keys, + custom_meta_data_keys, +) from camisatoshi_wordpress_reports.utils import safe_zero_division -logger = logging.getLogger() - class Order: def __init__(self, raw_data: Dict): self.raw_data = raw_data @@ -39,7 +40,9 @@ class Order: total_order_eur = float(self[order_keys.total]) eur_of_sku = self.sales_of_sku(sku) - monetary_weight_of_sku_in_order = safe_zero_division(eur_of_sku, total_order_eur) + monetary_weight_of_sku_in_order = safe_zero_division( + eur_of_sku, total_order_eur + ) total_order_sats_received = float( self.meta_data_entries[custom_meta_data_keys.sats_received] ) @@ -50,12 +53,9 @@ class Order: return sats_received_for_sku def contains_sku(self, sku: str) -> bool: - logger.debug(f"Checking if order {self['id']} contains sku {sku}.") for item in self[order_keys.line_items]: if item[order_keys.line_item_keys.sku] == sku: - logger.debug(f"It does.") return True - logger.debug("It doesn't.") return False def contains_meta_data_entry(self, meta_data_entry_key: str) -> bool: @@ -100,15 +100,15 @@ class Orders: if order.contains_sku(sku): filtered_orders.append(order) - logger.debug(f"Finished filtering. I have {len(filtered_orders)} orders.") - return Orders(filtered_orders) def filter_orders_without_sats_received(self) -> "Orders": orders_without_sats_received = [] for order in self: - if not order.contains_meta_data_entry(custom_meta_data_keys.sats_received): + if not order.contains_meta_data_entry( + custom_meta_data_keys.sats_received + ): orders_without_sats_received.append(order) continue @@ -127,7 +127,10 @@ class Orders: orders_with_metadata_value = [] for order in self: - if order.contains_meta_data_entry(key) and order.meta_data_entries[key] == value: + if ( + order.contains_meta_data_entry(key) + and order.meta_data_entries[key] == value + ): orders_with_metadata_value.append(order) return Orders(orders_with_metadata_value) diff --git a/camisatoshi_wordpress_reports/report_building.py b/camisatoshi_wordpress_reports/report_building.py index 37971c8..293a355 100644 --- a/camisatoshi_wordpress_reports/report_building.py +++ b/camisatoshi_wordpress_reports/report_building.py @@ -106,7 +106,7 @@ class ReportChain: def _run_order_fetching_step(self, wc_api_client: API) -> Orders: logger.debug("Running order fetching step.") self._orders = self.order_fetching_step(wc_api_client) - logger.debug(f"Received {self._orders} orders.") + logger.debug(f"Received {len(self._orders)} orders.") def _run_order_filtering_steps(self) -> Orders: logger.debug(