refactor a little

This commit is contained in:
2022-05-27 23:11:18 +12:00
parent 88f161082d
commit d57798a9c0
2 changed files with 61 additions and 64 deletions

View File

@@ -39,8 +39,7 @@ class Client(object):
self.currency_rate = currency_rate self.currency_rate = currency_rate
def call(self, method="get", endpoint=None, def call(self, method="get", endpoint=None,
**params) -> dict(): **params) -> dict:
response = None
response = requests.request(method=method, response = requests.request(method=method,
url=self.url + "/" + endpoint, url=self.url + "/" + endpoint,
@@ -84,7 +83,7 @@ class Client(object):
return data['data'] return data['data']
def create_transaction(self, def create_transaction(self,
type='income', # Payment method type transaction_type='income', # Payment method type
account_id=None, # Account ID to assign account_id=None, # Account ID to assign
category_id=None, # Category ID to assign category_id=None, # Category ID to assign
contact_id=None, # Contact ID/Client to assign contact_id=None, # Contact ID/Client to assign
@@ -107,8 +106,8 @@ class Client(object):
data = self.call(endpoint="transactions", data = self.call(endpoint="transactions",
method="POST", method="POST",
search="type:" + type, search="type:" + transaction_type,
type=type, type=transaction_type,
account_id=account_id, account_id=account_id,
category_id=category_id, category_id=category_id,
paid_at=paid_at, paid_at=paid_at,

View File

@@ -1,12 +1,12 @@
import sys import sys
from this import d
sys.path.insert(1, '.') sys.path.insert(1, '.')
import pytest from helpers import RetrieveJSONFromFile
import akauntingpy import akauntingpy
from akauntingpy.exceptions import * from akauntingpy.exceptions import *
from helpers import RetrieveJSONFromFile import pytest
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
class TestAPI: class TestAPI:
@pytest.fixture() @pytest.fixture()
def setUp(self): def setUp(self):
@@ -45,7 +45,6 @@ class TestAPI:
json=RetrieveJSONFromFile("data/pingFailure.json"), json=RetrieveJSONFromFile("data/pingFailure.json"),
status_code=401) status_code=401)
with pytest.raises(MissingPermission, match="Invalid credentials."): with pytest.raises(MissingPermission, match="Invalid credentials."):
data = c.ping() data = c.ping()
assert data['status_code'] == 401 assert data['status_code'] == 401
@@ -69,7 +68,7 @@ class TestAPI:
data = c.get_accounts(search="number:arandomvalue") data = c.get_accounts(search="number:arandomvalue")
def test_create_transaction_income_success(self, setUp, requests_mock, def test_create_transaction_income_success(self, setUp, requests_mock,
type='income', # Payment method type transaction_type='income', # Payment method type
account_id=2, # Account ID to assign account_id=2, # Account ID to assign
category_id=3, # Category ID to assign category_id=3, # Category ID to assign
contact_id=None, # Contact ID/Client to assign contact_id=None, # Contact ID/Client to assign
@@ -84,7 +83,7 @@ class TestAPI:
requests_mock.post(c.url + "/transactions", requests_mock.post(c.url + "/transactions",
json=RetrieveJSONFromFile("data/CreateTransactionIncomeSuccess.json"), json=RetrieveJSONFromFile("data/CreateTransactionIncomeSuccess.json"),
status_code=201) status_code=201)
data = c.create_transaction(type=type, data = c.create_transaction(transaction_type=transaction_type,
account_id=account_id, account_id=account_id,
category_id=category_id, category_id=category_id,
paid_at=paid_at, paid_at=paid_at,
@@ -122,7 +121,7 @@ class TestAPI:
requests_mock.post(c.url + "/transactions", requests_mock.post(c.url + "/transactions",
json=RetrieveJSONFromFile("data/CreateTransactionExpenseSuccess.json"), json=RetrieveJSONFromFile("data/CreateTransactionExpenseSuccess.json"),
status_code=201) status_code=201)
data = c.create_transaction(type="expense", data = c.create_transaction(transaction_type="expense",
amount=100.00, amount=100.00,
account_id=3, account_id=3,
paid_at="2022-05-16", paid_at="2022-05-16",
@@ -132,4 +131,3 @@ class TestAPI:
category_id="4", category_id="4",
description="Some expenditures" description="Some expenditures"
) )