Fix Resource __repr__ method

killbill/__init__.py

@@ -16,6 +16,7 @@
 # under the License.
 #
 
+user = 'KillBill Python Client'
 base_uri = 'http://localhost:8080'
 username = 'admin'
 password = 'password'
@@ -39,4 +40,5 @@
 
 from killbill.resource import Resource
 from killbill.account import Account
+from killbill.payment_method import PaymentMethod
 from killbill.subscription import Subscription

killbill/account.py

@@ -24,7 +24,7 @@ class Account(killbill.Resource):
     def __init__(self, **d):
         super(Account, self).__init__(d)
 
-    def create(self, user, reason=None, comment=None, **options):
+    def create(self, user=killbill.user, reason=None, comment=None, **options):
         created_account = self.post(self.KILLBILL_API_ACCOUNTS_PREFIX,
                                     self.to_json(),
                                     {},
@@ -36,6 +36,12 @@ def create(self, user, reason=None, comment=None, **options):
                                     ))
         return self.refresh(created_account, **options)
 
+    def update(self, **options):
+        return self.put("%s/%s" % (self.KILLBILL_API_ACCOUNTS_PREFIX, self.accountId),
+                        self.to_json(),
+                        {},
+                        self.build_options(**options))
+
     def bundles(self, **options):
         return self.get("%s/%s/bundles" % (self.KILLBILL_API_ACCOUNTS_PREFIX, self.accountId),
                         {},
@@ -62,3 +68,14 @@ def find_by_external_key(cls, external_key, **options):
             'externalKey': external_key
         }
         return cls.get(cls.KILLBILL_API_ACCOUNTS_PREFIX, query_params, cls.build_options(**options))
+
+
+    @classmethod
+    def find_by_id(cls, account_id, account_with_balance=False, account_with_balance_and_cba=False, audit='NONE', **options):
+        relative_url = "%s/%s" % (cls.KILLBILL_API_ACCOUNTS_PREFIX, account_id)
+        query_params = {
+            'accountWithBalance': account_with_balance,
+            'accountWithBalanceAndCBA': account_with_balance_and_cba,
+            'audit': audit
+        }
+        return cls.get(relative_url, query_params, cls.build_options(**options))

killbill/payment_method.py

@@ -0,0 +1,59 @@
+#
+# Copyright 2018 Quentral S.r.l.
+# Copyright 2014-2018 The Billing Project, LLC
+#
+# The Billing Project, LLC licenses this file to you under the Apache License, version 2.0
+# (the "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at:
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+import killbill
+
+
+class PaymentMethod(killbill.Resource):
+    KILLBILL_API_PAYMENT_METHODS_PREFIX = killbill.Resource.KILLBILL_API_PREFIX + '/paymentMethods'
+
+    def __init__(self, **d):
+        super(PaymentMethod, self).__init__(d)
+
+    def create(self, is_default=True, user=killbill.user, reason=None, comment=None, **options):
+        created_payment_method = self.post("%s/%s/paymentMethods" %
+                                           (killbill.Account.KILLBILL_API_ACCOUNTS_PREFIX, self.accountId),
+                                           self.to_json(),
+                                           {'isDefault': is_default},
+                                           self.build_options(
+                                               user=user,
+                                               reason=reason,
+                                               comment=comment,
+                                               **options
+                                           ))
+        return self.refresh(created_payment_method, **options)
+
+    def set_default(self, user=killbill.user, reason=None, comment=None, **options):
+        set_default = self.put("%s/%s/paymentMethods/%s/setDefault" %
+                               (killbill.Account.KILLBILL_API_ACCOUNTS_PREFIX,
+                                self.accountId, self.paymentMethodId),
+                               {},
+                               {},
+                               self.build_options(
+                                   user=user,
+                                   reason=reason,
+                                   comment=comment,
+                                   **options
+                               ))
+        return self.refresh(set_default, **options)
+
+    @classmethod
+    def find_all_by_account_id(cls, account_id, with_plugin_info=False, **options):
+        relative_url = "%s/%s/paymentMethods" % (killbill.Account.KILLBILL_API_ACCOUNTS_PREFIX, account_id)
+        query_params = {
+            'withPluginInfo': with_plugin_info
+        }
+        return cls.get(relative_url, query_params, cls.build_options(**options))

killbill/resource.py

@@ -45,7 +45,7 @@ def __init__(self, d):
             setattr(self, key, value)
 
     def __repr__(self):
-        return '%s %s' % (self.__class__, self.to_json)
+        return '%s %s' % (self.__class__, self.to_json())
 
     @staticmethod
     def build_options(**options):
@@ -96,6 +96,14 @@ def delete(cls, relative_uri, body, query_params, options):
         options['queryParams'] = query_params
         return cls.send_request(relative_uri, options)
 
+    @classmethod
+    def put(cls, relative_uri, body, query_params, options):
+        options['method'] = 'PUT'
+        options['body'] = body
+        options['queryParams'] = query_params
+        raw_get_response = cls.send_request(relative_uri, options)
+        return cls.fromJson(raw_get_response['body'])
+
     @classmethod
     def send_request(cls, relative_uri, options):
         headers = {}

killbill/subscription.py

@@ -23,7 +23,7 @@ class Subscription(killbill.Resource):
     def __init__(self, **d):
         super(Subscription, self).__init__(d)
 
-    def create(self, user, reason=None, comment=None, requested_date=None, call_completion=False, **options):
+    def create(self, user=killbill.user, reason=None, comment=None, requested_date=None, call_completion=False, **options):
         query_params = {}
 
         if call_completion: