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

Removed duplicate code.

Browse Source
This commit is contained in:
James Cole
2016-01-29 07:29:21 +01:00
parent 6755ec7eb0
commit 170ffbae04
4 changed files with 41 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/Handlers/Events/RescanJournal.php
View File

@@ -1,52 +0,0 @@
<?php namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\TransactionJournalUpdated;
use Log;
/**
* Class RescanJournal
*
* @codeCoverageIgnore
* @package FireflyIII\Handlers\Events
*/
class RescanJournal
{
/**
* Create the event handler.
*
*/
public function __construct()
{
//
}
/**
* Handle the event.
*
* @param TransactionJournalUpdated $event
*
* @return void
*/
public function handle(TransactionJournalUpdated $event)
{
$journal = $event->journal;
Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
Log::debug('Found ' . $list->count() . ' bills to check.');
/** @var \FireflyIII\Models\Bill $bill */
foreach ($list as $bill) {
Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
$repository->scan($bill, $journal);
}
Log::debug('Done!');
}
}

18
app/Handlers/Events/ScanForBillsAfterStore.php
View File

@@ -10,6 +10,7 @@
namespace FireflyIII\Handlers\Events; namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\TransactionJournalStored; use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Support\Events\BillScanner;
use Log; use Log;
/** /**
@@ -40,22 +41,7 @@ class ScanForBillsAfterStore
public function handle(TransactionJournalStored $event) public function handle(TransactionJournalStored $event)
{ {
$journal = $event->journal; $journal = $event->journal;
BillScanner::scan($journal);
Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
Log::debug('Found ' . $list->count() . ' bills to check.');
/** @var \FireflyIII\Models\Bill $bill */
foreach ($list as $bill) {
Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
$repository->scan($bill, $journal);
}
Log::debug('Done!');
} }
} }

18
app/Handlers/Events/ScanForBillsAfterUpdate.php
View File

@@ -10,6 +10,7 @@
namespace FireflyIII\Handlers\Events; namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\TransactionJournalUpdated; use FireflyIII\Events\TransactionJournalUpdated;
use FireflyIII\Support\Events\BillScanner;
use Log; use Log;
/** /**
@@ -40,22 +41,7 @@ class ScanForBillsAfterUpdate
public function handle(TransactionJournalUpdated $event) public function handle(TransactionJournalUpdated $event)
{ {
$journal = $event->journal; $journal = $event->journal;
BillScanner::scan($journal);
Log::debug('Triggered saved event for journal #' . $journal->id . ' (' . $journal->description . ')');
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
Log::debug('Found ' . $list->count() . ' bills to check.');
/** @var \FireflyIII\Models\Bill $bill */
foreach ($list as $bill) {
Log::debug('Now calling bill #' . $bill->id . ' (' . $bill->name . ')');
$repository->scan($bill, $journal);
}
Log::debug('Done!');
} }
} }

37
app/Support/Events/BillScanner.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
/**
* BillScanner.php
* Copyright (C) 2016 Sander Dorigo
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Support\Events;
use FireflyIII\Models\TransactionJournal;
/**
* Class BillScanner
*
* @package FireflyIII\Support\Events
*/
class BillScanner
{
/**
* @param TransactionJournal $journal
*/
static function scan(TransactionJournal $journal)
{
/** @var \FireflyIII\Repositories\Bill\BillRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
$list = $journal->user->bills()->where('active', 1)->where('automatch', 1)->get();
/** @var \FireflyIII\Models\Bill $bill */
foreach ($list as $bill) {
$repository->scan($bill, $journal);
}
}
}