From 68ccbf29100bd65ddbbd6bc80ba3ad104cd2964e Mon Sep 17 00:00:00 2001
From: aslan <aslan@aslan.ru>
Date: Mon, 18 Mar 2024 11:21:48 +0300
Subject: [PATCH] fix new logic to calculator with required and optional
 subjects

---
 app/Http/Controllers/Api/CalculatorController.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/CalculatorController.php b/app/Http/Controllers/Api/CalculatorController.php
index 96a9e89..bb8ccfb 100644
--- a/app/Http/Controllers/Api/CalculatorController.php
+++ b/app/Http/Controllers/Api/CalculatorController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Enums\ExaminationTypeEnum;
 use App\Http\Controllers\Controller;
 use App\Models\Department;
 use App\Models\Direction;
 use App\Models\EntranceExamination;
 use App\Models\Faculty;
-use App\Models\SubjectType;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\URL;
 
@@ -20,7 +20,8 @@ class CalculatorController extends Controller
         $countUserSubjects = count($calcultatorSubjects);
 
         $filteredDirectionIds = EntranceExamination::all()
-            ->select("direction_id", "subject_id", "subject_type_id")
+            ->select("direction_id", "subject_id", "subject_type_id", "examination_type_id")
+            ->where('examination_type_id', '=', ExaminationTypeEnum::Ege->value)
             ->reduce(function (array $carry, $examine) {
 
                 [
@@ -46,11 +47,10 @@ class CalculatorController extends Controller
             })
             ->filter(function ($subjectTypes) use ($calcultatorSubjects) {
                 $optionalSubjectsInCalculator = collect($subjectTypes[2])
-                    ->filter(fn ($optionalSubject) => in_array($optionalSubject, $calcultatorSubjects));
+                    ->filter(fn($optionalSubject) => in_array($optionalSubject, $calcultatorSubjects));
                 return $optionalSubjectsInCalculator->count() !== 0;
-            })->map(fn ($subjectTypes, $directionId) => $directionId)
-        ;
-//        dd($result);
+            })->map(fn($subjectTypes, $directionId) => $directionId);
+
         $directions = Direction::whereIn('id', $result)->get();