2.8.0

Author: braintreeps

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.8.0
+
+* Added next_billing_date and transaction_id to subscription search
+* Added address_country_name to customer search
+* Added new error codes
+
 ## 2.7.0
 
 * Added Customer search

braintree/customer_search.py

@@ -8,6 +8,7 @@ class CustomerSearch:
       address_postal_code         = Search.TextNodeBuilder("address_postal_code")
       address_region              = Search.TextNodeBuilder("address_region")
       address_street_address      = Search.TextNodeBuilder("address_street_address")
+      address_country_name        = Search.TextNodeBuilder("address_country_name")
       cardholder_name             = Search.TextNodeBuilder("cardholder_name")
       company                     = Search.TextNodeBuilder("company")
       created_at                  = Search.RangeNodeBuilder("created_at")

braintree/error_codes.py

@@ -111,6 +111,7 @@ class Subscription(object):
         PlanIdIsInvalid = "91904"
         PriceCannotBeBlank = "81903"
         PriceFormatIsInvalid = "81904"
+        PriceIsTooLarge = "81923"
         StatusIsCanceled = "81905"
         TokenFormatIsInvalid = "81906"
         TrialDurationFormatIsInvalid = "81907"
@@ -120,6 +121,7 @@ class Subscription(object):
         class Modification(object):
             AmountCannotBeBlank = "92003"
             AmountIsInvalid = "92002"
+            AmountIsTooLarge = "92023"
             CannotEditModificationsOnPastDueSubscription = "92022"
             CannotUpdateAndRemove = "92015"
             ExistingIdIsIncorrectKind = "92020"

braintree/subscription_search.py

@@ -9,6 +9,8 @@ class SubscriptionSearch:
     ids = Search.MultipleValueNodeBuilder("ids")
     in_trial_period = Search.MultipleValueNodeBuilder("in_trial_period")
     merchant_account_id = Search.MultipleValueNodeBuilder("merchant_account_id")
+    next_billing_date = Search.RangeNodeBuilder("next_billing_date")
     plan_id = Search.MultipleValueOrTextNodeBuilder("plan_id")
     price = Search.RangeNodeBuilder("price")
     status = Search.MultipleValueNodeBuilder("status", Constants.get_all_constant_values_from_class(Subscription.Status))
+    transaction_id = Search.TextNodeBuilder("transaction_id")

braintree/version.py

@@ -1 +1 @@
-Version = "2.7.0"
+Version = "2.8.0"

tests/integration/test_customer_search.py

@@ -51,6 +51,7 @@ def test_advanced_search_searches_all_text_fields(self):
             "address_extended_address": "Suite 3",
             "address_locality": "Chicago",
             "address_region": "Illinois",
+            "address_country_name": "United States of America",
             "payment_method_token": token,
             "cardholder_name": "Tim Toole",
             "credit_card_number": "4111111111111111",

tests/integration/test_subscription.py

@@ -1006,6 +1006,24 @@ def test_search_on_price(self):
         self.assertTrue(TestHelper.includes(collection, subscription_1000))
         self.assertFalse(TestHelper.includes(collection, subscription_900))
 
+    def test_search_on_transaction_id(self):
+        subscription_found = Subscription.create({
+            "payment_method_token": self.credit_card.token,
+            "plan_id": TestHelper.trialless_plan["id"],
+        }).subscription
+
+        subscription_not_found = Subscription.create({
+            "payment_method_token": self.credit_card.token,
+            "plan_id": TestHelper.trialless_plan["id"],
+        }).subscription
+
+        collection = Subscription.search(
+            SubscriptionSearch.transaction_id == subscription_found.transactions[0].id
+        )
+
+        self.assertTrue(TestHelper.includes(collection, subscription_found))
+        self.assertFalse(TestHelper.includes(collection, subscription_not_found))
+
     def test_search_on_id(self):
         subscription_found = Subscription.create({
             "id": "find_me_%s" % random.randint(1,1000000),
@@ -1026,6 +1044,26 @@ def test_search_on_id(self):
         self.assertTrue(TestHelper.includes(collection, subscription_found))
         self.assertFalse(TestHelper.includes(collection, subscription_not_found))
 
+    def test_search_on_next_billing_date(self):
+        subscription_found = Subscription.create({
+            "payment_method_token": self.credit_card.token,
+            "plan_id": TestHelper.trialless_plan["id"]
+        }).subscription
+
+        subscription_not_found = Subscription.create({
+            "payment_method_token": self.credit_card.token,
+            "plan_id": TestHelper.trial_plan["id"]
+        }).subscription
+
+        next_billing_date_cutoff = datetime.today() + timedelta(days=5)
+
+        collection = Subscription.search(
+            SubscriptionSearch.next_billing_date >= next_billing_date_cutoff
+        )
+
+        self.assertTrue(TestHelper.includes(collection, subscription_found))
+        self.assertFalse(TestHelper.includes(collection, subscription_not_found))
+
     def test_retryCharge_without_amount__deprecated(self):
         subscription = Subscription.create({
             "payment_method_token": self.credit_card.token,