diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index 0759c6d5d9..1eab1366f0 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -50,8 +50,7 @@ class PiggyBankController extends Controller return Response::json($cache->get()); } - /** @var Collection $set */ - $set = new Collection($repository->getEventSummarySet($piggyBank)); + $set = $repository->getEventSummarySet($piggyBank); $data = $this->generator->history($set); $cache->store($data); diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 7aa5d6d6e9..c288e8b3a8 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -52,6 +52,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function destroy(PiggyBank $piggyBank): bool { $piggyBank->delete(); + return true; } @@ -62,7 +63,9 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface */ public function getEventSummarySet(PiggyBank $piggyBank): Collection { - return DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::raw('SUM(`amount`) AS `sum`')]); + $var = DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::raw('SUM(`amount`) AS `sum`')]); + + return new Collection($var); } /** @@ -130,6 +133,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface $piggyBank->order = $order; $piggyBank->save(); } + return true; } diff --git a/tests/acceptance/Controllers/CsvControllerTest.php b/tests/acceptance/Controllers/CsvControllerTest.php index 938ed7a15d..6f1e98fe13 100644 --- a/tests/acceptance/Controllers/CsvControllerTest.php +++ b/tests/acceptance/Controllers/CsvControllerTest.php @@ -36,7 +36,7 @@ class CsvControllerTest extends TestCase $data->shouldReceive('getRoles')->once()->andReturn([]); $data->shouldReceive('getMap')->once()->andReturn([]); - $data->shouldReceive('hasHeaders')->once()->andReturn([]); + $data->shouldReceive('hasHeaders')->once()->andReturn(false); $this->call('GET', '/csv/column_roles');