#69 - fix problem with empty lectures (#76)

SKNIW · Oct 2, 2023 · 691d394 · 691d394
1 parent 974abbc
commit 691d394
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/Models/Specialization.php b/app/Models/Specialization.php
@@ -89,8 +89,17 @@ public static function findBySpecializationIdWitchField(int $specializationId):
      */
     public static function findBySpecializationIdWitchLegend(int $specializationId): self
     {
-        /** @var self|null $specialization */
-        $specialization = self::query()->with("timetable", "timetable.legend")->where("id", $specializationId)
+        /** @var self|null $specialization
+         * @phpstan-ignore-next-line
+         */
+        $specialization = self::query()
+            ->with([
+                "timetable" => function ($query): void {
+                    $query->where("lecturer", "!=", Timetable::EMPTY_LECTURER);
+                },
+                "timetable.legend",
+            ])
+            ->where("id", $specializationId)
             ->first();
 
         if ($specialization === null) {

diff --git a/app/Models/Timetable.php b/app/Models/Timetable.php
@@ -31,7 +31,7 @@ class Timetable extends Model
 {
     use HasFactory;
 
-    private const EMPTY_LECTURER = "-";
+    public const EMPTY_LECTURER = "-";
 
     protected $table = "timetable";
     protected $guarded = [