mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-11-04 05:15:39 +00:00 
			
		
		
		
	Also extend collector.
This commit is contained in:
		@@ -98,12 +98,9 @@ class JournalCollector implements JournalCollectorInterface
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * JournalCollector constructor.
 | 
			
		||||
     *
 | 
			
		||||
     * @param User $user
 | 
			
		||||
     */
 | 
			
		||||
    public function __construct(User $user)
 | 
			
		||||
    public function __construct()
 | 
			
		||||
    {
 | 
			
		||||
        $this->user  = $user;
 | 
			
		||||
        $this->query = $this->startQuery();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -168,7 +165,7 @@ class JournalCollector implements JournalCollectorInterface
 | 
			
		||||
    {
 | 
			
		||||
        $this->run = true;
 | 
			
		||||
        /** @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()));
 | 
			
		||||
        $set = $this->filterTransfers($set);
 | 
			
		||||
        Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count()));
 | 
			
		||||
@@ -456,6 +453,14 @@ class JournalCollector implements JournalCollectorInterface
 | 
			
		||||
        return $this;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param User $user
 | 
			
		||||
     */
 | 
			
		||||
    public function setUser(User $user)
 | 
			
		||||
    {
 | 
			
		||||
        $this->user = $user;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return JournalCollectorInterface
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ use Carbon\Carbon;
 | 
			
		||||
use FireflyIII\Models\Budget;
 | 
			
		||||
use FireflyIII\Models\Category;
 | 
			
		||||
use FireflyIII\Models\Tag;
 | 
			
		||||
use FireflyIII\User;
 | 
			
		||||
use Illuminate\Pagination\LengthAwarePaginator;
 | 
			
		||||
use Illuminate\Support\Collection;
 | 
			
		||||
 | 
			
		||||
@@ -84,7 +85,6 @@ interface JournalCollectorInterface
 | 
			
		||||
     */
 | 
			
		||||
    public function setBudget(Budget $budget): JournalCollectorInterface;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @param Collection $budgets
 | 
			
		||||
     *
 | 
			
		||||
@@ -149,6 +149,8 @@ interface JournalCollectorInterface
 | 
			
		||||
     */
 | 
			
		||||
    public function setTypes(array $types): JournalCollectorInterface;
 | 
			
		||||
 | 
			
		||||
    public function setUser(User $user);
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * @return JournalCollectorInterface
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user