From 127da069bd14fbd2224b388de30a9afdfd6ebb1e Mon Sep 17 00:00:00 2001
From: nikden13 <denisovnik99@mail.ru>
Date: Wed, 9 Dec 2020 23:30:11 +0700
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/TimetableController.php | 30 ++++++--------------
 app/Http/Requests/TimetableRequest.php       | 13 ++++-----
 routes/api.php                               |  6 ++--
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/TimetableController.php b/app/Http/Controllers/TimetableController.php
index 1496f43..964dbf0 100644
--- a/app/Http/Controllers/TimetableController.php
+++ b/app/Http/Controllers/TimetableController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Filters\TimetableFilter;
 use App\Http\Requests\TimetableRequest;
-use App\Models\SchoolClass;
 use App\Models\Timetable;
 use Carbon\Carbon;
 use Illuminate\Database\QueryException;
@@ -13,7 +12,7 @@ use Illuminate\Http\Request;
 class TimetableController extends Controller
 {
 
-    //Получение расписания
+    //Получение расписания на неделю
     public function index(Request $request)
     {
         $request->validate([
@@ -53,31 +52,20 @@ class TimetableController extends Controller
         return response()->json($timetable, 200);
     }
 
-    //создание расписания
+    //создание урока
     public function store(TimetableRequest $request)
     {
-        foreach($request->input('timetables') as $timetable) {
-            try {
-                Timetable::create($timetable);
-            }catch (QueryException $e) {
-                return response()->json(['message' => 'Not found class, teacher or subject'], 400);
-            }
+        try {
+            Timetable::create($request->all());
+        }catch (QueryException $e) {
+            return response()->json(['message' => 'Not found class, teacher or subject'], 400);
         }
-
         return response()->json(['message' => 'Timetable was created'], 201);
     }
 
-    //обновление расписания
-    public function update(Timetable $timetable, Request $request)
+    //обновление урока
+    public function update(TimetableRequest $timetable, Request $request)
     {
-        $request->validate([
-            'class_id' => 'required|integer|gt:0',
-            'teacher_id' => 'required|integer|gt:0',
-            'subject_id' => 'required|integer|gt:0',
-            'date' => 'required|date_format:Y/m/d|',
-            'time_start' => 'required|date_format:H:i',
-            'time_end' => 'required|date_format:H:i|after:time_start',
-        ]);
         try {
             $timetable->update($request->all());
         }catch (QueryException $e) {
@@ -86,7 +74,7 @@ class TimetableController extends Controller
         return response()->json(['message' => 'Timetable was updated'], 200);
     }
 
-    //удаление расписания
+    //удаление урока
     public function destroy(Timetable $timetable)
     {
         $timetable->delete();
diff --git a/app/Http/Requests/TimetableRequest.php b/app/Http/Requests/TimetableRequest.php
index 8cd1c71..175a9c3 100644
--- a/app/Http/Requests/TimetableRequest.php
+++ b/app/Http/Requests/TimetableRequest.php
@@ -13,13 +13,12 @@ class TimetableRequest extends ApiFormRequest
     public function rules()
     {
         return [
-            'timetables' => 'required|array',
-            'timetables.*.class_id' => 'required|integer|gt:0',
-            'timetables.*.teacher_id' => 'required|integer|gt:0',
-            'timetables.*.subject_id' => 'required|integer|gt:0',
-            'timetables.*.date' => 'required|date_format:Y/m/d|',
-            'timetables.*.time_start' => 'required|date_format:H:i',
-            'timetables.*.time_end' => 'required|date_format:H:i',
+            'class_id' => 'required|integer|gt:0',
+            'teacher_id' => 'required|integer|gt:0',
+            'subject_id' => 'required|integer|gt:0',
+            'date' => 'required|date_format:Y/m/d|',
+            'time_start' => 'required|date_format:H:i',
+            'time_end' => 'required|date_format:H:i',
         ];
     }
 }
diff --git a/routes/api.php b/routes/api.php
index fd9aab8..94e2235 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -12,7 +12,7 @@ Route::group(['prefix' => 'auth'], function () {
 Route::apiResource('headteachers', 'Users\HeadTeacherController');
 
 Route::apiResource('teachers', 'Users\TeacherController');
-Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses');
+Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses'); //получить классы у которых ведет учитель
 
 Route::apiResource('students', 'Users\StudentController');
 
@@ -22,8 +22,8 @@ Route::apiResource('subjects', 'SubjectController');
 
 Route::apiResource('classes', 'SchoolClassController');
 Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher');
-Route::get('classes/{class}/students', 'SchoolClassController@getStudents');
-Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects');
+Route::get('classes/{class}/students', 'SchoolClassController@getStudents'); //все ученики класса
+Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects'); //все предметы класса
 
 Route::apiResource('themes', 'ThemeController');