Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for tests

This commit is contained in:
David Bomba 2024-11-03 19:13:58 +11:00
parent 535ce66339
commit de1c7fdc0e
2 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/Http/Requests/EInvoice/UpdateEInvoiceConfiguration.php
View File

@ -38,48 +38,54 @@ class UpdateEInvoiceConfiguration extends Request
public function rules() public function rules()
{ {
return [
return [
'entity' => 'required|bail|in:invoice,client,company', 'entity' => 'required|bail|in:invoice,client,company',
'payment_means' => 'sometimes|bail|array', 'payment_means' => 'sometimes|bail|array',
'payment_means.*.code' => ['required_with:payment_means', 'bail', Rule::in(PaymentMeans::getPaymentMeansCodelist())], 'payment_means.*.code' => ['required_with:payment_means', 'bail', Rule::in(PaymentMeans::getPaymentMeansCodelist())],
'payment_means.*.bic_swift' => ['bail', 'payment_means.*.bic_swift' => Rule::forEach(function (string|null $value, string $attribute) {
Rule::requiredIf(function () { $index = explode('.', $attribute)[1];
$code = $this->input('payment_means.code'); $code = $this->input("payment_means.{$index}.code");
$requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? []; $requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? [];
return in_array('bic_swift', $requirements);
return ['bail', Rule::requiredIf(in_array('bic_swift', $requirements))];
}), }),
], 'payment_means.*.iban' => Rule::forEach(function (string|null $value, string $attribute) {
'payment_means.*.iban' => ['bail', 'sometimes', 'string', 'min:15', 'max:34', $index = explode('.', $attribute)[1];
Rule::requiredIf(function () { $code = $this->input("payment_means.{$index}.code");
$code = $this->input('payment_means.code');
$requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? []; $requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? [];
return in_array('iban', $requirements);
return ['bail', 'sometimes', 'string', 'min:15', 'max:34',
Rule::requiredIf(in_array('iban', $requirements))];
}), }),
], 'payment_means.*.account_holder' => Rule::forEach(function (string|null $value, string $attribute) {
'payment_means.*.account_holder' => ['bail', 'sometimes', 'string', 'max:255', $index = explode('.', $attribute)[1];
Rule::requiredIf(function () { $code = $this->input("payment_means.{$index}.code");
$code = $this->input('payment_means.code');
$requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? []; $requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? [];
return in_array('account_holder', $requirements);
return ['bail', 'sometimes', 'string', 'max:255',
Rule::requiredIf(in_array('account_holder', $requirements))];
}), }),
],
'payment_means.*.information' => ['bail', 'sometimes', 'nullable', 'string'], 'payment_means.*.information' => ['bail', 'sometimes', 'nullable', 'string'],
'payment_means.*.card_type' => ['bail', 'sometimes', 'nullable', 'string', 'min:4', 'payment_means.*.card_type' => Rule::forEach(function (string|null $value, string $attribute) {
Rule::requiredIf(function () { $index = explode('.', $attribute)[1];
$code = $this->input('payment_means.code'); $code = $this->input("payment_means.{$index}.code");
$requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? []; $requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? [];
return in_array('card_type', $requirements);
return ['bail', 'sometimes', 'nullable', 'string', 'min:4',
Rule::requiredIf(in_array('card_type', $requirements))];
}), }),
], 'payment_means.*.card_holder' => Rule::forEach(function (string|null $value, string $attribute) {
'payment_means.*.card_holder' => ['bail', 'sometimes', 'nullable', 'string', 'min:4', $index = explode('.', $attribute)[1];
Rule::requiredIf(function () { $code = $this->input("payment_means.{$index}.code");
$code = $this->input('payment_means.code');
$requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? []; $requirements = PaymentMeans::$payment_means_requirements_codes[$code] ?? [];
return in_array('card_holder', $requirements);
return ['bail', 'sometimes', 'nullable', 'string', 'min:4',
Rule::requiredIf(in_array('card_holder', $requirements))];
}), }),
],
]; ];
} }
public function prepareForValidation() public function prepareForValidation()

44
tests/Feature/EInvoice/RequestValidation/UpdateEInvoiceConfigurationTest.php
View File

@ -50,9 +50,9 @@ class UpdateEInvoiceConfigurationTest extends TestCase
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => 'invalidcodehere' 'code' => 'invalidcodehere'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
@ -65,12 +65,12 @@ class UpdateEInvoiceConfigurationTest extends TestCase
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '30', 'code' => '30',
'iban' => '12345678', 'iban' => '123456789101112254',
'bic_swift' => 'DEUTDEFF', 'bic_swift' => 'DEUTDEFF',
'account_holder' => 'John Doe Company Limited' 'account_holder' => 'John Doe Company Limited'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
@ -83,29 +83,29 @@ class UpdateEInvoiceConfigurationTest extends TestCase
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '48', 'code' => '48',
'card_type' => 'VISA', 'card_type' => 'VISA',
'iban' => '12345678' 'iban' => '12345678'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
$validator = Validator::make($data, $this->request->rules()); $validator = Validator::make($data, $this->request->rules());
$this->assertTrue($validator->passes()); $this->assertFalse($validator->passes());
} }
public function testValidatesPaymentMeansForCreditCard() public function testValidatesPaymentMeansForCreditCard()
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '54', 'code' => '54',
'card_type' => 'VISA', 'card_type' => 'VISA',
'card_number' => '************1234', 'card_number' => '************1234',
'card_holder' => 'John Doe' 'card_holder' => 'John Doe'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
@ -118,44 +118,44 @@ class UpdateEInvoiceConfigurationTest extends TestCase
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '30', 'code' => '30',
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
$validator = Validator::make($data, $this->request->rules()); $validator = Validator::make($data, $this->request->rules());
$this->assertFalse($validator->passes()); $this->assertFalse($validator->passes());
$this->assertTrue($validator->errors()->has('payment_means.iban'));
$this->assertTrue($validator->errors()->has('payment_means.bic_swift')); $this->assertTrue($validator->errors()->has('payment_means.0.bic_swift'));
} }
public function testFailsValidationWithInvalidPaymentMeansCode() public function testFailsValidationWithInvalidPaymentMeansCode()
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '999', 'code' => '999',
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
$validator = Validator::make($data, $this->request->rules()); $validator = Validator::make($data, $this->request->rules());
$this->assertFalse($validator->passes()); $this->assertFalse($validator->passes());
$this->assertTrue($validator->errors()->has('payment_means.code')); $this->assertTrue($validator->errors()->has('payment_means.0.code'));
} }
public function testValidatesPaymentMeansForDirectDebit() public function testValidatesPaymentMeansForDirectDebit()
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '49', 'code' => '49',
'payer_bank_account' => '12345678', 'payer_bank_account' => '12345678',
'bic_swift' => 'DEUTDEFF' 'bic_swift' => 'DEUTDEFF'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);
@ -168,11 +168,11 @@ class UpdateEInvoiceConfigurationTest extends TestCase
{ {
$data = [ $data = [
'entity' => 'invoice', 'entity' => 'invoice',
'payment_means' => [ 'payment_means' => [[
'code' => '15', 'code' => '15',
'account_holder' => 'John Doe Company Limited', 'account_holder' => 'John Doe Company Limited',
'bsb_sort' => '123456' 'bsb_sort' => '123456'
] ]]
]; ];
$this->request->initialize($data); $this->request->initialize($data);