kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Various code clean up. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-08-26 08:21:31 +02:00
parent e7a0a5937c
commit d0c6afc3a9
56 changed files with 205 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Import/Converter/BillName.php
View File

@@ -36,6 +36,7 @@ class BillName extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Bill;
}
@@ -48,6 +49,7 @@ class BillName extends BasicConverter implements ConverterInterface
if (!is_null($bill->id)) {
Log::debug('Found bill by ID', ['id' => $bill->id]);
$this->setCertainty(100);
return $bill;
}
}
@@ -57,6 +59,7 @@ class BillName extends BasicConverter implements ConverterInterface
if (!is_null($bill->id)) {
Log::debug('Found bill by name ', ['id' => $bill->id]);
$this->setCertainty(100);
return $bill;
}
@@ -66,7 +69,7 @@ class BillName extends BasicConverter implements ConverterInterface
'name' => $value,
'match' => $value,
'amount_min' => 1,
'user' => $this->user->id,
'user' => $this->user->id,
'amount_max' => 10,
'date' => date('Ymd'),
'repeat_freq' => 'monthly',

3
app/Import/Converter/BudgetId.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Log;
@@ -36,6 +35,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
if ($value === 0) {
$this->setCertainty(0);
return new Budget;
}
@@ -58,6 +58,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
if (!is_null($budget->id)) {
Log::debug('Found budget by ID ', ['id' => $budget->id]);
$this->setCertainty(100);
return $budget;
}

8
app/Import/Converter/BudgetName.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Log;
@@ -36,6 +35,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Budget;
}
@@ -48,6 +48,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
if (!is_null($budget->id)) {
Log::debug('Found budget by ID', ['id' => $budget->id]);
$this->setCertainty(100);
return $budget;
}
}
@@ -57,14 +58,15 @@ class BudgetName extends BasicConverter implements ConverterInterface
if (!is_null($budget->id)) {
Log::debug('Found budget by name ', ['id' => $budget->id]);
$this->setCertainty(100);
return $budget;
}
// create new budget. Use a lot of made up values.
$budget = $repository->store(
[
'name' => $value,
'user' => $this->user->id,
'name' => $value,
'user' => $this->user->id,
]
);
$this->setCertainty(100);

4
app/Import/Converter/CategoryId.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Log;
@@ -36,6 +35,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
if ($value === 0) {
$this->setCertainty(0);
return new Category;
}
@@ -48,6 +48,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
if (!is_null($category->id)) {
Log::debug('Found category by ID', ['id' => $category->id]);
$this->setCertainty(100);
return $category;
}
}
@@ -57,6 +58,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
if (!is_null($category->id)) {
Log::debug('Found category by ID ', ['id' => $category->id]);
$this->setCertainty(100);
return $category;
}

6
app/Import/Converter/CategoryName.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Log;
@@ -36,6 +35,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Category;
}
@@ -48,6 +48,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
if (!is_null($category->id)) {
Log::debug('Found category by ID', ['id' => $category->id]);
$this->setCertainty(100);
return $category;
}
}
@@ -57,13 +58,14 @@ class CategoryName extends BasicConverter implements ConverterInterface
if (!is_null($category->id)) {
Log::debug('Found category by name ', ['id' => $category->id]);
$this->setCertainty(100);
return $category;
}
// create new category. Use a lot of made up values.
$category = $repository->store(
[
'name' => $value,
'name' => $value,
'user' => $this->user->id,
]
);

10
app/Import/Converter/ConverterInterface.php
View File

@@ -26,16 +26,16 @@ interface ConverterInterface
*/
public function convert($value);
/**
* @param array $config
*/
public function setConfig(array $config);
/**
* @return int
*/
public function getCertainty(): int;
/**
* @param array $config
*/
public function setConfig(array $config);
/**
* @param bool $doMap
*/

2
app/Import/Converter/CurrencyCode.php
View File

@@ -41,6 +41,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by ID', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
}
@@ -50,6 +51,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by code', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
$currency = $repository->store(

4
app/Import/Converter/CurrencyId.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Log;
@@ -36,6 +35,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
if ($value === 0) {
$this->setCertainty(0);
return new TransactionCurrency;
}
@@ -48,6 +48,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by ID', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
}
@@ -57,6 +58,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by ID ', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
$this->setCertainty(0);

3
app/Import/Converter/CurrencyName.php
View File

@@ -35,6 +35,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new TransactionCurrency;
}
@@ -47,6 +48,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by ID', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
}
@@ -56,6 +58,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by name ', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}

3
app/Import/Converter/CurrencySymbol.php
View File

@@ -35,6 +35,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new TransactionCurrency;
}
@@ -47,6 +48,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by ID', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}
}
@@ -56,6 +58,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
if (!is_null($currency->id)) {
Log::debug('Found currency by symbol ', ['id' => $currency->id]);
$this->setCertainty(100);
return $currency;
}

2
app/Import/Converter/Date.php
View File

@@ -40,10 +40,12 @@ class Date extends BasicConverter implements ConverterInterface
Log::info($e->getMessage());
Log::info('Cannot convert this string using the given format.', ['value' => $value, 'format' => $this->config['date-format']]);
$this->setCertainty(0);
return new Carbon;
}
Log::debug('Converted date', ['converted' => $date->toAtomString()]);
$this->setCertainty(100);
return $date;
}
}

3
app/Import/Converter/INGDebetCredit.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Exceptions\FireflyException;
use Log;
/**
@@ -34,11 +33,13 @@ class INGDebetCredit extends BasicConverter implements ConverterInterface
if ($value === 'Af') {
Log::debug('Return -1');
$this->setCertainty(100);
return -1;
}
$this->setCertainty(100);
Log::debug('Return 1');
return 1;
}

2
app/Import/Converter/OpposingAccountIban.php
View File

@@ -35,6 +35,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Account;
}
@@ -48,6 +49,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
if (!is_null($account->id)) {
Log::debug('Found account by ID', ['id' => $account->id]);
$this->setCertainty(100);
return $account;
}
}

1
app/Import/Converter/OpposingAccountName.php
View File

@@ -35,6 +35,7 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Account;
}

5
app/Import/Converter/OpposingAccountNumber.php
View File

@@ -12,7 +12,6 @@ declare(strict_types = 1);
namespace FireflyIII\Import\Converter;
use FireflyIII\Crud\Account\AccountCrudInterface;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use Log;
@@ -37,6 +36,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
if (strlen($value) === 0) {
$this->setCertainty(0);
return new Account;
}
@@ -50,6 +50,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
if (!is_null($account->id)) {
Log::debug('Found account by ID', ['id' => $account->id]);
$this->setCertainty(100);
return $account;
}
}
@@ -59,6 +60,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
if (!is_null($account->id)) {
Log::debug('Found account by number', ['id' => $account->id]);
$this->setCertainty(50);
return $account;
}
@@ -79,6 +81,7 @@ class OpposingAccountNumber extends BasicConverter implements ConverterInterface
'virtualBalance' => 0, 'accountNumber' => $value, 'active' => true]
);
$this->setCertainty(100);
return $account;
}