kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

New account tests.

Browse Source
This commit is contained in:
James Cole
2017-01-02 10:05:02 +01:00
parent 050d7e8f00
commit 36f1b6a834
2 changed files with 97 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Models/Account.php
View File

@@ -69,10 +69,14 @@ class Account extends Model
/**
* @param array $fields
*
* @return Account|null
* @return Account
* @throws FireflyException
*/
public static function firstOrCreateEncrypted(array $fields)
{
if (!isset($fields['user_id'])) {
throw new FireflyException('Missing required field "user_id".');
}
// everything but the name:
$query = self::orderBy('id');
$search = $fields;
@@ -81,17 +85,21 @@ class Account extends Model
foreach ($search as $name => $value) {
$query->where($name, $value);
}
$set = $query->get(['accounts.*']);
$set = $query->get(['accounts.*']);
// account must have a name. If not set, use IBAN.
if (!isset($fields['name'])) {
$fields['name'] = $fields['iban'];
}
/** @var Account $account */
foreach ($set as $account) {
if ($account->name == $fields['name']) {
return $account;
}
}
// account must have a name. If not set, use IBAN.
if (!isset($fields['name'])) {
$fields['name'] = $fields['iban'];
}
// create it!
$account = self::create($fields);