kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix use of transformer.

Browse Source
This commit is contained in:
James Cole
2018-02-17 12:24:29 +01:00
parent 23e540a57a
commit 60b225d61c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/BillController.php
View File

@@ -37,6 +37,7 @@ use League\Fractal\Manager;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;
use League\Fractal\Serializer\DataArraySerializer; use League\Fractal\Serializer\DataArraySerializer;
use Preferences; use Preferences;
use Symfony\Component\HttpFoundation\ParameterBag;
use URL; use URL;
use View; use View;
@@ -172,11 +173,14 @@ class BillController extends Controller
*/ */
public function index(BillRepositoryInterface $repository) public function index(BillRepositoryInterface $repository)
{ {
$start = session('start'); $start = session('start');
$end = session('end'); $end = session('end');
$pageSize = intval(Preferences::get('listPageSize', 50)->data); $pageSize = intval(Preferences::get('listPageSize', 50)->data);
$paginator = $repository->getPaginator($pageSize); $paginator = $repository->getPaginator($pageSize);
$transformer = new BillTransformer($start, $end); $parameters = new ParameterBag();
$parameters->set('start', $start);
$parameters->set('end', $end);
$transformer = new BillTransformer($parameters);
/** @var Collection $bills */ /** @var Collection $bills */
$bills = $paginator->getCollection()->map( $bills = $paginator->getCollection()->map(
function (Bill $bill) use ($transformer) { function (Bill $bill) use ($transformer) {
@@ -238,7 +242,10 @@ class BillController extends Controller
$manager->parseIncludes(['attachments']); $manager->parseIncludes(['attachments']);
// Make a resource out of the data and // Make a resource out of the data and
$resource = new Item($bill, new BillTransformer($start, $end), 'bill'); $parameters = new ParameterBag();
$parameters->set('start', $start);
$parameters->set('end', $end);
$resource = new Item($bill, new BillTransformer($parameters), 'bill');
$object = $manager->createData($resource)->toArray(); $object = $manager->createData($resource)->toArray();
// use collector: // use collector:

2
database/factories/ModelFactory.php
View File

@@ -120,6 +120,8 @@ $factory->define(
function (Faker\Generator $faker) { function (Faker\Generator $faker) {
return [ return [
'id' => $faker->numberBetween(1, 10), 'id' => $faker->numberBetween(1, 10),
'created_at' => new Carbon,
'updated_at' => new Carbon,
'user_id' => 1, 'user_id' => 1,
'name' => $faker->words(3, true), 'name' => $faker->words(3, true),
'match' => $faker->words(3, true), 'match' => $faker->words(3, true),