fix bugs and deletes unnecessary files

2025-04-04 22:59:34 +05:00
parent b6fb523aaa
commit 8aeef476ae
25 changed files with 314 additions and 420 deletions
@@ -15,11 +15,11 @@ class ClientAcademicJournalController extends Controller
 {
    public function __construct(readonly SeoPageProvider $seoPageProvider){}

-    public function index()
+    public function index(): \Inertia\Response
    {
        $journals = Cache::remember(
            CacheKeys::ACADEMIC_JOURNALS_PREFIX->value . 'list',
-            now()->addWeek(), // Кешируем на неделю, так как журналы меняются редко
+            now()->addWeek(),
            function () {
                return ClientAcademicJournalListResource::collection(
                    AcademicJournal::query()->get()
@@ -32,24 +32,30 @@ class ClientAcademicJournalController extends Controller
        return Inertia::render('Client/AcademicJournals/Index', compact('journals', 'seo'));
    }

-    public function show(string $slug)
+    public function show(string $slug): \Inertia\Response
    {
-        // Кешируем основной журнал
-        [$journal, $seo] = Cache::remember(
+        $journalData = Cache::remember(
            CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . $slug,
            now()->addWeek(),
            function () use ($slug) {
-                $journal = AcademicJournal::query()
+                return AcademicJournal::query()
                    ->where('slug', $slug)
                    ->firstOrFail();
-                $seo = $this->seoPageProvider->getSeoForModel($journal);
-                return [
-                    new ClientAcademicJournalListResource($journal),
-                    $seo
-                ];
            }
        );

+        $seo = Cache::remember(
+            CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . 'seo_' . $slug,
+            now()->addWeek(),
+            function () use ($journalData) {
+                return $this->seoPageProvider->getSeoForModel($journalData);
+            }
+        );
+
+        $journal = new ClientAcademicJournalListResource($journalData);
+
+
+
        // Кешируем выпуски журнала, сгруппированные по годам
        $journals = Cache::remember(
            CacheKeys::ACADEMIC_JOURNAL_PREFIX->value . 'issues_' . $slug,
@@ -26,7 +26,7 @@ class ClientAdditionalEducationController extends Controller
    public function __construct(readonly SeoPageProvider $seoPageProvider){}


-    public function index(Request $request)
+    public function index(Request $request): \Inertia\Response
    {
        $cacheKey = md5(serialize([
            'direction' => $request->input('direction'),
@@ -134,26 +134,22 @@ class ClientAdditionalEducationController extends Controller
            'seo'
        ));
    }
-    public function show(string $slug)
+    public function show(string $slug): \Inertia\Response
    {
-        // Кешируем основную программу дополнительного образования
-        [$additionalEducation, $seo] = Cache::remember(
+        $additionalEducationModel = Cache::remember(
            CacheKeys::ADDITIONAL_EDUCATIONAL_PROGRAM_PREFIX->value . $slug,
            now()->addDay(),
-            function () use ($slug) {
-                $additionalEducation = AdditionalEducation::query()
-                    ->with('category.direction')
-                    ->where('slug', $slug)
-                    ->first();
-                $seo = $this->seoPageProvider->getSeoForModel($additionalEducation);
-                return [
-                    new AdditionalEducationResource($additionalEducation),
-                    $seo
-                ];
-            }
+            fn() => AdditionalEducation::with('category.direction')->where('slug', $slug)->firstOrFail()
        );

-        // SEO-данные берём из кешированного ресурса
+        $seo = Cache::remember(
+            CacheKeys::ADDITIONAL_EDUCATIONAL_PROGRAM_PREFIX->value . 'seo_' . $slug,
+            now()->addDay(),
+            fn() => $this->seoPageProvider->getSeoForModel($additionalEducationModel)
+        );
+
+        $additionalEducation = new AdditionalEducationResource($additionalEducationModel);
+

        return Inertia::render('Client/Additional-educations/Show', compact(
            'additionalEducation',
@@ -35,6 +35,7 @@ class ClientDepartmentController extends Controller
        );


+
        // Кешируем список активных кафедр факультета
        $departments = Cache::remember(
            CacheKeys::DEPARTMENTS_PREFIX->value . 'active_' . $faculty->id,
@@ -49,12 +50,11 @@ class ClientDepartmentController extends Controller
            }
        );

-        // Кешируем полные данные кафедры с отношениями
-        [$department, $seo] = Cache::remember(
+        $departmentModel = Cache::remember(
            CacheKeys::DEPARTMENT_PREFIX->value . $cacheKey,
            now()->addDay(),
            function () use ($departmentSlug) {
-                $department = Department::query()
+                return Department::query()
                    ->where('slug', $departmentSlug)
                    ->where('is_active', true)
                    ->with([
@@ -64,17 +64,20 @@ class ClientDepartmentController extends Controller
                        'programs.directionStudy',
                        'seo'
                    ])
-                    ->first();
-
-                $seo = $this->seoPageProvider->getSeoForModel($department);
-                return [
-                    new DepartmentResource($department),
-                    $seo
-                ];
+                    ->firstOrFail();
            }
        );

-        // Кешируем сгруппированные направления
+        $seo = Cache::remember(
+            CacheKeys::DEPARTMENT_PREFIX->value . 'seo_' . $cacheKey,
+            now()->addDay(),
+            function () use ($departmentModel) {
+                return $this->seoPageProvider->getSeoForModel($departmentModel);
+            }
+        );
+
+        $department = new DepartmentResource($departmentModel);
+
        $directions = Cache::remember(
            CacheKeys::DEPARTMENT_PREFIX->value . 'directions_' . $cacheKey,
            now()->addDay(),
@@ -2,11 +2,13 @@

 namespace App\Http\Controllers;

+use App\Enums\CacheKeys;
 use App\Http\Resources\DivisionResource;
 use App\Models\Division;
 use App\Services\App\Breadcrumb\BreadcrumbService;
 use App\Services\App\Seo\SeoPageProvider;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Inertia\Inertia;

 class ClientDivisionController extends Controller
@@ -15,20 +17,36 @@ class ClientDivisionController extends Controller

    public function index()
    {
-        $divisions = DivisionResource::collection(Division::query()->where('is_active', true)->get());
+        $divisions = Cache::remember(CacheKeys::DIVISIONS_PREFIX->value . 'list', now()->addDay(), function () {
+            return DivisionResource::collection(
+                Division::query()->where('is_active', true)->get()
+            );
+        });

-        $seo = $this->seoPageProvider->getSeoForCurrentPage();
+        $seo = Cache::remember(CacheKeys::DIVISIONS_PREFIX->value . 'seo', now()->addDay(), function () {
+            return $this->seoPageProvider->getSeoForCurrentPage();
+        });

        return Inertia::render('Client/Divisions/Index', compact('divisions', 'seo'));
    }

-    public function show(string $slug)
+    public function show(string $slug): \Inertia\Response
    {
-        $divisions = DivisionResource::collection(Division::query()->where('is_active', true)->get());
-        $division = new DivisionResource($divisionModel = Division::with(['workers.userDetail', 'seo'])->where('is_active', true)->where('slug', $slug)->firstOrFail());
+        $divisions = Cache::remember(CacheKeys::DIVISIONS_PREFIX->value . 'list', now()->addDay(), function () {
+            return DivisionResource::collection(
+                Division::query()->where('is_active', true)->get()
+            );
+        });

-        $seo = $this->seoPageProvider->getSeoForModel($divisionModel);
+        $divisionData = Cache::remember(CacheKeys::DIVISION_PREFIX->value . $slug, now()->addDay(), function () use ($slug) {
+            return Division::with(['workers.userDetail', 'seo'])->where('is_active', true)->where('slug', $slug)->firstOrFail();
+        });
+
+        $seo = $this->seoPageProvider->getSeoForModel($divisionData);
+
+        $division = new DivisionResource($divisionData);

        return Inertia::render('Client/Divisions/Show', compact('divisions', 'division', 'seo'));
    }
+
 }
@@ -64,19 +64,26 @@ class ClientEventController extends Controller

    public function show(string $slug): \Inertia\Response
    {
-        [$event, $seo] = Cache::remember(
+        $eventModel = Cache::remember(
            CacheKeys::EVENT_PREFIX->value . $slug,
            now()->addDay(),
-            function ($slug) {
-                $event = Event::where('slug', $slug)->with(['category', 'seo'])->first();
-                $seo = $this->seoPageProvider->getSeoForModel($event);
-                return [
-                    new ClientEventFullResource($event),
-                    $seo
-                ];
+            function () use ($slug) {
+                return Event::where('slug', $slug)
+                    ->with(['category', 'seo'])
+                    ->firstOrFail();
            }
        );

+        $seo = Cache::remember(
+            CacheKeys::EVENT_PREFIX->value . 'seo_' . $slug,
+            now()->addDay(),
+            function () use ($eventModel) {
+                return $this->seoPageProvider->getSeoForModel($eventModel);
+            }
+        );
+
+        $event = new ClientEventFullResource($eventModel);
+

        return Inertia::render('Client/Events/Show', compact(
            'event',
@@ -53,22 +53,27 @@ class ClientFacultyController extends Controller
        );

        // Кешируем данные конкретного факультета
-        [$faculty, $seo] = Cache::remember(
+        $faculty = Cache::remember(
            CacheKeys::FACULTY_PREFIX->value . $slug,
            now()->addDay(),
            function () use ($slug) {
-                $faculty = Faculty::where('slug', $slug)
+                return Faculty::where('slug', $slug)
                    ->where('is_active', true)
                    ->with(['departments.faculty', 'workers.userDetail', 'seo'])
                    ->firstOrFail();
-                $seo = $this->seoPageProvider->getSeoForModel($faculty);
-                return [
-                    new FullFacultyResource($faculty),
-                    $seo
-                ];
            }
        );

+        $seo = Cache::remember(
+            CacheKeys::FACULTY_PREFIX->value . "SEO_" . $slug,
+            now()->addDay(),
+            function () use ($faculty) {
+                return $this->seoPageProvider->getSeoForModel($faculty);
+            }
+        );
+
+        $faculty = new FullFacultyResource($faculty);
+


        return Inertia::render('Client/Faculties/Show', compact('faculty', 'faculties', 'seo'));
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers;

+use App\Enums\CacheKeys;
 use App\Http\Resources\CategoryResource;
 use App\Http\Resources\ClientPostListResource;
 use App\Http\Resources\ClientTagResource;
@@ -138,28 +139,25 @@ class ClientPostController extends Controller
        $cacheKey = 'post_' . md5($slug);

        // Пытаемся получить данные из кеша
-        $data = Cache::remember($cacheKey, now()->addHours(1), function () use ($slug) {
-            // Получаем пост
-            $post = Post::where('slug', $slug)
+        $postData = Cache::remember(
+            CacheKeys::POST_PREFIX->value . $slug,
+            now()->addHours(1),
+            fn() => Post::where('slug', $slug)
                ->where('publish_at', '<', Carbon::now())
-                ->firstOrFail();
+                ->firstOrFail()
+        );

-            // Преобразуем пост в ресурс
-            $postResource = new PostResource($post);
+        $seo = Cache::remember(
+            CacheKeys::POST_PREFIX->value . 'seo_' . $slug,
+            now()->addHours(1),
+            fn() => $this->seoPageProvider->getSeoForModel($postData)
+        );

-            // SEO-данные
-            $seo = $this->seoPageProvider->getSeoForModel($post);
-
-            // Возвращаем данные для кеширования
-            return [
-                'post' => $postResource,
-                'seo' => $seo,
-            ];
-        });
+        $post = new PostResource($postData);


        // Возвращаем ответ с использованием кешированных данных
-        return Inertia::render('Client/Posts/Show', $data);
+        return Inertia::render('Client/Posts/Show', compact(''));
    }


@@ -28,128 +28,101 @@ class ClientProgramController extends Controller
 {
    public function __construct(readonly SeoPageProvider $seoPageProvider){}

-    public function index(Request $request)
+    public function index(Request $request): \Inertia\Response
    {
        $cacheKey = CacheKeys::EDUCATION_PROGRAMS_PREFIX->value . md5(serialize($request->all()));
+        $cacheKeyLevels = 'education_levels_list';
+        $cacheKeyForms = 'education_forms_list';
+        $cacheKeyBudgets = 'education_budgets_list';
+        $cacheKeySeo = 'education_programs_seo';

-        $data = Cache::remember($cacheKey, now()->addHours(1), function () use ($request) {
-            $activeCampaign = AdmissionCampaign::query()->where('status', 1)->first();
+        $activeCampaign = Cache::remember('active_admission_campaign', now()->addDay(), function () {
+            return AdmissionCampaign::where('status', 1)->first();
+        });

-            $uniqueValues = EducationalProgram::distinct()->pluck('lvl_edu');
-            $levelsEducational = $uniqueValues->mapWithKeys(function ($level) {
-                return [$level->name => $level->getLabel()];
-            });
+        $levelsEducational = Cache::remember($cacheKeyLevels, now()->addDay(), function () {
+            return EducationalProgram::distinct()->pluck('lvl_edu')
+                ->mapWithKeys(fn($level) => [$level->name => $level->getLabel()]);
+        });

-            $direction_studies = DirectionStudy::query()
-                ->withAdmissionCampaignByYear($activeCampaign->academic_year)
-                ->withActivePrograms()
-                ->get();
+        $formsEdu = Cache::remember($cacheKeyForms, now()->addDay(), function () {
+            return collect(FormEducation::cases())
+                ->mapWithKeys(fn($form) => [$form->name => $form->getLabel()]);
+        });

-            $level = request()->input('level');
-            $form = request()->input('form');
-            $budget = request()->input('budget');
+        $budgetEdu = Cache::remember($cacheKeyBudgets, now()->addDay(), function () {
+            return collect(BudgetEducation::cases())
+                ->mapWithKeys(fn($type) => [$type->name => $type->getLabel()]);
+        });

-            $naprs = DirectionStudyResource::collection(
+        $seo = Cache::remember($cacheKeySeo, now()->addDay(), function () {
+            return $this->seoPageProvider->getSeoForCurrentPage();
+        });
+
+        $naprs = Cache::remember($cacheKey, now()->addHours(1), function () use ($request, $activeCampaign) {
+            return DirectionStudyResource::collection(
                DirectionStudy::query()
                    ->withAdmissionCampaignByYear($activeCampaign->academic_year)
                    ->withActivePrograms()
                    ->with('programs.admission_plans')
-                    ->when($level, function ($query) use ($level) {
-                        $query->where('lvl_edu', LevelEducational::fromName($level)->value);
-                    })
-                    ->when($form, function ($query) use ($form) {
-                        $this->applyFormFilter($query, $form);
-                    })
-                    ->when($budget, function ($query) use ($budget) {
-                        $this->applyBudgetFilter($query, $budget);
-                    })
-                    ->when(request()->input('direction'), function ($query) {
-                        $slugs = request()->input('direction');
-                        if (is_array($slugs)) {
-                            $query->whereIn('slug', $slugs);
-                        }
-                    })
+                    ->when($request->input('level'), fn($q, $level) =>
+                    $q->where('lvl_edu', LevelEducational::fromName($level)->value))
+                    ->when($request->input('form'), fn($q, $form) =>
+                    $this->applyFormFilter($q, $form))
+                    ->when($request->input('budget'), fn($q, $budget) =>
+                    $this->applyBudgetFilter($q, $budget))
+                    ->when($request->input('direction'), fn($q, $slugs) =>
+                    is_array($slugs) ? $q->whereIn('slug', $slugs) : $q)
                    ->get()
            );
-
-            $campaignName = $this->getAdmissionCampaignName();
-            $formsEducational = FormEducation::cases();
-            $formsEducational = collect($formsEducational);
-            $formsEdu = $formsEducational->mapWithKeys(function ($formEducational) {
-                return [$formEducational->name => $formEducational->getLabel()];
-            });
-            $typesBudget = BudgetEducation::cases();
-            $typesBudget = collect($typesBudget);
-            $budgetEdu = $typesBudget->mapWithKeys(function ($typeBudget) {
-                return [$typeBudget->name => $typeBudget->getLabel()];
-            });
-
-            $filters = [
-                'level_filter' => [
-                    'type' => 'level',
-                    'value' => request()->input('level'),
-                    'param' => 'level'
-                ],
-                'budget_filter' => [
-                    'type' => 'budget',
-                    'value' => request()->input('budget'),
-                    'param' => 'budget'
-                ],
-                'formEdu_filter' => [
-                    'type' => 'form',
-                    'value' => request()->input('form'),
-                    'param' => 'form'
-                ],
-                'direction_filter' => [
-                    'type' => 'direction',
-                    'value' => request()->input('direction'),
-                    'param' => 'direction'
-                ],
-            ];
-
-            $seo = $this->seoPageProvider->getSeoForCurrentPage();
-
-
-            return compact(
-                'naprs',
-                'campaignName',
-                'levelsEducational',
-                'filters',
-                'formsEdu',
-                'budgetEdu',
-                'direction_studies',
-                'seo'
-            );
        });

+        $data = [
+            'naprs' => $naprs,
+            'campaignName' => $this->getAdmissionCampaignName(),
+            'levelsEducational' => $levelsEducational,
+            'filters' => [
+                'level_filter' => ['type' => 'level', 'value' => $request->input('level'), 'param' => 'level'],
+                'budget_filter' => ['type' => 'budget', 'value' => $request->input('budget'), 'param' => 'budget'],
+                'formEdu_filter' => ['type' => 'form', 'value' => $request->input('form'), 'param' => 'form'],
+                'direction_filter' => ['type' => 'direction', 'value' => $request->input('direction'), 'param' => 'direction'],
+            ],
+            'formsEdu' => $formsEdu,
+            'budgetEdu' => $budgetEdu,
+            'direction_studies' => DirectionStudy::query()
+                ->withAdmissionCampaignByYear($activeCampaign->academic_year)
+                ->withActivePrograms()
+                ->get(),
+            'seo' => $seo
+        ];

        return Inertia::render('Client/Programs/Index', $data);
    }
-
-    public function show(string $slug)
+    public function show(string $slug): \Inertia\Response
    {
-        $cacheKey = CacheKeys::EDUCATION_PROGRAM_PREFIX->value . md5($slug);
+        $cacheKeyProgram = CacheKeys::EDUCATION_PROGRAM_PREFIX->value . md5($slug);
+        $cacheKeySeo = CacheKeys::EDUCATION_PROGRAM_PREFIX->value . 'seo_' . md5($slug);
+        $cacheKeyForms = 'education_forms_list';

-        $data = Cache::remember($cacheKey, now()->addHours(1), function () use ($slug) {
-            $program = new EducationalProgramFullResource(
-                $programModel = EducationalProgram::query()
-                    ->where('slug', $slug)
-                    ->with(['admission_plans', 'directionStudy', 'seo'])
-                    ->firstOrFail()
-            );
-
-            $formsEducational = BudgetEducation::cases();
-            $formsEducational = collect($formsEducational);
-            $formsEdu = $formsEducational->mapWithKeys(function ($formEducational) {
-                return [$formEducational->value => $formEducational->getLabel()];
-            });
-
-            $seo = $this->seoPageProvider->getSeoForModel($programModel);
-
-            return compact('program', 'formsEdu', 'seo');
+        $programModel = Cache::remember($cacheKeyProgram, now()->addHours(1), function () use ($slug) {
+            return EducationalProgram::query()
+                ->where('slug', $slug)
+                ->with(['admission_plans', 'directionStudy', 'seo'])
+                ->firstOrFail();
        });

-        return Inertia::render('Client/Programs/Show', $data);
+        $formsEdu = Cache::remember($cacheKeyForms, now()->addDay(), function () {
+            return collect(BudgetEducation::cases())
+                ->mapWithKeys(fn($form) => [$form->value => $form->getLabel()]);
+        });
+
+        $seo = Cache::remember($cacheKeySeo, now()->addHours(1), function () use ($programModel) {
+            return $this->seoPageProvider->getSeoForModel($programModel);
+        });
+
+        $program = new EducationalProgramFullResource($programModel);
+
+        return Inertia::render('Client/Programs/Show', compact('program', 'formsEdu', 'seo'));
    }

    private function getAdmissionCampaignName(): string
@@ -17,16 +17,21 @@ class PersonController extends Controller
    {
        $cacheKey = CacheKeys::USER_PREFIX->value . md5($slug);

-        [$person, $seo] = Cache::remember($cacheKey, now()->addHours(24), function () use ($slug) {
-            $person = User::query()->with(['userDetail', 'departments_work.faculty', 'departments_teach.faculty', 'divisions', 'faculties'])
+        $personData = Cache::remember(
+            CacheKeys::USER_PREFIX->value . $slug,
+            now()->addHours(24),
+            fn() => User::with(['userDetail', 'departments_work.faculty', 'departments_teach.faculty', 'divisions', 'faculties'])
                ->where('slug', $slug)
-                ->firstOrFail();
-            $seo = $this->seoPageProvider->getSeoForModel($person);
-            return [
-                new ClientFullInfoPersonResource($person),
-                $seo
-            ];
-        });
+                ->firstOrFail()
+        );
+
+        $seo = Cache::remember(
+            CacheKeys::USER_PREFIX->value . 'seo_' . $slug,
+            now()->addHours(24),
+            fn() => $this->seoPageProvider->getSeoForModel($personData)
+        );
+
+        $person = new ClientFullInfoPersonResource($personData);