Also extend collector.

This commit is contained in:
James Cole
2017-01-30 16:57:00 +01:00
parent 1e947870a6
commit c7341c9194
2 changed files with 13 additions and 6 deletions

View File

@@ -98,12 +98,9 @@ class JournalCollector implements JournalCollectorInterface
/** /**
* JournalCollector constructor. * JournalCollector constructor.
*
* @param User $user
*/ */
public function __construct(User $user) public function __construct()
{ {
$this->user = $user;
$this->query = $this->startQuery(); $this->query = $this->startQuery();
} }
@@ -168,7 +165,7 @@ class JournalCollector implements JournalCollectorInterface
{ {
$this->run = true; $this->run = true;
/** @var Collection $set */ /** @var Collection $set */
$set = $this->query->get(array_values($this->fields)); $set = $this->query->get(array_values($this->fields));
Log::debug(sprintf('Count of set is %d', $set->count())); Log::debug(sprintf('Count of set is %d', $set->count()));
$set = $this->filterTransfers($set); $set = $this->filterTransfers($set);
Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count())); Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count()));
@@ -456,6 +453,14 @@ class JournalCollector implements JournalCollectorInterface
return $this; return $this;
} }
/**
* @param User $user
*/
public function setUser(User $user)
{
$this->user = $user;
}
/** /**
* @return JournalCollectorInterface * @return JournalCollectorInterface
*/ */

View File

@@ -17,6 +17,7 @@ use Carbon\Carbon;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\User;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@@ -84,7 +85,6 @@ interface JournalCollectorInterface
*/ */
public function setBudget(Budget $budget): JournalCollectorInterface; public function setBudget(Budget $budget): JournalCollectorInterface;
/** /**
* @param Collection $budgets * @param Collection $budgets
* *
@@ -149,6 +149,8 @@ interface JournalCollectorInterface
*/ */
public function setTypes(array $types): JournalCollectorInterface; public function setTypes(array $types): JournalCollectorInterface;
public function setUser(User $user);
/** /**
* @return JournalCollectorInterface * @return JournalCollectorInterface
*/ */