failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor ClientAcademicJournalController; replace caching logic with action classes for academic journal retrieval and improve code clarity

Browse Source
This commit is contained in:
F4ilji
2025-07-19 12:49:10 +05:00
parent 1fc793089c
commit 4558282da8
6 changed files with 162 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Containers/Science/Actions/GetAcademicJournalAction.php
+37
View File
@@ -0,0 +1,37 @@
<?php
namespace App\Containers\Science\Actions;
use App\Containers\Science\Tasks\FindAcademicJournalBySlugTask;
use App\Containers\Science\Tasks\GetAcademicJournalIssuesGroupedByYearTask;
use App\Ship\Contracts\SeoServiceInterface;
use App\Ship\Exceptions\NotFoundException;
use Intervention\Image\Exception\NotFoundException as ExceptionNotFoundException;
class GetAcademicJournalAction
{
public function __construct(
private readonly FindAcademicJournalBySlugTask $findAcademicJournalBySlugTask,
private readonly GetAcademicJournalIssuesGroupedByYearTask $getAcademicJournalIssuesGroupedByYearTask,
private readonly SeoServiceInterface $seoService
)
{
}
/**
* @throws NotFoundException
*/
public function run(string $slug): array
{
$journalData = $this->findAcademicJournalBySlugTask->run($slug);
$seo = $this->seoService->getSeoForModel($journalData);
$groupedIssues = $this->getAcademicJournalIssuesGroupedByYearTask->run($journalData->id);
return [
'journalData' => $journalData,
'seo' => $seo,
'groupedIssues' => $groupedIssues,
];
}
}
app/Containers/Science/Actions/GetAllAcademicJournalsAction.php
+27
View File
@@ -0,0 +1,27 @@
<?php
namespace App\Containers\Science\Actions;
use App\Containers\Science\Tasks\GetAllAcademicJournalsTask;
use App\Containers\Science\UI\WEB\Transformers\AcademicJournalResource;
use App\Ship\Contracts\SeoServiceInterface;
class GetAllAcademicJournalsAction
{
public function __construct(
private readonly GetAllAcademicJournalsTask $getAllAcademicJournalsTask,
private readonly SeoServiceInterface $seoService
) {
}
public function run(): array
{
$journals = $this->getAllAcademicJournalsTask->run();
$seo = $this->seoService->getSeoForCurrentPage();
return [
'journals' => AcademicJournalResource::collection($journals),
'seo' => $seo,
];
}
}
app/Containers/Science/Tasks/FindAcademicJournalBySlugTask.php
+23
View File
@@ -0,0 +1,23 @@
<?php
namespace App\Containers\Science\Tasks;
use App\Containers\Science\Models\AcademicJournal;
use App\Ship\Enums\CacheKeys;
use Illuminate\Support\Facades\Cache;
class FindAcademicJournalBySlugTask
{
public function run(string $slug): AcademicJournal|null
{
return Cache::remember(
CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . $slug,
now()->addWeek(),
function () use ($slug) {
return AcademicJournal::query()
->where('slug', $slug)
->firstOrFail();
}
);
}
}
app/Containers/Science/Tasks/GetAcademicJournalIssuesGroupedByYearTask.php
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App\Containers\Science\Tasks;
use App\Containers\Science\Models\JournalIssue;
use App\Containers\Science\UI\WEB\Transformers\AcademicJournalResource;
use App\Ship\Enums\CacheKeys;
use Illuminate\Support\Facades\Cache;
class GetAcademicJournalIssuesGroupedByYearTask
{
public function run(int $academicJournalId): array
{
return Cache::remember(
CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . 'issues_' . $academicJournalId,
now()->addWeek(),
function () use ($academicJournalId) {
$journalIssues = JournalIssue::where('academic_journal_id', $academicJournalId)
->get()
->groupBy('year_publication');
$groupedIssues = [];
foreach ($journalIssues as $year => $journalGroup) {
$groupedIssues[] = [
'year_publication' => $year,
'journalIssues' => $journalGroup
];
}
return $groupedIssues;
}
);
}
}
app/Containers/Science/Tasks/GetAllAcademicJournalsTask.php
+22
View File
@@ -0,0 +1,22 @@
<?php
namespace App\Containers\Science\Tasks;
use App\Containers\Science\Models\AcademicJournal;
use App\Ship\Enums\CacheKeys;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Cache;
class GetAllAcademicJournalsTask
{
public function run(): Collection|null
{
return Cache::remember(
CacheKeys::ACADEMIC_JOURNALS_PREFIX->value . 'list',
now()->addWeek(),
function () {
return AcademicJournal::query()->get();
}
);
}
}
app/Containers/Science/UI/WEB/Controllers/ClientAcademicJournalController.php
+19 -56
View File
@@ -2,6 +2,8 @@
namespace App\Containers\Science\UI\WEB\Controllers;
use App\Containers\Science\Actions\GetAllAcademicJournalsAction;
use App\Containers\Science\Actions\GetAcademicJournalAction;
use App\Containers\Science\Models\AcademicJournal;
use App\Containers\Science\Models\JournalIssue;
use App\Containers\Science\UI\WEB\Transformers\AcademicJournalResource;
@@ -13,71 +15,32 @@ use Inertia\Inertia;
class ClientAcademicJournalController extends Controller
{
public function __construct(readonly SeoServiceInterface $seoPageProvider){}
public function __construct(
readonly SeoServiceInterface $seoPageProvider,
private readonly GetAllAcademicJournalsAction $getAllAcademicJournalsAction,
private readonly GetAcademicJournalAction $getAcademicJournalAction
){}
public function index(): \Inertia\Response
{
$journals = Cache::remember(
CacheKeys::ACADEMIC_JOURNALS_PREFIX->value . 'list',
now()->addWeek(),
function () {
return AcademicJournalResource::collection(
AcademicJournal::query()->get()
);
}
);
$result = $this->getAllAcademicJournalsAction->run();
$seo = $this->seoPageProvider->getSeoForCurrentPage();
return Inertia::render('Client/AcademicJournals/Index', compact('journals', 'seo'));
return Inertia::render('Client/AcademicJournals/Index', [
'journals' => $result['journals'],
'seo' => $result['seo'],
]);
}
public function show(string $slug): \Inertia\Response
{
$journalData = Cache::remember(
CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . $slug,
now()->addWeek(),
function () use ($slug) {
return AcademicJournal::query()
->where('slug', $slug)
->firstOrFail();
}
);
$result = $this->getAcademicJournalAction->run($slug);
$seo = Cache::remember(
CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . 'seo_' . $slug,
now()->addWeek(),
function () use ($journalData) {
return $this->seoPageProvider->getSeoForModel($journalData);
}
);
$journal = new AcademicJournalResource($result['journalData']);
$journal = new AcademicJournalResource($journalData);
// Кешируем выпуски журнала, сгруппированные по годам
$journals = Cache::remember(
CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . 'issues_' . $slug,
now()->addWeek(),
function () use ($journal) {
$journalIssues = JournalIssue::where('academic_journal_id', $journal->id)
->get()
->groupBy('year_publication');
$groupedIssues = [];
foreach ($journalIssues as $year => $journalGroup) {
$groupedIssues[] = [
'year_publication' => $year,
'journalIssues' => $journalGroup
];
}
return $groupedIssues;
}
);
return Inertia::render('Client/AcademicJournals/Show', compact('journal', 'journals', 'seo'));
return Inertia::render('Client/AcademicJournals/Show', [
'journal' => $journal,
'journals' => $result['groupedIssues'],
'seo' => $result['seo'],
]);
}
}