Skip to content

Commit 691fb21

Browse files
rikterbeekrikterbeek
authored
Merge pull request #94 from Adyen/feature/PW-1184
[PW-1184] Add codeowers file for GitHub, remove valdiation and fixing failed te…
2 parents e85425f + 73926ab commit 691fb21

File tree

5 files changed

+117
-234
lines changed

5 files changed

+117
-234
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @Aleffio @AlexandrosMor @martinsrenato @KadoBOT @rikterbeek

‎Adyen/services.py‎

Lines changed: 104 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import datetime
44

55
from Adyen import AdyenClient
6-
from . import validation
76

87

98
class AdyenBase(object):
@@ -49,21 +48,19 @@ def list_recurring_details(self, request="", **kwargs):
4948

5049
action = "listRecurringDetails"
5150

52-
if validation.check_in(request, action):
53-
return self.client.call_api(request, self.service,
54-
action, **kwargs)
51+
return self.client.call_api(request, self.service,
52+
action, **kwargs)
5553

5654
def disable(self, request="", **kwargs):
5755

5856
action = "disable"
5957

60-
if validation.check_in(request, action):
61-
if 'recurringDetailReference' not in request:
62-
raise ValueError("Include a 'recurringDetailReference'"
63-
" to disable a specific recurring contract.")
64-
else:
65-
return self.client.call_api(request, self.service,
66-
action, **kwargs)
58+
if 'recurringDetailReference' not in request:
59+
raise ValueError("Include a 'recurringDetailReference'"
60+
" to disable a specific recurring contract.")
61+
else:
62+
return self.client.call_api(request, self.service,
63+
action, **kwargs)
6764

6865

6966
class AdyenHPP(AdyenServiceBase):
@@ -86,17 +83,16 @@ def directory_lookup(self, request="", **kwargs):
8683

8784
action = "directory"
8885

89-
if validation.check_in(request, action):
90-
try:
91-
datetime.datetime.strptime(request['sessionValidity'],
92-
'%Y-%m-%dT%H:%M:%SZ')
93-
except ValueError:
94-
raise ValueError(
95-
"Incorrect date format, should be Y-m-dH:M:SZ,"
96-
" use datetime.strftime('%Y-%m-%dT%H:%M:%SZ')"
97-
" to format a datetime object.")
86+
try:
87+
datetime.datetime.strptime(request['sessionValidity'],
88+
'%Y-%m-%dT%H:%M:%SZ')
89+
except ValueError:
90+
raise ValueError(
91+
"Incorrect date format, should be Y-m-dH:M:SZ,"
92+
" use datetime.strftime('%Y-%m-%dT%H:%M:%SZ')"
93+
" to format a datetime object.")
9894

99-
return self.client.call_hpp(request, action)
95+
return self.client.call_hpp(request, action)
10096

10197
def hpp_payment(self, request="", skip_details=None, **kwargs):
10298

@@ -105,27 +101,25 @@ def hpp_payment(self, request="", skip_details=None, **kwargs):
105101
else:
106102
action = "select"
107103

108-
if validation.check_in(request, action):
109-
110-
if action == "skipDetails":
111-
if "issuerId" not in request:
112-
request['issuerId'] = ""
113-
if type(request['sessionValidity']) is not str:
114-
raise TypeError(
115-
'HPP: sessionValidity must be type of str,'
116-
' use datetime.strftime to convert and format.')
117-
if all(k in request for k in ("shopperEmail", "shopperReference",
118-
"recurringContract")):
119-
recc = request['recurringContract']
120-
if recc != 'ONECLICK' and recc != 'RECURRING' \
121-
and recc != 'ONECLICK,RECURRING':
122-
raise ValueError(
123-
"HPP: recurringContract must be on of the following"
124-
" values: 'ONECLICK', 'RECURRING',"
125-
" 'ONECLICK,RECURRING'")
126-
127-
result = self.client.hpp_payment(request, action)
128-
return result
104+
if action == "skipDetails":
105+
if "issuerId" not in request:
106+
request['issuerId'] = ""
107+
if type(request['sessionValidity']) is not str:
108+
raise TypeError(
109+
'HPP: sessionValidity must be type of str,'
110+
' use datetime.strftime to convert and format.')
111+
if all(k in request for k in ("shopperEmail", "shopperReference",
112+
"recurringContract")):
113+
recc = request['recurringContract']
114+
if recc != 'ONECLICK' and recc != 'RECURRING' \
115+
and recc != 'ONECLICK,RECURRING':
116+
raise ValueError(
117+
"HPP: recurringContract must be on of the following"
118+
" values: 'ONECLICK', 'RECURRING',"
119+
" 'ONECLICK,RECURRING'")
120+
121+
result = self.client.hpp_payment(request, action)
122+
return result
129123

130124

131125
class AdyenPayment(AdyenServiceBase):
@@ -156,77 +150,71 @@ def authorise(self, request="", **kwargs):
156150

157151
action = "authorise"
158152

159-
if validation.check_in(request, action):
160-
if 'shopperEmail' in request:
161-
if request['shopperEmail'] == '':
162-
raise ValueError(
163-
'shopperEmail must contain the shopper email'
164-
' when authorising recurring contracts.')
165-
if 'shopperReference' in request:
166-
if request['shopperReference'] == '':
167-
raise ValueError(
168-
'shopperReference must contain the shopper'
169-
' name when authorising recurring contracts.')
153+
if 'shopperEmail' in request:
154+
if request['shopperEmail'] == '':
155+
raise ValueError(
156+
'shopperEmail must contain the shopper email'
157+
' when authorising recurring contracts.')
158+
if 'shopperReference' in request:
159+
if request['shopperReference'] == '':
160+
raise ValueError(
161+
'shopperReference must contain the shopper'
162+
' name when authorising recurring contracts.')
170163

171-
return self.client.call_api(request, self.service,
172-
action, **kwargs)
164+
return self.client.call_api(request, self.service,
165+
action, **kwargs)
173166

174167
def authorise3d(self, request="", **kwargs):
175168
action = "authorise3d"
176169

177-
if validation.check_in(request, action):
178-
return self.client.call_api(request, self.service,
179-
action, **kwargs)
170+
return self.client.call_api(request, self.service,
171+
action, **kwargs)
180172

181173
def cancel(self, request="", **kwargs):
182174
action = "cancel"
183175

184-
if validation.check_in(request, action):
185-
return self.client.call_api(request, self.service,
186-
action, **kwargs)
176+
return self.client.call_api(request, self.service,
177+
action, **kwargs)
187178

188179
def capture(self, request="", **kwargs):
189180

190181
action = "capture"
191182

192-
if validation.check_in(request, action):
193-
if request['modificationAmount']["value"] == "" or \
194-
request['modificationAmount']['value'] == "0":
195-
raise ValueError(
196-
"Set the 'modificationAmount' to the original transaction"
197-
" amount, or less for a partial capture. "
198-
"modificationAmount should be an object with the following"
199-
" keys: {'currency':,'value':}")
200-
if request['originalReference'] == "":
201-
raise ValueError("Set the 'originalReference' to the psp "
202-
"reference of the transaction to be modified")
203-
204-
response = self.client.call_api(request, self.service,
205-
action, **kwargs)
206-
return response
183+
if request['modificationAmount']["value"] == "" or \
184+
request['modificationAmount']['value'] == "0":
185+
raise ValueError(
186+
"Set the 'modificationAmount' to the original transaction"
187+
" amount, or less for a partial capture. "
188+
"modificationAmount should be an object with the following"
189+
" keys: {'currency':,'value':}")
190+
if request['originalReference'] == "":
191+
raise ValueError("Set the 'originalReference' to the psp "
192+
"reference of the transaction to be modified")
193+
194+
response = self.client.call_api(request, self.service,
195+
action, **kwargs)
196+
return response
207197

208198
def refund(self, request="", **kwargs):
209199

210200
action = "refund"
211201

212-
if validation.check_in(request, action):
213-
if request['modificationAmount']['value'] == "" or \
214-
request['modificationAmount']['value'] == "0":
215-
raise ValueError(
216-
"To refund this payment, provide the original value. "
217-
"Set the value to less than the original amount, "
218-
"to partially refund this payment.")
219-
else:
220-
return self.client.call_api(request, self.service,
221-
action, **kwargs)
202+
if request['modificationAmount']['value'] == "" or \
203+
request['modificationAmount']['value'] == "0":
204+
raise ValueError(
205+
"To refund this payment, provide the original value. "
206+
"Set the value to less than the original amount, "
207+
"to partially refund this payment.")
208+
else:
209+
return self.client.call_api(request, self.service,
210+
action, **kwargs)
222211

223212
def cancel_or_refund(self, request="", **kwargs):
224213
action = "cancelOrRefund"
225214

226-
if validation.check_in(request, action):
227-
return self.client.call_api(
228-
request, self.service, action, **kwargs
229-
)
215+
return self.client.call_api(
216+
request, self.service, action, **kwargs
217+
)
230218

231219

232220
class AdyenThirdPartyPayout(AdyenServiceBase):
@@ -247,38 +235,33 @@ def __init__(self, client=None):
247235

248236
def confirm(self, request=None, **kwargs):
249237
action = "confirmThirdParty"
250-
if validation.check_in(request, action):
251-
return self.client.call_api(
252-
request, self.service, action, **kwargs
253-
)
238+
return self.client.call_api(
239+
request, self.service, action, **kwargs
240+
)
254241

255242
def decline(self, request=None, **kwargs):
256243
action = "declineThirdParty"
257-
if validation.check_in(request, action):
258-
return self.client.call_api(
259-
request, self.service, action, **kwargs
260-
)
244+
return self.client.call_api(
245+
request, self.service, action, **kwargs
246+
)
261247

262248
def store_detail(self, request=None, **kwargs):
263249
action = "storeDetail"
264-
if validation.check_in(request, action):
265-
return self.client.call_api(
266-
request, self.service, action, **kwargs
267-
)
250+
return self.client.call_api(
251+
request, self.service, action, **kwargs
252+
)
268253

269254
def submit(self, request=None, **kwargs):
270255
action = "submitThirdParty"
271-
if validation.check_in(request, action):
272-
return self.client.call_api(
273-
request, self.service, action, **kwargs
274-
)
256+
return self.client.call_api(
257+
request, self.service, action, **kwargs
258+
)
275259

276260
def store_detail_and_submit(self, request=None, **kwargs):
277261
action = "storeDetailAndSubmitThirdParty"
278-
if validation.check_in(request, action):
279-
return self.client.call_api(
280-
request, self.service, action, **kwargs
281-
)
262+
return self.client.call_api(
263+
request, self.service, action, **kwargs
264+
)
282265

283266

284267
class AdyenCheckoutApi(AdyenServiceBase):
@@ -305,36 +288,30 @@ def __init__(self, client=""):
305288

306289
def payment_methods(self, request="", **kwargs):
307290
action = "paymentMethods"
308-
if validation.check_in(request, action):
309-
if 'merchantAccount' in request:
310-
if request['merchantAccount'] == '':
311-
raise ValueError(
312-
'merchantAccount must contain the merchant account'
313-
' when retrieving payment methods.')
291+
if 'merchantAccount' in request:
292+
if request['merchantAccount'] == '':
293+
raise ValueError(
294+
'merchantAccount must contain the merchant account'
295+
' when retrieving payment methods.')
314296

315-
return self.client.call_checkout_api(request, action, **kwargs)
297+
return self.client.call_checkout_api(request, action, **kwargs)
316298

317299
def payments(self, request="", **kwargs):
318300
action = "payments"
319-
if validation.check_in(request, action):
320-
return self.client.call_checkout_api(request, action, **kwargs)
301+
return self.client.call_checkout_api(request, action, **kwargs)
321302

322303
def payments_details(self, request="", **kwargs):
323304
action = "paymentsDetails"
324-
if validation.check_in(request, action):
325-
return self.client.call_checkout_api(request, action, **kwargs)
305+
return self.client.call_checkout_api(request, action, **kwargs)
326306

327307
def payment_session(self, request="", **kwargs):
328308
action = "paymentSession"
329-
if validation.check_in(request, action):
330-
return self.client.call_checkout_api(request, action, **kwargs)
309+
return self.client.call_checkout_api(request, action, **kwargs)
331310

332311
def payment_result(self, request="", **kwargs):
333312
action = "paymentsResult"
334-
if validation.check_in(request, action):
335-
return self.client.call_checkout_api(request, action, **kwargs)
313+
return self.client.call_checkout_api(request, action, **kwargs)
336314

337315
def origin_keys(self, request="", **kwargs):
338316
action = "originKeys"
339-
if validation.check_in(request, action):
340-
return self.client.call_checkout_api(request, action, **kwargs)
317+
return self.client.call_checkout_api(request, action, **kwargs)

0 commit comments

Comments
 (0)