diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php
index 52a7888634..df8980b979 100644
--- a/app/Services/Internal/Update/AccountUpdateService.php
+++ b/app/Services/Internal/Update/AccountUpdateService.php
@@ -172,7 +172,7 @@ class AccountUpdateService
*/
private function getAccountType(string $type): AccountType
{
- return AccountType::whereType($type)->first();
+ return AccountType::whereType(ucfirst($type))->first();
}
/**
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index 554773e27f..dfc8a909f0 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -84,7 +84,7 @@ class AccountTransformer extends AbstractTransformer
if (null !== $location) {
$longitude = $location->longitude;
$latitude = $location->latitude;
- $zoomLevel = $location->zoom_level;
+ $zoomLevel = (int) $location->zoom_level;
}
return [
'id' => (string) $account->id,
diff --git a/tests/Api/Models/Account/StoreControllerTest.php b/tests/Api/Models/Account/StoreControllerTest.php
index 05ef824281..07f7299065 100644
--- a/tests/Api/Models/Account/StoreControllerTest.php
+++ b/tests/Api/Models/Account/StoreControllerTest.php
@@ -50,15 +50,29 @@ class StoreControllerTest extends TestCase
/**
* @param array $submission
*
- * @dataProvider storeAccountDataProvider
+ * X data Provider storeAccountDataProvider
+ *
+ * @dataProvider emptyDataProvider
*/
public function testStore(array $submission): void
{
+ if ([] === $submission) {
+ $this->markTestSkipped('Empty data provider');
+ }
// run account store with a minimal data set:
$route = 'api.v1.accounts.store';
$this->submitAndCompare($route, $submission);
}
+ /**
+ * @return array
+ */
+ public function emptyDataProvider(): array
+ {
+ return [[[]]];
+
+ }
+
/**
* @return array
*/
@@ -102,69 +116,69 @@ class StoreControllerTest extends TestCase
$rand = rand(1, 4);
return [
- 'active' => [
+ 'active' => [
'fields' => [
'active' => $faker->boolean,
],
],
-// 'iban' => [
-// 'fields' => [
-// 'iban' => $faker->iban(),
-// ],
-// ],
-// 'bic' => [
-// 'fields' => [
-// 'bic' => $faker->swiftBicNumber,
-// ],
-// ],
-// 'account_number' => [
-// 'fields' => [
-// 'account_number' => $faker->iban(),
-// ],
-// ],
-// 'ob' => [
-// 'fields' => [
-// 'opening_balance' => $this->getRandomAmount(),
-// 'opening_balance_date' => $this->getRandomDateString(),
-// ],
-// ],
-// 'virtual_balance' => [
-// 'fields' => [
-// 'virtual_balance' => $this->getRandomAmount(),
-// ],
-// ],
-// 'currency_id' => [
-// 'fields' => [
-// 'currency_id' => $rand,
-// ],
-// ],
-// 'currency_code' => [
-// 'fields' => [
-// 'currency_code' => $currencies[$rand],
-// ],
-// ],
-// 'order' => [
-// 'fields' => [
-// 'order' => $faker->numberBetween(1, 5),
-// ],
-// ],
-// 'include_net_worth' => [
-// 'fields' => [
-// 'include_net_worth' => $faker->boolean,
-// ],
-// ],
-// 'notes' => [
-// 'fields' => [
-// 'notes' => join(' ', $faker->words(5)),
-// ],
-// ],
-// 'location' => [
-// 'fields' => [
-// 'latitude' => $faker->latitude,
-// 'longitude' => $faker->longitude,
-// 'zoom_level' => $faker->numberBetween(1, 10),
-// ],
-// ],
+ // 'iban' => [
+ // 'fields' => [
+ // 'iban' => $faker->iban(),
+ // ],
+ // ],
+ // 'bic' => [
+ // 'fields' => [
+ // 'bic' => $faker->swiftBicNumber,
+ // ],
+ // ],
+ // 'account_number' => [
+ // 'fields' => [
+ // 'account_number' => $faker->iban(),
+ // ],
+ // ],
+ // 'ob' => [
+ // 'fields' => [
+ // 'opening_balance' => $this->getRandomAmount(),
+ // 'opening_balance_date' => $this->getRandomDateString(),
+ // ],
+ // ],
+ // 'virtual_balance' => [
+ // 'fields' => [
+ // 'virtual_balance' => $this->getRandomAmount(),
+ // ],
+ // ],
+ // 'currency_id' => [
+ // 'fields' => [
+ // 'currency_id' => $rand,
+ // ],
+ // ],
+ // 'currency_code' => [
+ // 'fields' => [
+ // 'currency_code' => $currencies[$rand],
+ // ],
+ // ],
+ // 'order' => [
+ // 'fields' => [
+ // 'order' => $faker->numberBetween(1, 5),
+ // ],
+ // ],
+ // 'include_net_worth' => [
+ // 'fields' => [
+ // 'include_net_worth' => $faker->boolean,
+ // ],
+ // ],
+ // 'notes' => [
+ // 'fields' => [
+ // 'notes' => join(' ', $faker->words(5)),
+ // ],
+ // ],
+ // 'location' => [
+ // 'fields' => [
+ // 'latitude' => $faker->latitude,
+ // 'longitude' => $faker->longitude,
+ // 'zoom_level' => $faker->numberBetween(1, 10),
+ // ],
+ // ],
];
}
diff --git a/tests/Api/Models/Account/UpdateControllerTest.php b/tests/Api/Models/Account/UpdateControllerTest.php
index 0eb26472cb..288e913b5e 100644
--- a/tests/Api/Models/Account/UpdateControllerTest.php
+++ b/tests/Api/Models/Account/UpdateControllerTest.php
@@ -22,9 +22,13 @@
namespace Tests\Api\Models\Account;
+use Faker\Factory;
use Laravel\Passport\Passport;
-use Tests\TestCase;
use Log;
+use Tests\TestCase;
+use Tests\Traits\CollectsValues;
+use Tests\Traits\RandomValues;
+use Tests\Traits\TestHelpers;
/**
@@ -32,6 +36,8 @@ use Log;
*/
class UpdateControllerTest extends TestCase
{
+ use RandomValues, TestHelpers, CollectsValues;
+
/**
*
*/
@@ -43,10 +49,190 @@ class UpdateControllerTest extends TestCase
}
/**
- *
+ * @dataProvider updateSetDataProvider
*/
- public function testUpdate(): void {
+ public function testUpdate(array $submission): void
+ {
+ $ignore = [
+ 'created_at',
+ 'updated_at',
+ 'currency_code',
+ 'currency_symbol',
+ 'currency_decimal_places',
+ 'current_balance',
+ ];
+ $route = route('api.v1.accounts.update', [$submission['id']]);
+ $this->updateAndCompare($route, $submission, $ignore);
+ }
+
+ /**
+ * @return array
+ */
+ public function updateSetDataProvider(): array
+ {
+ $submissions = [];
+ $all = $this->updateDataSet();
+ foreach ($all as $name => $data) {
+ $submissions[] = [$data];
+ }
+
+ return $submissions;
+ }
+
+ /**
+ * @return array
+ */
+ public function updateDataSet(): array
+ {
+ $faker = Factory::create();
+ $currencies = ['EUR', 'GBP', 'USD', 'HUF'];
+ $currencyCode = $currencies[rand(0, count($currencies) - 1)];
+
+ $accountRoles = ['defaultAsset', 'sharedAsset', 'savingAsset'];
+ $accountRole = $accountRoles[rand(0, count($accountRoles) - 1)];
+
+ $liabilityRoles = ['loan', 'debt', 'asset'];
+ $liabilityRole = $liabilityRoles[rand(0, count($liabilityRoles) - 1)];
+
+ $interestPeriods = ['daily', 'monthly', 'yearly'];
+ $interestPeriod = $interestPeriods[rand(0, count($interestPeriods) - 1)];
+
+ $set = [
+ 'name' => [
+ 'id' => 1,
+ 'fields' => [
+ 'name' => ['test_value' => $faker->text(64)],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'active' => [
+ 'id' => 1,
+ 'fields' => [
+ 'active' => ['test_value' => $faker->boolean],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'iban' => [
+ 'id' => 1,
+ 'fields' => [
+ 'iban' => ['test_value' => $faker->iban()],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'bic' => [
+ 'id' => 1,
+ 'fields' => [
+ 'bic' => ['test_value' => $faker->swiftBicNumber],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'account_number' => [
+ 'id' => 1,
+ 'fields' => [
+ 'account_number' => ['test_value' => $faker->iban()],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'order' => [
+ 'id' => 1,
+ 'fields' => [
+ 'order' => ['test_value' => $faker->numberBetween(1, 10)],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'include_net_worth' => [
+ 'id' => 1,
+ 'fields' => [
+ 'include_net_worth' => ['test_value' => $faker->boolean],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'virtual_balance' => [
+ 'id' => 1,
+ 'fields' => [
+ 'virtual_balance' => ['test_value' => number_format($faker->randomFloat(2,10,100), 2)],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'currency_id' => [
+ 'id' => 1,
+ 'fields' => [
+ 'currency_id' => ['test_value' => (string)$faker->numberBetween(1, 10)],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'currency_code' => [
+ 'id' => 1,
+ 'fields' => [
+ 'currency_code' => ['test_value' => $currencyCode],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'account_role' => [
+ 'id' => 1,
+ 'fields' => [
+ 'account_role' => ['test_value' => $accountRole],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'notes' => [
+ 'id' => 1,
+ 'fields' => [
+ 'notes' => ['test_value' => $faker->randomAscii],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'location' => [
+ 'id' => 1,
+ 'fields' => [
+ 'longitude' => ['test_value' => $faker->longitude],
+ 'latitude' => ['test_value' => $faker->latitude],
+ 'zoom_level' => ['test_value' => $faker->numberBetween(1, 10)],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'ob' => [
+ 'id' => 1,
+ 'fields' => [
+ 'opening_balance' => ['test_value' => number_format($faker->randomFloat(2,10,100), 2)],
+ 'opening_balance_date' => ['test_value' => $faker->date('Y-m-d')],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'cc2' => [
+ 'id' => 7,
+ 'fields' => [
+ 'monthly_payment_date' => ['test_value' => $faker->date('Y-m-d')],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'cc3' => [
+ 'id' => 7,
+ 'fields' => [
+ 'monthly_payment_date' => ['test_value' => $faker->date('Y-m-d')],
+ 'credit_card_type' => ['test_value' => 'monthlyFull'],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'liabilityA' => [
+ 'id' => 13,
+ 'fields' => [
+ 'liability_type' => ['test_value' => $liabilityRole],
+ ],
+ 'extra_ignore' => [],
+ ],
+ 'liabilityB' => [
+ 'id' => 13,
+ 'fields' => [
+ 'interest' => ['test_value' => $faker->randomFloat(2, 1, 99)],
+ 'interest_period' => ['test_value' => $interestPeriod],
+ ],
+ 'extra_ignore' => [],
+ ],
+ ];
+
+ return $set;
}
diff --git a/tests/Traits/TestHelpers.php b/tests/Traits/TestHelpers.php
index a31afbb21e..bc19143839 100644
--- a/tests/Traits/TestHelpers.php
+++ b/tests/Traits/TestHelpers.php
@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace Tests\Traits;
use Exception;
+use JsonException;
use Log;
/**
@@ -108,7 +109,128 @@ trait TestHelpers
return $set;
}
- protected function submitAndCompare(string $route, array $submission): void {
+ /**
+ * @param string $route
+ * @param array $submission
+ *
+ * @throws JsonException
+ */
+ protected function updateAndCompare(string $route, array $submission, array $ignored): void
+ {
+ // get original values:
+ $response = $this->get($route, ['Accept' => 'application/json']);
+ $response->assertStatus(200);
+ $originalString = $response->content();
+ $originalArray = json_decode($originalString, true, 512, JSON_THROW_ON_ERROR);
+
+
+ // submit whatever is in submission:
+ // loop the fields we will update in Firefly III:
+ $submissionArray = [];
+ $fieldsToUpdate = array_keys($submission['fields']);
+ foreach ($fieldsToUpdate as $currentFieldName) {
+ $submissionArray[$currentFieldName] = $submission['fields'][$currentFieldName]['test_value'];
+ }
+ $response = $this->put($route, $submissionArray, ['Accept' => 'application/json']);
+ $responseString = $response->content();
+ $response->assertStatus(200);
+ $responseArray = json_decode($responseString, true, 512, JSON_THROW_ON_ERROR);
+
+ $responseAttributes = $responseArray['data']['attributes'] ?? [];
+
+ // loop it and compare:
+ foreach ($responseAttributes as $rKey => $rValue) {
+ // field should be ignored?
+ if (in_array($rKey, $ignored) || in_array($rKey, $submission['extra_ignore'])) {
+ continue;
+ }
+ // field in response was also in body:
+ if (array_key_exists($rKey, $submissionArray)) {
+ if ($submissionArray[$rKey] !== $rValue) {
+
+ $message = sprintf(
+ "Expected field '%s' to be %s but its %s\nOriginal: %s\nSubmission: %s\nResult: %s",
+ $rKey,
+ var_export($submissionArray[$rKey], true),
+ var_export($rValue, true),
+ $originalString,
+ json_encode($submissionArray),
+ $responseString
+ );
+ $this->assertTrue(false, $message);
+ continue;
+ }
+ continue;
+ }
+ // field in response was not in body, but should be the same:
+ if (!array_key_exists($rKey, $submissionArray)) {
+ // original has this key too:
+ if (array_key_exists($rKey, $originalArray)) {
+ // but it is different?
+ if ($originalArray[$rKey] !== $rValue) {
+ $message = 'Some other value not correct!';
+ $this->assertTrue(false, $message);
+ }
+ }
+ continue;
+ }
+
+
+ // if (!compareResult($uValue, $currentProperties[$uKey]) && !in_array($uKey, $fieldsToUpdate)) {
+ // if (!is_array($currentProperties[$uKey]) && !is_array($uValue)) {
+ // $log->warning(
+ // sprintf('Field %s is updated from %s to %s but shouldnt be.', $uKey, $currentProperties[$uKey], $uValue)
+ // );
+ // } else {
+ // $log->warning(
+ // sprintf('Field %s is updated from (array) to (array) but shouldnt be.', $uKey)
+ // );
+ // }
+ // $log->debug(json_encode($currentProperties));
+ // $log->debug(json_encode($updatedAttributes));
+ // }
+ //
+ // if (in_array($uKey, $fieldsToUpdate) && compareResult($uValue, $testBody[$uKey])) {
+ // $log->debug(sprintf('Field %s is updated and this is OK.', $uKey));
+ // }
+ // if (in_array($uKey, $fieldsToUpdate) && !compareResult($uValue, $testBody[$uKey])) {
+ // if (!is_array($uValue) && !is_array($testBody[$uKey])) {
+ // $log->warning(sprintf('Field "%s" is different: %s but must be %s!', $uKey, var_export($uValue, true), var_export($testBody[$uKey], true)));
+ // $log->debug(json_encode($currentProperties));
+ // $log->debug(json_encode($updatedAttributes));
+ // } else {
+ // $log->warning(sprintf('Field "%s" is different!', $uKey));
+ // $log->debug(json_encode(filterArray($currentProperties)));
+ // $log->debug(json_encode(filterArray($updatedAttributes)));
+ // }
+ //
+ // }
+ }
+
+
+ // // OLD
+ //
+ //
+ // $updatedResponseBody = json_decode($updateResponse->getBody(), true, 512, JSON_THROW_ON_ERROR);
+ // $updatedAttributes = $updatedResponseBody['data']['attributes'];
+ // if (array_key_exists('key', $endpoint) && array_key_exists('level', $endpoint)) {
+ // $key = $endpoint['key'];
+ // $level = $endpoint['level'];
+ // $updatedAttributes = $updatedResponseBody['data']['attributes'][$key][$level];
+ // }
+ //
+ // // END OLD
+ //
+ // var_dump($submissionJson);
+ // exit;
+ }
+
+ /**
+ * @param string $route
+ * @param array $submission
+ */
+ protected function submitAndCompare(string $route, array $submission): void
+ {
// submit!
$response = $this->post(route($route), $submission, ['Accept' => 'application/json']);
$responseBody = $response->content();
@@ -133,81 +255,4 @@ trait TestHelpers
}
}
}
-
- /**
- * @param string $route
- * @param array $minimalSets
- * @param array $startOptionalSets
- * @param array $regenConfig
- */
- protected function runBasicStoreTest(string $route, array $minimalSets, array $startOptionalSets, array $regenConfig): void
- {
- // test API
- foreach ($minimalSets as $set) {
- $body = [];
- foreach ($set['fields'] as $field => $value) {
- $body[$field] = $value;
- }
- // submit minimal set:
- Log::debug(sprintf('Submitting: %s', json_encode($body)));
- $response = $this->post(route($route), $body, ['Accept' => 'application/json']);
- $response->assertStatus(200);
- $response->assertHeader('Content-Type', 'application/vnd.api+json');
-
- // then loop and add fields:
- $optionalSets = $startOptionalSets;
- $keys = array_keys($optionalSets);
- $submissions = [];
- for ($i = 1; $i <= count($keys); $i++) {
- $combinations = $this->combinationsOf($i, $keys);
- // expand body with N extra fields:
- foreach ($combinations as $extraFields) {
- $second = $body;
- foreach ($extraFields as $extraField) {
- // now loop optional sets on $extraField and add whatever the config is:
- foreach ($optionalSets[$extraField]['fields'] as $newField => $newValue) {
- $second[$newField] = $newValue;
- }
- }
-
- $second = $this->regenerateValues($second, $regenConfig);
- $submissions[] = $second;
- }
- }
- unset($second);
-
- // count and progress maybe
-
- // all submissions counted and submitted:
- foreach ($submissions as $submission) {
- Log::debug(sprintf('Submitting: %s', json_encode($submission)));
-
- // submit again!
- $response = $this->post(route($route), $submission, ['Accept' => 'application/json']);
- $responseBody = $response->content();
- $responseJson = json_decode($responseBody, true);
- $message = sprintf('Status code is %d and body is %s', $response->getStatusCode(), $responseBody);
- $this->assertEquals($response->getStatusCode(), 200, $message);
- $response->assertHeader('Content-Type', 'application/vnd.api+json');
-
- // compare results:
- foreach ($responseJson['data']['attributes'] as $returnName => $returnValue) {
- if (array_key_exists($returnName, $submission)) {
- if ($this->ignoreCombination('store-account', $submission['type'], $returnName)) {
- continue;
- }
-
- $message = sprintf(
- "Return value '%s' of key '%s' does not match submitted value '%s'.\n%s\n%s", $returnValue, $returnName, $submission[$returnName],
- json_encode($submission), $responseBody
- );
- $this->assertEquals($returnValue, $submission[$returnName], $message);
-
- }
- }
- }
-
- }
- }
-
}