kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Align notes with object, not separate.

Browse Source
This commit is contained in:
James Cole
2018-09-27 07:43:30 +02:00
parent 214c7a6f3e
commit 2c2814c998
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Transformers/AttachmentTransformer.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Models\Attachment;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\TransformerAbstract;
@@ -40,17 +41,20 @@ class AttachmentTransformer extends TransformerAbstract
*
* @var array
*/
protected $availableIncludes = ['user', 'notes'];
protected $availableIncludes = ['user'];
/**
* List of resources to automatically include
*
* @var array
*/
protected $defaultIncludes = ['user', 'notes'];
protected $defaultIncludes = ['user'];
/** @var ParameterBag */
protected $parameters;
/** @var AttachmentRepositoryInterface */
private $repository;
/**
* BillTransformer constructor.
*
@@ -61,20 +65,7 @@ class AttachmentTransformer extends TransformerAbstract
public function __construct(ParameterBag $parameters)
{
$this->parameters = $parameters;
}
/**
* Attach the notes.
*
* @codeCoverageIgnore
*
* @param Attachment $attachment
*
* @return FractalCollection
*/
public function includeNotes(Attachment $attachment): FractalCollection
{
return $this->collection($attachment->notes, new NoteTransformer($this->parameters), 'notes');
$this->repository = app(AttachmentRepositoryInterface::class);
}
/**
@@ -100,6 +91,8 @@ class AttachmentTransformer extends TransformerAbstract
*/
public function transform(Attachment $attachment): array
{
$this->repository->setUser($attachment->user);
return [
'id' => (int)$attachment->id,
'updated_at' => $attachment->updated_at->toAtomString(),
@@ -111,6 +104,7 @@ class AttachmentTransformer extends TransformerAbstract
'upload_uri' => route('api.v1.attachments.upload', [$attachment->id]),
'title' => $attachment->title,
'mime' => $attachment->mime,
'notes' => $this->repository->getNoteText($attachment),
'size' => (int)$attachment->size,
'links' => [
[