Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: provide a fieldlist to reduce response size #121

Merged
merged 6 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions src/app/Http/Controllers/ItemController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
use App\Http\Controllers\ResponseController;
use App\Models\Item;
use App\Http\Resources\ItemResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;

class ItemController extends ResponseController
{
/**
* Display a paginated listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
public function index(Request $request): JsonResponse
{
$queryColumns = [
'StoryId' => 'StoryId',
Expand All @@ -27,6 +23,8 @@ public function index(Request $request)

$data = $this->getDataByRequest($request, $model, $queryColumns, $initialSortColumn);

$data = $this->filterDataByFieldlist($data, $request, ['StoryId', 'ItemId'], $initialSortColumn);

if (!$data) {
return $this->sendError('Invalid data', $request . ' not valid', 400);
}
Expand All @@ -36,13 +34,7 @@ public function index(Request $request)
return $this->sendResponseWithMeta($collection, 'Items fetched.');
}

/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
public function show(int $id): JsonResponse
{
try {
$data = Item::findOrFail($id);
Expand All @@ -54,14 +46,7 @@ public function show($id)
}
}

/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
public function update(Request $request, int $id): JsonResponse
{
try {
$item = Item::findOrfail($id);
Expand Down
30 changes: 30 additions & 0 deletions src/app/Http/Controllers/ResponseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,34 @@ protected function filterDataByQueries(

return $filtered;
}

protected function filterDataByFieldlist(
Collection $data,
Request $request,
array $defaults,
string $initialSortColumn
): Collection
{
$queries = $request->query();

if (empty($queries['fieldlist'])) {
return $data;
}

$fieldlist = explode(',', $queries['fieldlist']);
$fieldlist = array_map('trim', $fieldlist);
$fieldlist[] = $queries['orderBy'] ?? $initialSortColumn;
$fieldlist = array_merge($defaults, $fieldlist);
$fieldlist = array_unique($fieldlist);
$dataArray = $data->toArray()[0] ?: $data->toArray();
$fieldsToRemove = array_filter(array_keys($dataArray), function($field) use ($fieldlist) {
return !in_array($field, $fieldlist);
});

$data->each(function($data) use ($fieldsToRemove) {
$data->makeHidden($fieldsToRemove);
});

return $data;
}
}
13 changes: 6 additions & 7 deletions src/app/Models/Item.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ public function properties(): BelongsToMany
// to harmonize the API regarding the existent database schema
// we make use some custom accessors and mutators

public function getDescriptionLangAttribute(): object
public function getDescriptionLangAttribute(): Language
{
return $this->language()->first() ?: (object)[];
return $this->language()->first() ?: new Language();
}

public function getCompletionStatusAttribute(): CompletionStatus
Expand All @@ -92,10 +92,10 @@ public function getCompletionStatusAttribute(): CompletionStatus
'ColorCodeGradient'
]);

return $status;
return $status ?: new CompletionStatus();
}

public function getTranscriptionAttribute(): Transcription|HtrDataRevision|array
public function getTranscriptionAttribute(): Transcription|HtrDataRevision
{
if ($this->TranscriptionSource === 'manual') {
$manualTranscription = $this
Expand All @@ -108,7 +108,7 @@ public function getTranscriptionAttribute(): Transcription|HtrDataRevision|array
)
->firstWhere('CurrentVersion', 1);

return $manualTranscription ? $manualTranscription : [];
return $manualTranscription ?: new Transcription();
}

if ($this->TranscriptionSource === 'htr') {
Expand All @@ -120,7 +120,7 @@ public function getTranscriptionAttribute(): Transcription|HtrDataRevision|array
->latest()
->first();

return $latest ? $latest->htrDataRevision->first() : [];
return $latest ? $latest->htrDataRevision->first() : new HtrData();
}

return [];
Expand All @@ -144,5 +144,4 @@ public function getPlacesAttribute(): Collection
{
return $this->places()->get() ?: [];
}

}
2 changes: 1 addition & 1 deletion src/storage/api-docs/api-docs.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.3

info:
version: 1.49.0
version: 1.50.0
title: Transcribathon Platform API v2
description: This is the documentation of the Transcribathon API v2 used by [https:transcribathon.eu](https://transcribathon.eu/).<br />
For authorization you can use the the bearer token you are provided with.
Expand Down
4 changes: 4 additions & 0 deletions src/storage/api-docs/items-path.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ get:
description: If set determines that the query (StoryId, ItemId) is a multiple query string and separated by this separator
schema:
type: string
- in: query
name: fieldlist
description: Comma-separated list of fields that will be shown in the response
type: string
responses:
200:
description: Ok
Expand Down