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

New stuff pertaining to the import procedure and user registration.

Browse Source
This commit is contained in:
James Cole
2014-07-05 16:19:15 +02:00
parent c3254c2351
commit a0c0dc288d
23 changed files with 305 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/lib/Firefly/Exception/FireflyException.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
/**
* Created by PhpStorm.
* User: sander
* Date: 04/07/14
* Time: 13:58
*/
namespace Firefly\Exception;
class FireflyException extends \Exception {
}

14
app/lib/Firefly/Exception/MigrationException.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
/**
* Created by PhpStorm.
* User: sander
* Date: 04/07/14
* Time: 13:55
*/
namespace Firefly\Helper;
class MigrationException extends \Exception {
}

8
app/lib/Firefly/Helper/Email/EmailHelper.php
View File

@@ -6,11 +6,11 @@ class EmailHelper implements EmailHelperInterface
public function sendVerificationMail(\User $user)
{
$verification = \Str::random(32);
$user->verification = $verification;
$reset = \Str::random(32);
$user->reset = $reset;
$user->save();
$email = $user->email;
$data = ['verification' => $verification];
$data = ['reset' => $reset];
\Mail::send(
['emails.user.verify-html', 'emails.user.verify-text'], $data, function ($message) use ($email) {
@@ -24,7 +24,7 @@ class EmailHelper implements EmailHelperInterface
$password = \Str::random(12);
$user->password = \Hash::make($password);
$user->verification = \Str::random(32); // new one.
$user->reset = \Str::random(32); // new one.
$user->save();
$email = $user->email;

6
app/lib/Firefly/Helper/HelperServiceProvider.php
View File

@@ -15,6 +15,12 @@ class HelperServiceProvider extends ServiceProvider
'Firefly\Helper\Email\EmailHelperInterface',
'Firefly\Helper\Email\EmailHelper'
);
// migration:
$this->app->bind(
'Firefly\Helper\Migration\MigrationHelperInterface',
'Firefly\Helper\Migration\MigrationHelper'
);
}
}

91
app/lib/Firefly/Helper/Migration/MigrationHelper.php
View File

@@ -24,6 +24,7 @@ class MigrationHelper implements MigrationHelperInterface
{
// file does not exist:
if (!file_exists($this->path)) {
\Log::error('Migration file ' . $this->path . ' does not exist!');
return false;
}
@@ -38,20 +39,39 @@ class MigrationHelper implements MigrationHelperInterface
if (is_null($this->JSON)) {
return false;
}
\Log::info('Migration file ' . $this->path . ' is valid!');
return true;
}
public function migrate()
{
\Log::info('Start of migration.');
\DB::beginTransaction();
// create the accounts:
$this->_createAccounts();
try {
$this->_importAccounts();
$this->_importComponents();
$this->_importPiggybanks();
} catch (\Firefly\Exception\FireflyException $e) {
\DB::rollBack();
\Log::error('Rollback because of error!');
\Log::error($e->getMessage());
return false;
}
\DB::commit();
\Log::info('Done!');
return true;
}
protected function _createAccounts()
protected function _importAccounts()
{
$accounts = App::make('Firefly\Storage\Account\AccountRepositoryInterface');
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */
$accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface');
\Log::info('Going to import ' . count($this->JSON->accounts) . ' accounts.');
foreach ($this->JSON->accounts as $entry) {
// create account:
if ($entry->openingbalance == 0) {
@@ -59,13 +79,66 @@ class MigrationHelper implements MigrationHelperInterface
} else {
$account = $accounts->storeWithInitialBalance(
['name' => $entry->name],
new Carbon($entry->openingbalancedate),
new \Carbon\Carbon($entry->openingbalancedate),
floatval($entry->openingbalance)
);
}
if ($account) {
$this->map['accounts'][$entry->id] = $account->id;
}
$this->map['accounts'][$entry->id] = $account->id;
\Log::info('Imported account "' . $entry->name . '" with balance ' . $entry->openingbalance);
}
}
protected function _importComponents()
{
$beneficiaryAT = \AccountType::where('description', 'Beneficiary account')->first();
$budgetType = \ComponentType::where('type', 'budget')->first();
$categoryType = \ComponentType::where('type', 'category')->first();
foreach ($this->JSON->components as $entry) {
switch ($entry->type->type) {
case 'beneficiary':
$beneficiary = $this->_importBeneficiary($entry, $beneficiaryAT);
$this->map['accounts'][$entry->id] = $beneficiary->id;
break;
case 'category':
$component = $this->_importComponent($entry, $categoryType);
$this->map['components'][$entry->id] = $component->id;
break;
case 'budget':
$component = $this->_importComponent($entry, $budgetType);
$this->map['components'][$entry->id] = $component->id;
break;
}
}
}
protected function _importPiggybanks() {
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */
$accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface');
// get type for piggy:
$piggyAT = \AccountType::where('description', 'Piggy bank')->first();
foreach($this->JSON->piggybanks as $piggyBank) {
}
}
protected function _importBeneficiary($component, \AccountType $beneficiaryAT)
{
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accounts */
$accounts = \App::make('Firefly\Storage\Account\AccountRepositoryInterface');
return $accounts->store(
[
'name' => $component->name,
'account_type' => $beneficiaryAT
]
);
}
protected function _importComponent($component, \ComponentType $type)
{
/** @var \Firefly\Storage\Component\ComponentRepositoryInterface $components */
$components = \App::make('Firefly\Storage\Component\ComponentRepositoryInterface');
return $components->store(['name' => $component->name, 'component_type' => $type]);
}
}

22
app/lib/Firefly/Storage/Account/EloquentAccountRepository.php
View File

@@ -3,6 +3,8 @@
namespace Firefly\Storage\Account;
use Firefly\Helper\MigrationException;
class EloquentAccountRepository implements AccountRepositoryInterface
{
public $validator;
@@ -28,11 +30,17 @@ class EloquentAccountRepository implements AccountRepositoryInterface
$initial->user()->associate(\Auth::user());
$initial->name = $data['name'] . ' initial balance';
$initial->active = 0;
$initial->save();
try {
$initial->save();
} catch (\Illuminate\Database\QueryException $e) {
\Log::error('DB ERROR: ' . $e->getMessage());
throw new FireflyException('Could not save counterbalance account for ' . $data['name']);
}
// create new transaction journal (and transactions):
/** @var \Firefly\Storage\TransactionJournal\TransactionJournalInterface $transactionJournal */
$transactionJournal = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalInterface');
/** @var \Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface $transactionJournal */
$transactionJournal = \App::make('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
$transactionJournal->createSimpleJournal(
$initial, $account, 'Initial Balance for ' . $data['name'], $amount, $date
);
@@ -54,7 +62,13 @@ class EloquentAccountRepository implements AccountRepositoryInterface
$account->user()->associate(\Auth::user());
$account->name = $data['name'];
$account->active = isset($data['active']) ? $data['active'] : 1;
$account->save();
try {
$account->save();
} catch (\Illuminate\Database\QueryException $e) {
\Log::error('DB ERROR: ' . $e->getMessage());
throw new \Firefly\Exception\FireflyException('Could not save account ' . $data['name']);
}
return $account;
}

14
app/lib/Firefly/Storage/Component/ComponentRepositoryInterface.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace Firefly\Storage\Component;
interface ComponentRepositoryInterface
{
public function count();
public function store($data);
}

40
app/lib/Firefly/Storage/Component/EloquentComponentRepository.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
namespace Firefly\Storage\Component;
class EloquentComponentRepository implements ComponentRepositoryInterface
{
public $validator;
public function __construct()
{
}
public function count()
{
return \Auth::user()->accounts()->count();
}
public function store($data)
{
if (!isset($data['component_type'])) {
throw new \Firefly\Exception\FireflyException('No component type present.');
}
$component = new \Component;
$component->componentType()->associate($data['component_type']);
$component->name = $data['name'];
$component->user()->associate(\Auth::user());
try {
$component->save();
} catch (\Illuminate\Database\QueryException $e) {
\Log::error('DB ERROR: ' . $e->getMessage());
throw new \Firefly\Exception\FireflyException('Could not save component ' . $data['name']);
}
return $component;
}
}

6
app/lib/Firefly/Storage/StorageServiceProvider.php
View File

@@ -21,9 +21,13 @@ class StorageServiceProvider extends ServiceProvider
'Firefly\Storage\Account\EloquentAccountRepository'
);
$this->app->bind(
'Firefly\Storage\TransactionJournal\TransactionJournalInterface',
'Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface',
'Firefly\Storage\TransactionJournal\EloquentTransactionJournalRepository'
);
$this->app->bind(
'Firefly\Storage\Component\ComponentRepositoryInterface',
'Firefly\Storage\Component\EloquentComponentRepository'
);
}
}

27
app/lib/Firefly/Storage/TransactionJournal/EloquentTransactionJournalRepository.php
View File

@@ -9,7 +9,7 @@
namespace Firefly\Storage\TransactionJournal;
class EloquentTransactionJournalRepository implements TransactionJournalInterface
class EloquentTransactionJournalRepository implements TransactionJournalRepositoryInterface
{
public function createSimpleJournal(\Account $from, \Account $to, $description, $amount, \Carbon\Carbon $date)
@@ -45,6 +45,7 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
$toAT = $to->accountType->description;
$fromAT = $from->accountType->description;
$journalType = null;
switch (true) {
// is withdrawal from one of your own accounts:
@@ -66,8 +67,17 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
$journalType = \TransactionType::where('type', 'Deposit')->first();
break;
}
if (is_null($journalType)) {
\Log::error('Could not figure out transacion type!');
throw new \Firefly\Exception\FireflyException('Could not figure out transaction type.');
}
// always the same currency:
$currency = \TransactionCurrency::where('code', 'EUR')->first();
if (is_null($currency)) {
\Log::error('No currency for journal!');
throw new \Firefly\Exception\FireflyException('No currency for journal!');
}
// new journal:
$journal = new \TransactionJournal();
@@ -77,7 +87,9 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
$journal->description = $description;
$journal->date = $date;
if (!$journal->isValid()) {
return false;
\Log::error('Cannot create valid journal.');
\Log::error('Errors: ' . print_r($journal->validator->messages()->all(), true));
throw new \Firefly\Exception\FireflyException('Cannot create valid journal.');
}
$journal->save();
@@ -88,7 +100,9 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
$fromTransaction->description = null;
$fromTransaction->amount = $amountFrom;
if (!$fromTransaction->isValid()) {
return false;
\Log::error('Cannot create valid transaction (from) for journal #' . $journal->id);
\Log::error('Errors: ' . print_r($fromTransaction->validator->messages()->all(), true));
throw new \Firefly\Exception\FireflyException('Cannot create valid transaction (from).');
}
$fromTransaction->save();
@@ -98,7 +112,11 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
$toTransaction->description = null;
$toTransaction->amount = $amountTo;
if (!$toTransaction->isValid()) {
return false;
if (!$toTransaction->isValid()) {
\Log::error('Cannot create valid transaction (to) for journal #' . $journal->id);
\Log::error('Errors: ' . print_r($toTransaction->validator->messages()->all(), true));
throw new \Firefly\Exception\FireflyException('Cannot create valid transaction (to).');
}
}
$toTransaction->save();
@@ -107,7 +125,6 @@ class EloquentTransactionJournalRepository implements TransactionJournalInterfac
return;
echo 'saved!';
}

2
app/lib/Firefly/Storage/TransactionJournal/TransactionJournalInterface.php → app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php
View File

@@ -9,7 +9,7 @@
namespace Firefly\Storage\TransactionJournal;
interface TransactionJournalInterface {
interface TransactionJournalRepositoryInterface {
public function createSimpleJournal(\Account $from, \Account $to, $description, $amount, \Carbon\Carbon $date);

9
app/lib/Firefly/Storage/User/EloquentUserRepository.php
View File

@@ -14,12 +14,12 @@ class EloquentUserRepository implements UserRepositoryInterface
$user = new \User;
$user->email = isset($array['email']) ? $array['email'] : null;
$user->migrated = 0;
$user->verification = \Str::random(32);
$user->reset = \Str::random(32);
$user->password = \Hash::make(\Str::random(12));
if (!$user->isValid()) {
\Log::error('Invalid user');
\Session::flash('error', 'Input invalid, please try again.');
\Session::flash('error', 'Input invalid, please try again: ' . $user->validator->messages()->first());
return false;
}
$user->save();
@@ -36,11 +36,6 @@ class EloquentUserRepository implements UserRepositoryInterface
return false;
}
public function findByVerification($verification)
{
return \User::where('verification', $verification)->first();
}
public function findByReset($reset)
{
return \User::where('reset', $reset)->first();

3
app/lib/Firefly/Storage/User/UserRepositoryInterface.php
View File

@@ -10,12 +10,11 @@ interface UserRepositoryInterface
public function auth($array);
public function findByVerification($verification);
public function findByReset($reset);
public function findByEmail($email);
public function updatePassword(\User $user,$password);
public function updatePassword(\User $user, $password);
}