From f10b39a3bae1bc226b13a68ebda27fdf12adc2e9 Mon Sep 17 00:00:00 2001 From: Aaron Guise Date: Fri, 25 Nov 2022 23:03:43 +1300 Subject: [PATCH] Update test data --- .gitignore | 4 ++ akauntingpy/api.py | 10 ++-- data/{ => v2}/GetAccountsSearch.json | 4 +- data/{ => v2}/GetAccountsSearchNotFound.json | 0 data/v3/GetAccountsSearch.json | 56 ++++++++++++++++++++ data/v3/GetAccountsSearchNotFound.json | 13 +++++ setup.py | 3 +- 7 files changed, 82 insertions(+), 8 deletions(-) rename data/{ => v2}/GetAccountsSearch.json (94%) rename data/{ => v2}/GetAccountsSearchNotFound.json (100%) create mode 100644 data/v3/GetAccountsSearch.json create mode 100644 data/v3/GetAccountsSearchNotFound.json diff --git a/.gitignore b/.gitignore index 345d7dc..ac5ffa0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,10 @@ __pycache__ .coverage coverage.xml +# distribution files +dist/ +*egg-info/ + # Ignore Scratch files scratch/* !/scratch/README.md diff --git a/akauntingpy/api.py b/akauntingpy/api.py index 0922bce..65ae33b 100644 --- a/akauntingpy/api.py +++ b/akauntingpy/api.py @@ -1,5 +1,5 @@ import requests -import logging +gimport logging from requests.auth import HTTPBasicAuth from akauntingpy import exceptions @@ -7,9 +7,9 @@ from akauntingpy.helpers import * __version__ = "1.0.5" - logger = logging.getLogger(__name__) + class Client(object): """ Akaunting interface. @@ -73,7 +73,7 @@ class Client(object): # raise exceptions.Error(response_['message']) elif response.status_code == 429: # We hit the maximum requests - raise exceptions.TooManyAttempts(response_['message']) + raise exceptions.TooManyAttempts(response_['message']) return response_ def ping(self): @@ -168,7 +168,7 @@ class Client(object): transferred_at=None, # Date of expense/transfer or income payment_method="Bank Transfer", # Payment method amount=None, # Amount received/paid - **params # Any additional parameters + **params # Any additional parameters ): logger.info("Transfer called with parameters") logger.info("from_account_id: %s", from_account_id) @@ -176,7 +176,7 @@ class Client(object): logger.info("transferred_at: %s", transferred_at) logger.info("payment_method: %s", payment_method) logger.info("amount: %s", amount) - + data = self.call(endpoint="transfers", method="POST", from_account_id=from_account_id, diff --git a/data/GetAccountsSearch.json b/data/v2/GetAccountsSearch.json similarity index 94% rename from data/GetAccountsSearch.json rename to data/v2/GetAccountsSearch.json index e8d1ee6..b8f21fa 100644 --- a/data/GetAccountsSearch.json +++ b/data/v2/GetAccountsSearch.json @@ -4,7 +4,7 @@ "id":2, "company_id":1, "name":"Some Account", - "number":"**-9011-*******-03", + "number":"00-0000-0000000-00", "currency_code":"NZD", "opening_balance":0, "opening_balance_formatted":"$0.00", @@ -31,4 +31,4 @@ } } } - } \ No newline at end of file + } diff --git a/data/GetAccountsSearchNotFound.json b/data/v2/GetAccountsSearchNotFound.json similarity index 100% rename from data/GetAccountsSearchNotFound.json rename to data/v2/GetAccountsSearchNotFound.json diff --git a/data/v3/GetAccountsSearch.json b/data/v3/GetAccountsSearch.json new file mode 100644 index 0000000..69381d5 --- /dev/null +++ b/data/v3/GetAccountsSearch.json @@ -0,0 +1,56 @@ +{ + "data":[ + { + "id":2, + "company_id":1, + "type":"bank", + "name":"Some Account", + "number":"00-0000-0000000-00", + "currency_code":"NZD", + "opening_balance":351.17, + "opening_balance_formatted":"$351.17", + "current_balance":306.3600000000006, + "current_balance_formatted":"$306.36", + "bank_name":"None", + "bank_phone":"None", + "bank_address":"None", + "enabled":true, + "created_from":"core::ui", + "created_by":1, + "created_at":"2022-05-30T11:06:21+12:00", + "updated_at":"2022-05-30T11:10:47+12:00" + } + ], + "links":{ + "first":"https://someakaunting-url/api/accounts?page=1", + "last":"https://someakaunting-url/api/accounts?page=1", + "prev":"None", + "next":"None" + }, + "meta":{ + "current_page":1, + "from":1, + "last_page":1, + "links":[ + { + "url":"None", + "label":"Previous", + "active":false + }, + { + "url":"https://someakaunting-url/api/accounts?page=1", + "label":"1", + "active":true + }, + { + "url":"None", + "label":"Next", + "active":false + } + ], + "path":"https://someakaunting-url/api/accounts", + "per_page":100, + "to":1, + "total":1 + } + } \ No newline at end of file diff --git a/data/v3/GetAccountsSearchNotFound.json b/data/v3/GetAccountsSearchNotFound.json new file mode 100644 index 0000000..0c2b83f --- /dev/null +++ b/data/v3/GetAccountsSearchNotFound.json @@ -0,0 +1,13 @@ +{ + "data":[], + "meta":{ + "total":0, + "count":0, + "per_page":100, + "current_page":0, + "total_pages":0, + "links":{ + + } + } +} diff --git a/setup.py b/setup.py index cfd5656..6d29fe3 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ with open('README.md', 'r') as readme: setup( - name='akauntingpy', + name='akaunting-py', use_scm_version=True, author='CyberCinch', description='Python interface to the Akaunting API.', @@ -16,6 +16,7 @@ setup( long_description=long_description, long_description_content_type='text/markdown', license='MIT', + version='1.0.5', keywords='akaunting api library', packages=find_packages(), install_requires=[