#11 - wip: some fixes and updates

blumilksoftware · Oct 7, 2023 · 08e79a6 · 08e79a6
1 parent d1bdb8f
commit 08e79a6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 7 deletions.
diff --git a/app/Http/Controllers/Dashboard/CourseSemesterController.php b/app/Http/Controllers/Dashboard/CourseSemesterController.php
@@ -44,7 +44,7 @@ public function store(CourseSemesterRequest $request): RedirectResponse
         CourseSemester::query()->create($request->getData());
 
         return redirect()
-            ->route("course.semester..index")
+            ->route("course.semester.index")
             ->with("success", "Dodano kurs");
     }
 

diff --git a/app/Http/Controllers/Dashboard/GroupController.php b/app/Http/Controllers/Dashboard/GroupController.php
@@ -14,22 +14,23 @@ class GroupController extends Controller
 {
     public function store(GroupRequest $request, CourseSemester $course): RedirectResponse
     {
-        $course->groups()->create(["name" => $request->get("name")]);
+        $course->groups()->create($request->validated());
 
         return redirect()->back()
             ->with("success", "Dodano grupę");
     }
 
     public function update(GroupRequest $request, CourseSemester $course, Group $group): RedirectResponse
     {
-        $group->update(["name" => $request->get("name")]);
+        $group->update($request->validated());
 
         return redirect()->back()
             ->with("success", "Zaktualizowano grupę");
     }
 
     public function destroy(CourseSemester $course, Group $group): RedirectResponse
     {
+        $group->students()->detach($group->students);
         $group->delete();
 
         return redirect()->back()

diff --git a/app/Http/Controllers/Dashboard/GroupStudentController.php b/app/Http/Controllers/Dashboard/GroupStudentController.php
@@ -45,7 +45,7 @@ public function index(Request $request, CourseSemester $course, Group $group): R
 
     public function store(Request $request, CourseSemester $course, Group $group): RedirectResponse
     {
-        $group->students()->sync($request->get("student"), "false");
+        $group->students()->sync($request->get("student"), false);
 
         return redirect()->back()
             ->with("success", "Dodano studenta");

diff --git a/app/Http/Resources/CourseSemesterResource.php b/app/Http/Resources/CourseSemesterResource.php
@@ -20,7 +20,7 @@ public function toArray(Request $request): array
             "id" => $course->id,
             "course" => $course->course->name,
             "semester" => $course->semester->name,
-            "form" => StudyForm::labels()[$course->form],
+            "form" => StudyForm::labels()[$course->form->value],
         ];
     }
 }
diff --git a/app/Models/CourseSemester.php b/app/Models/CourseSemester.php
@@ -17,7 +17,7 @@
  * @property string $name
  * @property string $course_id
  * @property string $semester_id
- * @property string $form
+ * @property StudyForm $form
  * @property Course $course
  * @property Semester $semester
  * @property Carbon $created_at

diff --git a/resources/js/Pages/Dashboard/CourseSemester/Index.vue b/resources/js/Pages/Dashboard/CourseSemester/Index.vue
@@ -73,7 +73,7 @@ const courseToDeleteId = ref(0)
                 {{ course.semester }}
               </TableCell>
               <TableCell>
-                {{ course.type }}
+                {{ course.form }}
               </TableCell>
               <TableCell class="flex justify-end gap-2">
                 <Button :href="`/dashboard/course-semester/${course.id}`">

diff --git a/tests/Feature/GroupTest.php b/tests/Feature/GroupTest.php
@@ -135,4 +135,26 @@ public function testStudentCanBeRemovedFromStudentGroup(): void
         $group->refresh();
         $this->assertCount(0, $group->students);
     }
+
+    public function testStudentsAreDetachedBeforeStudentGroupDeleting(): void
+    {
+        $group = Group::factory()->create();
+        $students = Student::factory(10)->create();
+        $this->assertCount(0, $group->students);
+        $this->assertDatabaseCount("groups", 1);
+
+        $this->post(
+            "/dashboard/course-semester/{$group->course_semester_id}/groups/{$group->id}/students",
+            [
+                "student" => $students->pluck("id"),
+            ],
+        )->assertSessionHasNoErrors();
+
+        $this->assertDatabaseCount("student_group", 10);
+
+        $this->delete("/dashboard/course-semester/{$group->course_semester_id}/groups/{$group->id}");
+
+        $this->assertDatabaseCount("student_group", 0);
+        $this->assertDatabaseCount("groups", 0);
+    }
 }