Merge remote-tracking branch 'origin/main' into #126-problem-with-dep…

…loyment

# Conflicts:
#	.github/workflows/deploy-to-beta-by-push.yml

.github/workflows/deploy-to-beta-by-push.yml

@@ -6,9 +6,6 @@ concurrency:
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 jobs:
 

app/Actions/ActivateSemesterAction.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Actions;
+namespace Keating\Actions;
 
-use App\Models\Semester;
 use Exception;
 use Illuminate\Database\ConnectionInterface;
+use Keating\Models\Semester;
 
 class ActivateSemesterAction
 {

app/Actions/WuStudentsImport.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Actions;
+namespace Keating\Actions;
 
-use App\Models\Student;
+use Keating\Models\Student;
 
 class WuStudentsImport
 {

app/Console/Commands/FlushCachedPageTitle.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Console\Commands;
+namespace Keating\Console\Commands;
 
 use Illuminate\Cache\CacheManager;
 use Illuminate\Console\Command;

app/DTOs/CourseData.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Keating\DTOs;
+
+use Keating\Enums\ClassType;
+use Keating\Models\Course;
+
+readonly class CourseData
+{
+    public function __construct(
+        public string $id,
+        public string $name,
+        public string $abbreviation,
+        public string $description,
+        public string $semester,
+        public string $type,
+    ) {}
+
+    public static function fromModel(Course $course): self
+    {
+        return new self(
+            id: $course->id,
+            name: $course->name,
+            abbreviation: $course->abbreviation,
+            description: $course->description,
+            semester: $course->getRomanizedSemester(),
+            type: ClassType::labels()[$course->type],
+        );
+    }
+}

app/DTOs/CoursePublicData.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Keating\DTOs;
+
+use Illuminate\Support\Collection;
+use Keating\Enums\ClassType;
+use Keating\Enums\SemesterName;
+use Keating\Models\Course;
+
+readonly class CoursePublicData
+{
+    public function __construct(
+        public string $id,
+        public string $name,
+        public string $abbreviation,
+        public string $slug,
+        public string $description,
+        public string $semester,
+        public string $semesterName,
+        public string $type,
+        public string $typeAbbreviation,
+        public string $field,
+        public string $fieldAbbreviation,
+        public bool $active,
+    ) {}
+
+    public static function fromModel(Course $course, ?Collection $activeSemesters = null): self
+    {
+        return new self(
+            id: $course->id,
+            name: $course->name,
+            abbreviation: $course->abbreviation,
+            slug: $course->slug,
+            description: $course->description,
+            semester: $course->getRomanizedSemester(),
+            semesterName: SemesterName::labels()[$course->semester_name],
+            type: ClassType::labels()[$course->type],
+            typeAbbreviation: ClassType::abbreviationLabels()[$course->type],
+            field: $course->field->name,
+            fieldAbbreviation: $course->field->abbreviation,
+            active: $activeSemesters && ($activeSemesters->contains($course->getRomanizedSemester()) || $activeSemesters->contains($course->semester)),
+        );
+    }
+}

app/DTOs/CourseSemesterData.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Keating\DTOs;
+
+use Keating\Models\CourseSemester;
+
+readonly class CourseSemesterData
+{
+    public function __construct(
+        public string $id,
+        public string $course,
+        public string $semester,
+        public string $semesterId,
+        public int $groupsCount,
+    ) {}
+
+    public static function fromModel(CourseSemester $course): self
+    {
+        return new self(
+            id: $course->id,
+            course: $course->course->name,
+            semester: $course->semester->name,
+            semesterId: $course->semester->id,
+            groupsCount: $course->groups_count ?? $course->groups->count(),
+        );
+    }
+}

app/DTOs/FieldData.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Keating\DTOs;
+
+use Keating\Models\Field;
+
+readonly class FieldData
+{
+    public function __construct(
+        public string $id,
+        public string $name,
+        public string $abbreviation,
+    ) {}
+
+    public static function fromModel(Field $field): self
+    {
+        return new self(
+            id: $field->id,
+            name: $field->name,
+            abbreviation: $field->abbreviation,
+        );
+    }
+}

app/DTOs/GroupData.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Keating\DTOs;
+
+use Keating\Enums\StudyForm;
+use Keating\Models\Group;
+
+readonly class GroupData
+{
+    public function __construct(
+        public string $id,
+        public string $name,
+        public string $formAbbreviation,
+        public string $form,
+    ) {}
+
+    public static function fromModel(Group $group): self
+    {
+        return new self(
+            id: $group->id,
+            name: $group->name,
+            formAbbreviation: StudyForm::abbreviationLabels()[$group->form->value],
+            form: $group->form->value,
+        );
+    }
+}

app/DTOs/StudentData.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace App\DTOs;
+namespace Keating\DTOs;
 
-use App\Models\Grade;
-use App\Models\GradeColumn;
-use App\Models\Student;
 use Illuminate\Support\Collection;
+use Keating\Models\Grade;
+use Keating\Models\GradeColumn;
+use Keating\Models\Student;
 
 readonly class StudentData
 {

app/Enums/ClassType.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Enums;
+namespace Keating\Enums;
 
 enum ClassType: string
 {

app/Enums/Icons.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Enums;
+namespace Keating\Enums;
 
 enum Icons: string
 {

app/Enums/SectionType.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Enums;
+namespace Keating\Enums;
 
 enum SectionType: string
 {

app/Enums/SemesterName.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Enums;
+namespace Keating\Enums;
 
 enum SemesterName: string
 {

app/Enums/StudyForm.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Enums;
+namespace Keating\Enums;
 
 enum StudyForm: string
 {

app/Http/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers;
+namespace Keating\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;

app/Http/Controllers/Dashboard/ContactInfoController.php

@@ -2,18 +2,17 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Dashboard;
+namespace Keating\Http\Controllers\Dashboard;
 
-use App\Enums\Icons;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\ContactInfoRequest;
-use App\Models\ContactInfo;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Inertia\Response;
+use Keating\Enums\Icons;
+use Keating\Http\Requests\ContactInfoRequest;
+use Keating\Models\ContactInfo;
 use Spatie\LaravelOptions\Options;
 
-class ContactInfoController extends Controller
+class ContactInfoController
 {
     public function index(Request $request): Response
     {

app/Http/Controllers/Dashboard/CourseController.php

@@ -2,22 +2,21 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Dashboard;
+namespace Keating\Http\Controllers\Dashboard;
 
-use App\Enums\ClassType;
-use App\Enums\SemesterName;
-use App\Enums\StudyForm;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CourseRequest;
-use App\Http\Resources\CourseResource;
-use App\Http\Resources\FieldResource;
-use App\Models\Course;
-use App\Models\Field;
 use Illuminate\Http\RedirectResponse;
 use Inertia\Response;
+use Keating\DTOs\CourseData;
+use Keating\DTOs\FieldData;
+use Keating\Enums\ClassType;
+use Keating\Enums\SemesterName;
+use Keating\Enums\StudyForm;
+use Keating\Http\Requests\CourseRequest;
+use Keating\Models\Course;
+use Keating\Models\Field;
 use Spatie\LaravelOptions\Options;
 
-class CourseController extends Controller
+class CourseController
 {
     public function index(): Response
     {
@@ -26,7 +25,7 @@ public function index(): Response
             ->get();
 
         return inertia("Dashboard/Course/Index", [
-            "courses" => CourseResource::collection($courses),
+            "courses" => $courses->map(fn(Course $course): CourseData => CourseData::fromModel($course)),
             "total" => Course::query()->count(),
             "lastUpdate" => Course::query()->orderByDesc("updated_at")->first()?->updated_at->diffForHumans(),
         ]);
@@ -42,7 +41,7 @@ public function create(): Response
             "classTypes" => Options::forEnum(ClassType::class)->toArray(),
             "studyForms" => Options::forEnum(StudyForm::class)->toArray(),
             "semesterNames" => Options::forEnum(SemesterName::class)->toArray(),
-            "fields" => FieldResource::collection($fields)->resolve(),
+            "fields" => $fields->map(fn(Field $field) => FieldData::fromModel($field)),
         ]);
     }
 
@@ -66,7 +65,7 @@ public function edit(Course $course): Response
             "classTypes" => Options::forEnum(ClassType::class)->toArray(),
             "studyForms" => Options::forEnum(StudyForm::class)->toArray(),
             "semesterNames" => Options::forEnum(SemesterName::class)->toArray(),
-            "fields" => FieldResource::collection($fields)->resolve(),
+            "fields" => $fields->map(fn(Field $field) => FieldData::fromModel($field)),
         ]);
     }