Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
- idempotency_key_is_present
- added post_create function
for create requests with idempotency_key
- backoff_idempotency_key_handler
  • Loading branch information
axshani committed Sep 8, 2022
commit f3a73443f7f44768e93d728c67d9b70a9d35082f
2 changes: 1 addition & 1 deletion unit/api/account_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreateDepositAccountRequest) -> Union[UnitResponse[AccountDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[AccountDTO](DtoDecoder.decode(data), None)
Expand Down
2 changes: 1 addition & 1 deletion unit/api/application_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: Union[CreateIndividualApplicationRequest, CreateBusinessApplicationRequest]) -> Union[UnitResponse[ApplicationDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)

if response.ok:
data = response.json().get("data")
Expand Down
22 changes: 17 additions & 5 deletions unit/api/base_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
retries = 0


def backoff_idempotency_key_handler(e):
return backoff_handler(e) and idempotency_key_is_present(e)


def backoff_handler(e):
code = e.status_code
status = is_timeout(code) or is_rete_limit(code) or is_server_error(code)
return status and idempotency_key_is_not_present(e)
return is_timeout(code) or is_rete_limit(code) or is_server_error(code)


def is_timeout(code):
Expand All @@ -25,12 +28,12 @@ def is_server_error(code):
return 500 <= code <= 599


def idempotency_key_is_not_present(e):
def idempotency_key_is_present(e):
body = json.loads(e.request.body)
if body is None:
return True
return False

return body["data"]["attributes"].get("idempotencyKey") is None
return body["data"]["attributes"].get("idempotencyKey") is not None


class BaseResource(object):
Expand Down Expand Up @@ -58,6 +61,15 @@ def get(self, resource: str, params: Dict = None, headers: Optional[Dict[str, st
max_tries=retries,
jitter=backoff.random_jitter)
def post(self, resource: str, data: Optional[Dict] = None, headers: Optional[Dict[str, str]] = None):
data = json.dumps(data, cls=UnitEncoder) if data is not None else None
return requests.post(f"{self.api_url}/{resource}", data=data, headers=self.__merge_headers(headers))\


@backoff.on_predicate(backoff.expo,
backoff_idempotency_key_handler,
max_tries=retries,
jitter=backoff.random_jitter)
def post_create(self, resource: str, data: Optional[Dict] = None, headers: Optional[Dict[str, str]] = None):
data = json.dumps(data, cls=UnitEncoder) if data is not None else None
return requests.post(f"{self.api_url}/{resource}", data=data, headers=self.__merge_headers(headers))

Expand Down
2 changes: 1 addition & 1 deletion unit/api/card_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreateCardRequest) -> Union[UnitResponse[Card], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[Card](DtoDecoder.decode(data), None)
Expand Down
2 changes: 1 addition & 1 deletion unit/api/checkDeposit_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreateCheckDepositRequest) -> Union[UnitResponse[CheckDepositDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[CheckDepositDTO](DtoDecoder.decode(data), None)
Expand Down
2 changes: 1 addition & 1 deletion unit/api/counterparty_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: Union[CreateCounterpartyRequest, CreateCounterpartyWithTokenRequest]) -> Union[UnitResponse[CounterpartyDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[CounterpartyDTO](DtoDecoder.decode(data), None)
Expand Down
1 change: 0 additions & 1 deletion unit/api/customer_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ def update(self, request: Union[PatchIndividualCustomerRequest, PatchBusinessCus
else:
return UnitError.from_json_api(response.json())


def get(self, customer_id: str) -> Union[UnitResponse[CustomerDTO], UnitError]:
response = super().get(f"{self.resource}/{customer_id}")
if response.status_code == 200:
Expand Down
2 changes: 1 addition & 1 deletion unit/api/fee_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreateFeeRequest) -> Union[UnitResponse[FeeDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[FeeDTO](DtoDecoder.decode(data), None)
Expand Down
2 changes: 1 addition & 1 deletion unit/api/payment_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreatePaymentRequest) -> Union[UnitResponse[PaymentDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[PaymentDTO](DtoDecoder.decode(data), None)
Expand Down
2 changes: 1 addition & 1 deletion unit/api/reward_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def __init__(self, api_url, token, retries):

def create(self, request: CreateRewardRequest) -> Union[UnitResponse[RewardDTO], UnitError]:
payload = request.to_json_api()
response = super().post(self.resource, payload)
response = super().post_create(self.resource, payload)
if super().is_20x(response.status_code):
data = response.json().get("data")
return UnitResponse[RewardDTO](DtoDecoder.decode(data), None)
Expand Down