amazon-orders 3.2.5__tar.gz → 3.2.7__tar.gz

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/CHANGELOG.md

@@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/3.2.5...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/3.2.7...HEAD)
+
+## [3.2.7](https://github.com/alexdlaird/amazon-orders/compare/3.2.6...3.2.7) - 2025-02-17
+
+### Added
+
+- Fixes for parsing Amazon Fresh and Whole Foods Market orders, so they no longer need to be skipped (but their Items and Shipments will still be empty).
+
+## [3.2.6](https://github.com/alexdlaird/amazon-orders/compare/3.2.5...3.2.6) - 2025-02-17
+
+### Added
+
+- Add generic integration tests for Transactions, now in weekly run.
+- Other test improvements.
+
+### Fixed
+
+- Broken parsing when Transaction is pending.
 
 ## [3.2.5](https://github.com/alexdlaird/amazon-orders/compare/3.2.4...3.2.5) - 2025-02-12
 

{amazon_orders-3.2.5/amazon_orders.egg-info → amazon_orders-3.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: amazon-orders
-Version: 3.2.5
+Version: 3.2.7
 Summary: A CLI and library for interacting with Amazon order history.
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License: MIT License

{amazon_orders-3.2.5 → amazon_orders-3.2.7/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: amazon-orders
-Version: 3.2.5
+Version: 3.2.7
 Summary: A CLI and library for interacting with Amazon order history.
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License: MIT License

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/__init__.py

@@ -1,3 +1,3 @@
 __copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
-__version__ = "3.2.5"
+__version__ = "3.2.7"

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/entity/order.py

@@ -92,7 +92,7 @@ class Order(Parsable):
         return f"Order #{self.order_number}: {self.items}"
 
     def _parse_shipments(self) -> List[Shipment]:
-        if not self.parsed:
+        if not self.parsed or len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
             return []
 
         shipments: List[Shipment] = [self.config.shipment_cls(x, self.config)
@@ -102,7 +102,7 @@ class Order(Parsable):
         return shipments
 
     def _parse_items(self) -> List[Item]:
-        if not self.parsed:
+        if not self.parsed or len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
             return []
 
         items: List[Item] = [self.config.item_cls(x, self.config)

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/entity/transaction.py

@@ -1,4 +1,4 @@
-__copyright__ = "Copyright (c) 2024 Jeff Sawatzky"
+__copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 import logging

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/orders.py

@@ -73,11 +73,6 @@ class AmazonOrders:
             response_parsed = self.amazon_session.last_response_parsed
 
             for order_tag in util.select(response_parsed, self.config.selectors.ORDER_HISTORY_ENTITY_SELECTOR):
-                # First check if this Order is known to be of a type that we do not currently have a way to support
-                # parsing, meaning it should be skipped
-                if util.select(order_tag, self.config.selectors.ORDER_HISTORY_BRAND_SELECTOR):
-                    continue
-
                 order: Order = self.config.order_cls(order_tag, self.config)
 
                 if full_details:

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/selectors.py

@@ -55,12 +55,12 @@ class Selectors:
     SHIPMENT_ENTITY_SELECTOR = ["[data-component='orderCard'] [data-component='shipments'] .a-box",
                                 "div.shipment",
                                 "div.delivery-box"]
-    # Selectors defined here, if found in an Order, will cause the Order to be skipped, since it means we currently
-    # do not have a way to support fully parsing its details
-    ORDER_HISTORY_BRAND_SELECTOR = [
-        # Amazon Fresh is not supported
+    # Selectors defined here mean we don't have a reliable way to parse all details in an Order, so Items and
+    # Shipments will be skipped
+    ORDER_SKIP_ITEMS = [
+        # Identifies an Amazon Fresh order
         ".brand-info-box .brand-logo img",
-        # Whole Foods Market is not supported
+        # Identifies a Whole Foods Market order
         "a.yohtmlc-order-details-link[href^='/wholefoodsmarket']"
     ]
 
@@ -160,7 +160,7 @@ class Selectors:
     FIELD_TRANSACTION_GRAND_TOTAL_SELECTOR = [
         "div.apx-transactions-line-item-component-container > div:nth-child(1) span.a-size-base-plus"]
     FIELD_TRANSACTION_ORDER_NUMBER_SELECTOR = [
-        "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"]
+        "div.apx-transactions-line-item-component-container div .a-span12 a"]
     FIELD_TRANSACTION_ORDER_LINK_SELECTOR = [
         "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"]
     FIELD_TRANSACTION_SELLER_NAME_SELECTOR = [

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/amazonorders/transactions.py

@@ -1,4 +1,4 @@
-__copyright__ = "Copyright (c) 2024 Jeff Sawatzky"
+__copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 import datetime

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/tests/test_cli.py

@@ -65,7 +65,7 @@ class TestCli(UnitTestCase):
         # GIVEN
         order_id = "112-2961628-4757846"
         self.given_login_responses_success()
-        with open(os.path.join(self.RESOURCES_DIR, "order-details-112-2961628-4757846.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-details-112-2961628-4757846.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -92,7 +92,8 @@ class TestCli(UnitTestCase):
         mock_get_today.date.today.return_value = datetime.date(2024, 10, 11)
         days = 1
         self.given_login_responses_success()
-        with open(os.path.join(self.RESOURCES_DIR, "get-transactions.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions-snippet.html"),
+                  "r", encoding="utf-8") as f:
             resp = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/tests/test_orders.py

@@ -85,7 +85,7 @@ class TestOrders(UnitTestCase):
         year = 2024
         start_index = 0
         resp1 = self.given_order_history_landing_exists()
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-egift.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-egift.html"), "r",
                   encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.GET,
@@ -98,7 +98,7 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
         order = orders[5]
@@ -119,7 +119,7 @@ class TestOrders(UnitTestCase):
         year = 2010
         resp1 = self.given_order_history_landing_exists()
         resp2 = self.given_order_history_exists(year, 0)
-        with open(os.path.join(self.RESOURCES_DIR, f"order-history-{year}-10.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-history-{year}-10.html"), "r",
                   encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.GET,
@@ -139,13 +139,13 @@ class TestOrders(UnitTestCase):
         self.assertEqual(1, resp3.call_count)
 
     @responses.activate
-    def test_get_order_history_skip_fresh(self):
+    def test_get_order_history_fresh(self):
         # GIVEN
         self.amazon_session.is_authenticated = True
         year = 2024
         start_index = 0
         resp1 = self.given_order_history_landing_exists()
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-fresh.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-fresh.html"), "r",
                   encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.GET,
@@ -158,18 +158,24 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
+        order = orders[4]
+        self.assertEqual("111-2072777-8279433", order.order_number)
+        self.assertEqual(80.27, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2025, 1, 3), order.order_placed_date)
+        self.assertEqual(0, len(order.items))
 
     @responses.activate
-    def test_get_order_history_skip_wholefoods(self):
+    def test_get_order_history_wholefoods(self):
         # GIVEN
         self.amazon_session.is_authenticated = True
         year = 2024
         start_index = 0
         resp1 = self.given_order_history_landing_exists()
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-wholefoods.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-wholefoods.html"), "r",
                   encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.GET,
@@ -182,9 +188,15 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
+        order = orders[7]
+        self.assertEqual("113-6307059-7336242", order.order_number)
+        self.assertEqual(62.92, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 12, 12), order.order_placed_date)
+        self.assertEqual(0, len(order.items))
 
     @responses.activate
     def test_get_order_history_full_details(self):
@@ -291,7 +303,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "112-9685975-5907428"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -312,7 +324,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "112-5939971-8962610"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -333,7 +345,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "112-4482432-2955442"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -354,7 +366,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "112-9087159-1657009"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -375,7 +387,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "114-8722141-6545058"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
@@ -396,7 +408,7 @@ class TestOrders(UnitTestCase):
         # GIVEN
         self.amazon_session.is_authenticated = True
         order_id = "111-6778632-7354601"
-        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+        with open(os.path.join(self.RESOURCES_DIR, "orders", f"order-details-{order_id}.html"), "r",
                   encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/tests/test_session.py

@@ -37,14 +37,15 @@ class TestSession(UnitTestCase):
     @responses.activate
     def test_login_invalid_username(self):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-invalid-email.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-invalid-email.html"), "r",
+                  encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
@@ -64,14 +65,15 @@ class TestSession(UnitTestCase):
     @responses.activate
     def test_login_invalid_password(self):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-invalid-password.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-invalid-password.html"), "r",
+                  encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
@@ -92,21 +94,21 @@ class TestSession(UnitTestCase):
     @patch("builtins.input")
     def test_mfa(self, input_mock):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-mfa.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-mfa.html"), "r", encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"), "r", encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
@@ -128,28 +130,28 @@ class TestSession(UnitTestCase):
     @patch("builtins.input")
     def test_new_otp(self, input_mock):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-new-otp.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-new-otp.html"), "r", encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-mfa.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-mfa.html"), "r", encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"), "r", encoding="utf-8") as f:
             resp4 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
@@ -171,7 +173,7 @@ class TestSession(UnitTestCase):
     @responses.activate
     def test_captcha_1(self):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
@@ -184,14 +186,14 @@ class TestSession(UnitTestCase):
             status=302,
             headers={"Location": f"{self.test_config.constants.BASE_URL}/ap/cvf/request"}
         )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-captcha-1.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-captcha-1.html"), "r", encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/ap/cvf/request",
                 body=f.read(),
                 status=200
             )
-        with open(os.path.join(self.RESOURCES_DIR, "captcha_easy.jpg"), "rb") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "captcha_easy.jpg"), "rb") as f:
             resp4 = responses.add(
                 responses.GET,
                 "https://opfcaptcha-prod.s3.amazonaws.com/d32ff4fa043d4f969a1693adfb5d663a.jpg",
@@ -199,7 +201,7 @@ class TestSession(UnitTestCase):
                 headers={"Content-Type": "image/jpeg"},
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"), "r", encoding="utf-8") as f:
             request_data = {
                 "clientContext": "132-7968344-2156059",
                 "cvf_captcha_captcha_action": "verifyCaptcha",
@@ -242,21 +244,21 @@ class TestSession(UnitTestCase):
     @responses.activate
     def test_captcha_2(self):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-captcha-2.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-captcha-2.html"), "r", encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "captcha_easy.jpg"), "rb") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "captcha_easy.jpg"), "rb") as f:
             resp3 = responses.add(
                 responses.GET,
                 "https://images-na.ssl-images-amazon.com/captcha/ddwwidnf/Captcha_gmwackhtzu.jpg",
@@ -264,7 +266,7 @@ class TestSession(UnitTestCase):
                 headers={"Content-Type": "image/jpeg"},
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"), "r", encoding="utf-8") as f:
             resp4 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/errors/validateCaptcha",
@@ -293,7 +295,7 @@ class TestSession(UnitTestCase):
     @patch("PIL.Image.Image.show")
     def test_captcha_1_hard(self, show_mock, input_mock):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
@@ -306,14 +308,14 @@ class TestSession(UnitTestCase):
             status=302,
             headers={"Location": f"{self.test_config.constants.BASE_URL}/ap/cvf/request"}
         )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-captcha-1.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-captcha-1.html"), "r", encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/ap/cvf/request",
                 body=f.read(),
                 status=200
             )
-        with open(os.path.join(self.RESOURCES_DIR, "captcha_hard.jpg"), "rb") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "captcha_hard.jpg"), "rb") as f:
             resp4 = responses.add(
                 responses.GET,
                 "https://opfcaptcha-prod.s3.amazonaws.com/d32ff4fa043d4f969a1693adfb5d663a.jpg",
@@ -321,7 +323,7 @@ class TestSession(UnitTestCase):
                 headers={"Content-Type": "image/jpeg"},
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"), "r", encoding="utf-8") as f:
             resp5 = responses.add(
                 responses.POST,
                 f"{self.test_config.constants.BASE_URL}/ap/cvf/verify",
@@ -345,21 +347,23 @@ class TestSession(UnitTestCase):
     @patch("builtins.input")
     def test_captcha_otp(self, input_mock):
         # GIVEN
-        with open(os.path.join(self.RESOURCES_DIR, "signin.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "signin.html"), "r", encoding="utf-8") as f:
             resp1 = responses.add(
                 responses.GET,
                 f"{self.test_config.constants.BASE_URL}/gp/sign-in.html",
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "post-signin-captcha-otp.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "auth", "post-signin-captcha-otp.html"),
+                  "r", encoding="utf-8") as f:
             resp2 = responses.add(
                 responses.POST,
                 self.test_config.constants.SIGN_IN_REDIRECT_URL,
                 body=f.read(),
                 status=200,
             )
-        with open(os.path.join(self.RESOURCES_DIR, "order-history-2018-0.html"), "r", encoding="utf-8") as f:
+        with open(os.path.join(self.RESOURCES_DIR, "orders", "order-history-2018-0.html"),
+                  "r", encoding="utf-8") as f:
             resp3 = responses.add(
                 responses.POST,
                 f"{self.test_config.constants.BASE_URL}/ap/cvf/approval/verifyOtp",

amazon_orders-3.2.7/tests/test_transactions.py

@@ -0,0 +1,131 @@
+__copyright__ = "Copyright (c) 2024 Alex Laird"
+__license__ = "MIT"
+
+import datetime
+import os
+from unittest.mock import Mock, patch
+
+import responses
+from bs4 import BeautifulSoup
+
+from amazonorders.session import AmazonSession
+from amazonorders.transactions import AmazonTransactions, _parse_transaction_form_tag
+from tests.unittestcase import UnitTestCase
+
+
+class TestOrders(UnitTestCase):
+    temp_order_history_file_path = os.path.join(
+        os.path.abspath(os.path.dirname(__file__)), "output", "temp-order-history.html"
+    )
+    temp_order_details_file_path = os.path.join(
+        os.path.abspath(os.path.dirname(__file__)), "output", "temp-order-details.html"
+    )
+
+    def setUp(self):
+        super().setUp()
+
+        self.amazon_session = AmazonSession(
+            "some-username", "some-password", config=self.test_config
+        )
+
+        self.amazon_transactions = AmazonTransactions(self.amazon_session)
+
+    @responses.activate
+    @patch("amazonorders.transactions.datetime", wraps=datetime)
+    def test_get_transactions(self, mock_get_today: Mock):
+        # GIVEN
+        mock_get_today.date.today.return_value = datetime.date(2024, 10, 11)
+        days = 1
+        self.amazon_session.is_authenticated = True
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions-snippet.html"),
+                  "r",
+                  encoding="utf-8") as f:
+            responses.add(
+                responses.GET,
+                f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        transactions = self.amazon_transactions.get_transactions(days=days)
+
+        # THEN
+        self.assertEqual(1, len(transactions))
+        transaction = transactions[0]
+        self.assertEqual(transaction.completed_date, datetime.date(2024, 10, 11))
+        self.assertEqual(transaction.payment_method, "Visa ****1234")
+        self.assertEqual(transaction.grand_total, -45.19)
+        self.assertFalse(transaction.is_refund)
+        self.assertEqual(transaction.order_number, "123-4567890-1234567")
+        self.assertEqual(transaction.order_details_link,
+                         "https://www.amazon.ca/gp/css/summary/edit.html?orderID=123-4567890-1234567")
+        self.assertEqual(transaction.seller, "AMZN Mktp CA")
+
+    @responses.activate
+    @patch("amazonorders.transactions.datetime", wraps=datetime)
+    def test_get_transactions_with_pending(self, mock_get_today: Mock):
+        # GIVEN
+        mock_get_today.date.today.return_value = datetime.date(2025, 2, 13)
+        days = 30
+        self.amazon_session.is_authenticated = True
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "transactions-in-progress.html"),
+                  "r",
+                  encoding="utf-8") as f:
+            responses.add(
+                responses.GET,
+                f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        transactions = self.amazon_transactions.get_transactions(days=days)
+
+        # THEN
+        self.assertEqual(20, len(transactions))
+        transaction = transactions[0]
+        self.assertEqual(transaction.completed_date, datetime.date(2025, 2, 12))
+        self.assertEqual(transaction.payment_method, "Prime Visa ****1111")
+        self.assertEqual(transaction.grand_total, -26.29)
+        self.assertFalse(transaction.is_refund)
+        self.assertEqual(transaction.order_number, "234-8832881-7100260")
+        self.assertEqual(transaction.order_details_link,
+                         "https://www.amazon.com/gp/your-account/order-details?orderID=234-8832881-7100260")
+        self.assertEqual(transaction.seller, None)
+        transaction = transactions[1]
+        self.assertEqual(transaction.completed_date, datetime.date(2025, 2, 7))
+        self.assertEqual(transaction.payment_method, "Prime Visa ****1111")
+        self.assertEqual(transaction.grand_total, 43.94)
+        self.assertTrue(transaction.is_refund)
+        self.assertEqual(transaction.order_number, "234-3017692-4601031")
+        self.assertEqual(transaction.order_details_link,
+                         "https://www.amazon.com/gp/css/summary/edit.html?orderID=234-3017692-4601031")
+        self.assertEqual(transaction.seller, "AMZN Mktp US")
+
+    def test_parse_transaction_form_tag(self):
+        # GIVEN
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "transaction-form-tag.html"),
+                  "r",
+                  encoding="utf-8") as f:
+            parsed = BeautifulSoup(f.read(), self.test_config.bs4_parser)
+            form_tag = parsed.select_one("form")
+
+        # WHEN
+        transactions, next_page_url, next_page_data = _parse_transaction_form_tag(
+            form_tag, self.test_config
+        )
+
+        # THEN
+        self.assertEqual(len(transactions), 2)
+        self.assertEqual(
+            next_page_url, "https://www.amazon.com:443/cpe/yourpayments/transactions"
+        )
+        self.assertEqual(
+            next_page_data,
+            {
+                "ppw-widgetState": "the-ppw-widgetState",
+                "ie": "UTF-8",
+                'ppw-widgetEvent:DefaultNextPageNavigationEvent:{"nextPageKey":"key"}': "",
+            },
+        )

{amazon_orders-3.2.5 → amazon_orders-3.2.7}/tests/test_util.py

@@ -1,4 +1,4 @@
-__copyright__ = "Copyright (c) 2024 Jeff Sawatzky"
+__copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 from amazonorders.util import to_type

amazon_orders-3.2.5/tests/test_transactions.py

@@ -1,166 +0,0 @@
-__copyright__ = "Copyright (c) 2024 Jeff Sawatzky"
-__license__ = "MIT"
-
-import datetime
-import os
-from unittest.mock import Mock, patch
-
-import responses
-from bs4 import BeautifulSoup
-
-from amazonorders.session import AmazonSession
-from amazonorders.transactions import AmazonTransactions, _parse_transaction_form_tag
-from tests.unittestcase import UnitTestCase
-
-
-class TestOrders(UnitTestCase):
-    temp_order_history_file_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)), "output", "temp-order-history.html"
-    )
-    temp_order_details_file_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)), "output", "temp-order-details.html"
-    )
-
-    def setUp(self):
-        super().setUp()
-
-        self.amazon_session = AmazonSession(
-            "some-username", "some-password", config=self.test_config
-        )
-
-        self.amazon_transactions = AmazonTransactions(self.amazon_session)
-
-    @responses.activate
-    @patch("amazonorders.transactions.datetime", wraps=datetime)
-    def test_transactions_command(self, mock_get_today: Mock):
-        # GIVEN
-        mock_get_today.date.today.return_value = datetime.date(2024, 10, 11)
-        days = 1
-        self.amazon_session.is_authenticated = True
-        with open(
-                os.path.join(self.RESOURCES_DIR, "get-transactions.html"),
-                "r",
-                encoding="utf-8",
-        ) as f:
-            responses.add(
-                responses.GET,
-                f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",
-                body=f.read(),
-                status=200,
-            )
-
-        # WHEN
-        transactions = self.amazon_transactions.get_transactions(days=days)
-
-        # THEN
-        self.assertEqual(1, len(transactions))
-
-    def test_parse_transaction_form_tag(self):
-        # GIVEN
-        parsed = BeautifulSoup(TEST_PARSE_TRANSACTION_FORM_TAG_HTML, self.test_config.bs4_parser)
-        form_tag = parsed.select_one("form")
-
-        # WHEN
-        transactions, next_page_url, next_page_data = _parse_transaction_form_tag(
-            form_tag, self.test_config
-        )
-
-        # THEN
-        self.assertEqual(len(transactions), 2)
-        self.assertEqual(
-            next_page_url, "https://www.amazon.com:443/cpe/yourpayments/transactions"
-        )
-        self.assertEqual(
-            next_page_data,
-            {
-                "ppw-widgetState": "the-ppw-widgetState",
-                "ie": "UTF-8",
-                'ppw-widgetEvent:DefaultNextPageNavigationEvent:{"nextPageKey":"key"}': "",
-            },
-        )
-
-
-TEST_PARSE_TRANSACTION_FORM_TAG_HTML = """
-<form action="https://www.amazon.com:443/cpe/yourpayments/transactions" class="a-spacing-none" method="post"><input
-        name="ppw-widgetState" type="hidden" value="the-ppw-widgetState" /><input name="ie" type="hidden"
-        value="UTF-8" />
-    <div class="a-box-group a-spacing-base">
-        <div class="a-box a-spacing-none a-box-title apx-transactions-sleeve-header-container">
-            <div class="a-box-inner a-padding-base"><span class="a-size-base a-text-bold">Completed</span></div>
-        </div>
-        <div class="a-box a-spacing-base">
-            <div class="a-box-inner a-padding-none">
-                <div class="a-section a-spacing-base a-padding-base apx-transaction-date-container pmts-portal-component pmts-portal-components-pp-kXMaEm-3"
-                    data-pmts-component-id="pp-kXMaEm-3"><span>October 11, 2024</span></div>
-                <div class="a-section a-spacing-base pmts-portal-component pmts-portal-components-pp-kXMaEm-3"
-                    data-pmts-component-id="pp-kXMaEm-3">
-                    <div class="a-section a-spacing-base apx-transactions-line-item-component-container">
-                        <div class="a-row pmts-portal-component pmts-portal-components-pp-kXMaEm-4"
-                            data-pmts-component-id="pp-kXMaEm-4">
-                            <div class="a-column a-span9"><span class="a-size-base a-text-bold">Visa ****1234</span>
-                            </div>
-                            <div class="a-column a-span3 a-text-right a-span-last"><span
-                                    class="a-size-base-plus a-text-bold">-CA$45.19</span></div>
-                        </div>
-                        <div class="a-section a-spacing-none a-spacing-top-mini pmts-portal-component pmts-portal-components-pp-kXMaEm-4"
-                            data-pmts-component-id="pp-kXMaEm-4">
-                            <div class="a-row">
-                                <div class="a-column a-span12"><a class="a-link-normal"
-                                        href="https://www.amazon.ca/gp/css/summary/edit.html?orderID=123-4567890-1234567"
-                                        id="pp-kXMaEm-50">Order #123-4567890-1234567</a></div>
-                            </div>
-                        </div>
-                        <div class="a-section a-spacing-none a-spacing-top-mini pmts-portal-component pmts-portal-components-pp-kXMaEm-4"
-                            data-pmts-component-id="pp-kXMaEm-4">
-                            <div class="a-row">
-                                <div class="a-column a-span12"><span class="a-size-base">AMZN Mktp CA</span></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="a-section a-spacing-base a-padding-base apx-transaction-date-container pmts-portal-component pmts-portal-components-pp-kXMaEm-8"
-                    data-pmts-component-id="pp-kXMaEm-8"><span>October 9, 2024</span></div>
-                <div class="a-section a-spacing-base pmts-portal-component pmts-portal-components-pp-kXMaEm-8"
-                    data-pmts-component-id="pp-kXMaEm-8">
-                    <div class="a-section a-spacing-base apx-transactions-line-item-component-container">
-                        <div class="a-row pmts-portal-component pmts-portal-components-pp-kXMaEm-9"
-                            data-pmts-component-id="pp-kXMaEm-9">
-                            <div class="a-column a-span9"><span class="a-size-base a-text-bold">Mastercard
-                                    ****1234</span></div>
-                            <div class="a-column a-span3 a-text-right a-span-last"><span
-                                    class="a-size-base-plus a-text-bold">-CA$28.79</span></div>
-                        </div>
-                        <div class="a-section a-spacing-none a-spacing-top-mini pmts-portal-component pmts-portal-components-pp-kXMaEm-9"
-                            data-pmts-component-id="pp-kXMaEm-9">
-                            <div class="a-row">
-                                <div class="a-column a-span12"><a class="a-link-normal"
-                                        href="https://www.amazon.ca/gp/css/summary/edit.html?orderID=123-4567890-1234567"
-                                        id="pp-kXMaEm-52">Order #123-4567890-1234567</a></div>
-                            </div>
-                        </div>
-                        <div class="a-section a-spacing-none a-spacing-top-mini pmts-portal-component pmts-portal-components-pp-kXMaEm-9"
-                            data-pmts-component-id="pp-kXMaEm-9">
-                            <div class="a-row">
-                                <div class="a-column a-span12"><span class="a-size-base">Amazon.ca</span></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="a-row a-spacing-top-extra-large">
-        <div class="a-column a-span2 a-text-center"><span class="a-button a-button-span12 a-button-base"><span
-                    class="a-button-inner"><input class="a-button-input"
-                        name='ppw-widgetEvent:DefaultPreviousPageNavigationEvent:{"previousPageKey":"key"}'
-                        type="submit" /><span aria-hidden="true" class="a-button-text">Previous
-                        Page</span></span></span></div>
-        <div class="a-column a-span2 a-text-center a-span-last"><span
-                class="a-button a-button-span12 a-button-base"><span class="a-button-inner"><input
-                        class="a-button-input"
-                        name='ppw-widgetEvent:DefaultNextPageNavigationEvent:{"nextPageKey":"key"}'
-                        type="submit" /><span aria-hidden="true" class="a-button-text">Next Page</span></span></span>
-        </div>
-    </div>
-</form>
-"""  # noqa