kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-17 20:08:52 +00:00
Code Issues Projects Releases Wiki Activity

Updated tests.

Browse Source
This commit is contained in:
James Cole
2014-12-20 15:00:53 +01:00
parent e86547645c
commit 82e438d29b
44 changed files with 2000 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/lib/FireflyIII/Database/Account/Account.php
View File

@@ -7,6 +7,7 @@ use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -214,11 +215,11 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
// delete journals:
@@ -339,12 +340,12 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
$model->name = $data['name'];
$model->active = isset($data['active']) ? intval($data['active']) : 0;

13
app/lib/FireflyIII/Database/AccountType/AccountType.php
View File

@@ -2,10 +2,11 @@
namespace FireflyIII\Database\AccountType;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
/**
@@ -17,12 +18,12 @@ class AccountType implements CUD, CommonDatabaseCalls
{
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
* @throws NotImplementedException
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
// TODO: Implement destroy() method.
throw new NotImplementedException;
@@ -41,13 +42,13 @@ class AccountType implements CUD, CommonDatabaseCalls
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws NotImplementedException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
// TODO: Implement update() method.
throw new NotImplementedException;

52
app/lib/FireflyIII/Database/Budget/Budget.php
View File

@@ -7,6 +7,7 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -28,11 +29,11 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
$model->delete();
@@ -62,12 +63,12 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
$model->name = $data['name'];
$model->save();
@@ -236,9 +237,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
{
return \LimitRepetition::
leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
->where('limit_repetitions.startdate', $date->format('Y-m-d'))
->where('budget_limits.budget_id', $budget->id)
->first(['limit_repetitions.*']);
->where('limit_repetitions.startdate', $date->format('Y-m-d'))
->where('budget_limits.budget_id', $budget->id)
->first(['limit_repetitions.*']);
}
/**
@@ -251,21 +252,22 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
{
// Add expenses that have no budget:
return $this->getUser()
->transactionjournals()
->whereNotIn('transaction_journals.id', function ($query) use ($start, $end) {
$query
->select('transaction_journals.id')
->from('transaction_journals')
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
}
)
->before($end)
->after($start)
->lessThan(0)
->transactionTypes(['Withdrawal'])
->get();
->transactionjournals()
->whereNotIn(
'transaction_journals.id', function ($query) use ($start, $end) {
$query
->select('transaction_journals.id')
->from('transaction_journals')
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
}
)
->before($end)
->after($start)
->lessThan(0)
->transactionTypes(['Withdrawal'])
->get();
}
/**
@@ -321,7 +323,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
$limit->amount = $amount;
$limit->repeat_freq = 'monthly';
$limit->repeats = 0;
$limit->save();
$result = $limit->save();
\Log::info('Created new limit? ' . boolval($result));
\Log::info('ID: ' . $limit->id);
/*
* A newly stored limit also created a limit repetition.
*/

13
app/lib/FireflyIII/Database/CUD.php
View File

@@ -2,6 +2,7 @@
namespace FireflyIII\Database;
use Illuminate\Database\Eloquent\Model as Eloquent;
/**
@@ -13,26 +14,26 @@ interface CUD
{
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model);
public function destroy(Eloquent $model);
/**
* @param array $data
*
* @return \Eloquent
* @return Eloquent
*/
public function store(array $data);
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data);
public function update(Eloquent $model, array $data);
/**
* Validates an array. Returns an array containing MessageBags

12
app/lib/FireflyIII/Database/Category/Category.php
View File

@@ -7,10 +7,10 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
* Class Category
*
@@ -29,11 +29,11 @@ class Category implements CUD, CommonDatabaseCalls
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
$model->delete();
@@ -62,13 +62,13 @@ class Category implements CUD, CommonDatabaseCalls
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws FireflyException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
$model->name = $data['name'];
if (!$model->isValid()) {

1
app/lib/FireflyIII/Database/CommonDatabaseCalls.php
View File

@@ -5,7 +5,6 @@ namespace FireflyIII\Database;
use Illuminate\Support\Collection;
/**
* Interface CommonDatabaseCalls
*

17
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@@ -7,10 +7,10 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
* Class Piggybank
*
@@ -29,11 +29,11 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
$model->delete();
}
@@ -56,12 +56,12 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
/** @var \Piggybank $model */
$model->name = $data['name'];
@@ -178,7 +178,9 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
public function find($objectId)
{
return \Piggybank::
leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $objectId)->where('accounts.user_id', $this->getUser()->id)
leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $objectId)->where(
'accounts.user_id', $this->getUser()->id
)
->first(['piggybanks.*']);
}
@@ -242,6 +244,7 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
if ($date >= $rep->startdate && $date <= $rep->targetdate) {
return $rep;
}
return null;
}
);

12
app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php
View File

@@ -9,10 +9,10 @@ use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
* Class RepeatedExpense
*
@@ -98,12 +98,12 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
* @throws NotImplementedException
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
// TODO: Implement destroy() method.
throw new NotImplementedException;
@@ -135,13 +135,13 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws NotImplementedException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
// TODO: Implement update() method.
throw new NotImplementedException;

49
app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
View File

@@ -8,6 +8,7 @@ use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -29,11 +30,11 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
$model->delete();
@@ -74,12 +75,12 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
$model->name = $data['name'];
$model->match = $data['match'];
@@ -113,45 +114,13 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
$warnings = new MessageBag;
$successes = new MessageBag;
$errors = new MessageBag;
if (isset($model['name']) && strlen($model['name']) == 0) {
$errors->add('name', 'Name must be longer.');
}
if (isset($model['name']) && strlen($model['name']) > 200) {
$errors->add('name', 'Name must be shorter.');
}
if (isset($model['match']) && strlen(trim($model['match'])) <= 2) {
$errors->add('match', 'Needs more matches.');
}
if (isset($model['amount_min']) && floatval($model['amount_min']) < 0.01) {
$errors->add('amount_min', 'Minimum amount must be higher.');
}
if (isset($model['amount_max']) && floatval($model['amount_max']) < 0.02) {
$errors->add('amount_max', 'Maximum amount must be higher.');
}
if (isset($model['amount_min']) && isset($model['amount_max']) && floatval($model['amount_min']) > floatval($model['amount_max'])) {
$errors->add('amount_max', 'Maximum amount can not be less than minimum amount.');
$errors->add('amount_min', 'Minimum amount can not be more than maximum amount.');
}
if ($model['date'] != '') {
try {
new Carbon($model['date']);
} catch (\Exception $e) {
$errors->add('date', 'Invalid date.');
}
}
$reminders = \Config::get('firefly.budget_periods');
if (!isset($model['repeat_freq']) || (isset($model['repeat_freq']) && !in_array($model['repeat_freq'], $reminders))) {
$errors->add('repeat_freq', 'Invalid reminder period');
}
if (isset($model['skip']) && intval($model['skip']) < 0) {
$errors->add('skip', 'Invalid skip.');
}
$object = new \RecurringTransaction($model);
$object->isValid();
$errors->merge($object->getErrors());
$set = ['name', 'match', 'amount_min', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active'];
foreach ($set as $entry) {

12
app/lib/FireflyIII/Database/Transaction/Transaction.php
View File

@@ -7,10 +7,10 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
* Class Transaction
*
@@ -21,12 +21,12 @@ class Transaction implements CUD, CommonDatabaseCalls
use SwitchUser;
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
* @throws NotImplementedException
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
// TODO: Implement destroy() method.
throw new NotImplementedException;
@@ -60,13 +60,13 @@ class Transaction implements CUD, CommonDatabaseCalls
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws NotImplementedException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
// TODO: Implement update() method.
throw new NotImplementedException;

1
app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
View File

@@ -2,7 +2,6 @@
namespace FireflyIII\Database\TransactionCurrency;
/**
* Class TransactionType
*

11
app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
View File

@@ -9,6 +9,7 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -30,11 +31,11 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
/*
* Trigger deletion.
@@ -84,13 +85,13 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws FireflyException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
$journalType = $this->getJournalType($data['what']);
$currency = $this->getJournalCurrency($data['currency']);

11
app/lib/FireflyIII/Database/TransactionType/TransactionType.php
View File

@@ -7,6 +7,7 @@ use FireflyIII\Database\CommonDatabaseCalls;
use FireflyIII\Database\CUD;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
@@ -19,12 +20,12 @@ class TransactionType implements CUD, CommonDatabaseCalls
{
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
* @throws NotImplementedException
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
// TODO: Implement destroy() method.
throw new NotImplementedException;
@@ -43,13 +44,13 @@ class TransactionType implements CUD, CommonDatabaseCalls
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
* @throws NotImplementedException
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
// TODO: Implement update() method.
throw new NotImplementedException;