общий код

app/Exceptions/Handler.php

@@ -2,10 +2,27 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 
 class Handler extends ExceptionHandler
 {
+
+    public function render($request, \Throwable $exception)
+    {
+        if ($exception instanceof ModelNotFoundException) {
+            return response()->json(['message' => 'Not Found'], 404);
+        }
+
+        if ($exception instanceof MethodNotAllowedHttpException) {
+            return response()->json(['message' => 'Not Found'], 404);
+        }
+
+        //return response()->json(['message' => $exception->getMessage()], 404);
+        return parent::render($request, $exception);
+    }
+
     /**
      * A list of the exception types that are not reported.
      *

app/Http/Controllers/Auth/LoginController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
-use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {

app/Http/Controllers/Auth/LogoutController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class LogoutController extends Controller

app/Http/Controllers/Auth/RegisterController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\RegisterRequest;
 
 use App\Models\HeadTeacher;

app/Http/Controllers/BankTaskController.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\BankTaskRequest;
+use App\Models\BankTask;
+use App\Models\Subject;
+use App\Models\Teacher;
+use App\Models\Theme;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\BankTaskFile;
+use Illuminate\Support\Facades\DB;
+
+class BankTaskController extends Controller
+{
+    /**
+     * Получение списка всех заданий из банка заданий
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request, BankTask $tasks)
+    {
+        $count = 10;
+        $tasks = $tasks->newQuery();
+
+        if ($request->has('name')) {
+            $tasks->where('name', 'like', $request->input('name').'%');
+        }
+        if ($request->has('subject_id')) {
+            $tasks->where('subject_id', $request->input('subject_id'));
+        }
+        if ($request->has('theme_id')) {
+            $tasks->where('theme_id', $request->input('theme_id'));
+        }
+
+        if ($request->has('author')) {
+            $tasks->where('author', 'like', $request->input('author').'%');
+        }
+
+        if ($request->has('count')) {
+            $temp = (int)$request->count;
+            if ($temp>0 && $temp<= 100) {
+                $count = $temp;
+            }
+        }
+
+        return response()->json($tasks->orderByDesc('updated_at')->paginate($count), 200);
+    }
+
+    /**
+     * Получение задания
+     *
+     * @param BankTask $banktask
+     * @return JsonResponse
+     */
+    public function show(BankTask $banktask)
+    {
+
+        return response()->json([
+            'task' => $banktask,
+            'files' => BankTaskFile::where('banktask_id', '=', $banktask->id )->get(['id','name', 'type', 'url'])
+        ], 200);
+
+    }
+
+    /**
+     * Создание задания
+     *
+     * @param BankTaskRequest $request
+     * @return JsonResponse
+     */
+    public function store(BankTaskRequest $request)
+    {
+        if (!Subject::find((int)$request->input('subject_id')) ) {
+            return response()->json('Not exist subject', 404);
+        }
+        $banktask = BankTask::create($request->all()); //добавить auth()->user() после добавления регистрации
+        return response()->json($banktask, 200);
+    }
+
+    /**
+     * Обновление задания
+     *
+     * @param Request $request
+     * @param BankTask $banktask
+     * @return JsonResponse
+     */
+    public function update(BankTask $banktask, Request $request)
+    {
+        $request->validate([
+            'theme_id' => 'nullable|integer|gt:0',
+            'subject_id' => 'integer|gt:0',
+        ]);
+        if ($request->has('subject_id') && !Subject::find((int)$request->input('subject_id'))) {
+            return response()->json('Not exist subject', 404);
+        }
+        $banktask->update($request->all());
+        return response()->json($banktask, 200);
+    }
+
+    /**
+     * Удаление задания
+     *
+     * @param BankTask $banktask
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function delete(BankTask $banktask)
+    {
+        $banktask->delete();
+        return response()->json('', 204);
+    }
+
+}

app/Http/Controllers/BankTaskFileController.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\BankTask;
+use http\Env\Response;
+use Illuminate\Http\Request;
+use App\Models\BankTaskFile;
+use Illuminate\Support\Facades\Storage;
+
+
+class BankTaskFileController extends Controller
+{
+    private $image_ext = ['jpg', 'jpeg', 'png', 'gif'];
+    private $file_ext = ['doc', 'docx', 'pdf', 'odt', 'mp3', 'ogg', 'mpga', 'mp4', 'mpeg', 'ppt', 'pptx'];
+
+    public function store(BankTask $banktask, Request $request)
+    {
+        $banktaskId = $banktask->id;
+        $max_size = (int)ini_get('upload_max_filesize') * 1000;
+        $all_ext = implode(',', $this->allExtensions());
+
+        $this->validate($request, [
+            'name' => 'required',
+            'file' => 'required|file|mimes:' . $all_ext . '|max:' . $max_size
+        ]);
+
+        $file = $request->file('file');
+        $ext = $file->getClientOriginalExtension();
+        $type = $this->getType($ext);
+
+        if (Storage::putFileAs('public/banktask/' . $banktaskId . '/' . $type . '/', $file, $request->name)) {
+            BankTaskFile::create([
+                'name' => $request->name,
+                'type' => $type,
+                'extension' => $ext,
+                'banktask_id' => $banktaskId,
+                'url' => '/storage/banktask' . '/' . $banktaskId . '/' . $type . '/' . $request->name, $file, $request->name . $ext
+            ]);
+            return true;
+        }
+        return false;
+    }
+
+    public function showFiles(BankTask $banktask)
+    {
+
+        $banktaskId = $banktask->id;
+        $files = BankTaskFile::where('task_id', '=', $banktaskId)->get();
+
+        return response()->json($files, 200);
+
+    }
+
+    public function download(BankTaskFile $file)
+    {
+        return Storage::download('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name);
+    }
+
+    public function update(BankTaskFile $file, Request $request)
+    {
+
+        $request->validate([
+            'name' => 'required'
+        ]);
+        $old_filename = '/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name;
+        $new_filename = '/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $request->name;
+
+        if (Storage::disk('local')->exists($old_filename)) {
+            if (Storage::disk('local')->move($old_filename, $new_filename)) {
+                $file->name = $request->name;
+                $file->url = '/storage/banktask/' . $file->banktask_id . '/' . $request->type . '/' . $file->name;
+                return response()->json([$file->save(), $file]);
+            }
+        }
+
+        return response()->json(false, 404);
+    }
+
+    public function delete(BankTaskFile $file) {
+        echo $file;
+        if (Storage::disk('local')->exists('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name )) {
+            if (Storage::disk('local')->delete('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete());
+            }
+        }
+        return response()->json(['BankTaskFile not found'], 404);
+    }
+
+
+    private function getType($ext)
+    {
+        if (in_array(strtolower($ext), $this->image_ext)) {
+            return 'image';
+        }
+
+        if (in_array(strtolower($ext), $this->file_ext)) {
+            return 'file';
+        }
+    }
+
+    private function allExtensions()
+    {
+        return array_merge($this->image_ext, $this->file_ext);
+    }
+
+
+
+}

app/Http/Controllers/SchoolClassController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Http\Requests\SchoolClassRequest;
 use App\Models\SchoolClass;
 use App\Models\Teacher;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 
 class SchoolClassController extends Controller
@@ -13,63 +13,50 @@ class SchoolClassController extends Controller
     /**
      * Получение списка всех классов
      *
-     * @return JsonResponse
      */
     public function index()
     {
         return response()->json(SchoolClass::all(), 200);
     }
 
-    /**
+    public function show(SchoolClass $schoolClass)
-     * Получение класса
-     *
-     * @param SchoolClass $class
-     * @return JsonResponse
-     */
-    public function show(SchoolClass $class)
     {
-        return response()->json($class, 200);
+        return response()->json($schoolClass, 200);
     }
 
-    /**
-     * @param SchoolClassRequest $request
-     * @return JsonResponse
-     */
     public function store(SchoolClassRequest $request)
     {
-        $teacher = Teacher::find($request->get('teacher_id'));
+        try {
-        if ($teacher) {
+            $class = SchoolClass::create($request->all());
-            $schoolClass = $teacher->schoolClass()->create($request->all());
+        } catch (QueryException $e) {
-        } else {
+            return response()->json(['message' => 'Уже существует'], 400);
-            $schoolClass = SchoolClass::create($request->all());
         }
-        return response()->json(SchoolClass::find($schoolClass->id), 201);
+        return response()->json(SchoolClass::find($class->id), 201);
     }
 
-    /**
+    public function update(SchoolClass $class, SchoolClassRequest $request)
-     * Обновление класса
-     *
-     * @param SchoolClassRequest $request
-     * @param SchoolClass $class
-     * @return JsonResponse
-     */
-    public function update(SchoolClassRequest $request, SchoolClass $class)
     {
-        $class->update($request->all());
+        try {
+            $class->update($request->all());
+        } catch (QueryException $e) {
+            return response()->json(['message' => 'Уже существует'], 400);
+        }
         return response()->json($class, 200);
     }
 
-
+    public function destroy(SchoolClass $class)
-    /**
-     * Удаление класса
-     *
-     * @param SchoolClass $class
-     * @return JsonResponse
-     * @throws \Exception
-     */
-    public function delete(SchoolClass $class)
     {
         $class->delete();
-        return response()->json('ok', 200);
+        return response()->json('', 204);
     }
+
+    //добавление, изменение классного руководителя
+    public function addClassroomTeacher(SchoolClass $class, Request $request)
+    {
+        $teacher = Teacher::findOrfail((int)$request->input('teacher_id'));
+        $class->classroom_teacher = $teacher->id;
+        $class->save();
+        return response()->json(SchoolClass::find($class->id), 200);
+    }
+
 }

app/Http/Controllers/StudentController.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\StudentRequest;
-use App\Models\Student;
-use Illuminate\Http\JsonResponse;
-
-class StudentController extends Controller
-{
-    /**
-     * Получение списка всех учителей
-     *
-     * @param StudentRequest $request
-     * @return JsonResponse
-     */
-    public function index(StudentRequest $request)
-    {
-        return response()->json(Student::all(), 200);
-    }
-
-    /**
-     * Получение одного учителя
-     *
-     * @param Student $student
-     * @param StudentRequest $request
-     * @return JsonResponse
-     */
-    public function show(Student $student, StudentRequest $request)
-    {
-        return response()->json($student, 200);
-    }
-
-    /**
-     * Обновление учителя
-     *
-     * @param StudentRequest $request
-     * @param Student $student
-     * @return JsonResponse
-     */
-    public function update(StudentRequest $request, Student $student)
-    {
-        $student->update($request->all());
-        return response()->json($student, 200);
-    }
-}

app/Http/Controllers/SubjectController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Controllers;
+
+
+use App\Http\Requests\SubjectRequest;
+use App\Models\Subject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SubjectController extends Controller
+{
+    /**
+     * Получение списка всех предметов
+     *
+     * @return JsonResponse
+     */
+    public function index()
+    {
+        return response()->json(Subject::all()->sortBy('name'), 200);
+    }
+
+    /**
+     * Получение предмета
+     *
+     * @param Subject $subject
+     * @return JsonResponse
+     */
+    public function show(Subject $subject)
+    {
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Создание предмета
+     *
+     * @param SubjectRequest $request
+     * @return JsonResponse
+     */
+    public function store(SubjectRequest $request)
+    {
+        $subject = Subject::create($request->all());
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Обновление предмета
+     *
+     * @param SubjectRequest $request
+     * @param Subject $subject
+     * @return JsonResponse
+     */
+    public function update(Subject $subject, SubjectRequest $request)
+    {
+        $subject->update($request->all());
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Удаление предмета
+     *
+     * @param Subject $subject
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function destroy(Subject $subject)
+    {
+        $subject->delete();
+        return response()->json('', 204);
+
+    }
+}
+

app/Http/Controllers/ThemeController.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Http\Controllers;
+
+
+use App\Http\Requests\ThemeRequest;
+use App\Models\Theme;
+use http\Env\Response;
+use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ThemeController extends Controller
+{
+    /**
+     * Получение списка всех тем
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request)
+    {
+        return response()->json(Theme::all()->sortBy($request->input('sort_by')), 200);
+    }
+
+    /**
+     * Получение темы
+     *
+     * @param Theme $theme
+     * @return JsonResponse
+     */
+    public function show(Theme $theme)
+    {
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Создание темы
+     *
+     * @param ThemeRequest $request
+     * @return JsonResponse
+     */
+    public function store(ThemeRequest $request)
+    {
+        $theme = Theme::create($request->all());
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Обновление темы
+     *
+     * @param Request $request
+     * @param Theme $theme
+     * @return JsonResponse
+     */
+    public function update(Theme $theme, Request $request)
+    {
+        try {
+            $theme->update($request->all());
+        } catch (QueryException $e) {
+            return response()->json('Value can not null', 400);
+        }
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Удаление темы
+     *
+     * @param Theme $theme
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function destroy(Theme $theme)
+    {
+        $theme->delete();
+        return response()->json('', 204);
+
+    }
+}

app/Http/Controllers/Users/HeadTeacherController.php

@@ -1,19 +1,21 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;
 
-use App\Http\Requests\HeadTeacherRequest;
+use App\Http\Controllers\Controller;
 use App\Models\HeadTeacher;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class HeadTeacherController extends Controller
 {
     /**
      * Получение списка всех завучей
      *
+     * @param Request $request
      * @return JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
         return response()->json(HeadTeacher::all(), 200);
     }
@@ -22,6 +24,7 @@ class HeadTeacherController extends Controller
      * Получение одного завуча
      *
      * @param HeadTeacher $headteacher
+     * @param Request $request
      * @return JsonResponse
      */
     public function show(HeadTeacher $headteacher)
@@ -32,11 +35,11 @@ class HeadTeacherController extends Controller
     /**
      * Обновление завуча
      *
-     * @param HeadTeacherRequest $request
+     * @param Request $request
      * @param HeadTeacher $headteacher
      * @return JsonResponse
      */
-    public function update(HeadTeacherRequest $request, HeadTeacher $headteacher)
+    public function update(Request $request, HeadTeacher $headteacher)
     {
         $headteacher->update($request->all());
         return response()->json($headteacher, 200);

app/Http/Controllers/Users/ParenttController.php

@@ -1,19 +1,21 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;
 
-use App\Http\Requests\ParentRequest;
+use App\Http\Controllers\Controller;
 use App\Models\Parentt;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class ParenttController extends Controller
 {
     /**
      * Получение списка всех учителей
      *
+     * @param Request $request
      * @return JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
         return response()->json(Parentt::all(), 200);
     }
@@ -21,7 +23,8 @@ class ParenttController extends Controller
     /**
      * Получение одного учителя
      *
-     * @param Parentt $parent
+     * @param Parentt $student
+     * @param Request $request
      * @return JsonResponse
      */
     public function show(Parentt $parent)
@@ -32,11 +35,11 @@ class ParenttController extends Controller
     /**
      * Обновление учителя
      *
-     * @param ParentRequest $request
+     * @param Request $request
      * @param Parentt $parent
      * @return JsonResponse
      */
-    public function update(ParentRequest $request, Parentt $parent)
+    public function update(Request $request, Parentt $parent)
     {
         $parent->update($request->all());
         return response()->json($parent, 200);

app/Http/Controllers/Users/StudentController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\StudentRequest;
+use App\Models\SchoolClass;
+use App\Models\Student;
+use Illuminate\Http\JsonResponse;
+
+class StudentController extends Controller
+{
+    /**
+     * Получение списка всех учеников
+     *
+     * @return JsonResponse
+     */
+    public function index()
+    {
+        return response()->json(Student::all(), 200);
+    }
+
+    /**
+     * Получение одного ученика
+     *
+     * @param Student $student
+     * @return JsonResponse
+     */
+    public function show(Student $student)
+    {
+        return response()->json($student, 200);
+    }
+
+    /**
+     * Создание ученика
+     *
+     * @param StudentRequest $request
+     * @return JsonResponse
+     */
+    /*public function store(StudentRequest $request)
+    {
+        $student = Student::creat($request->all());
+        return response()->json($student, 200);
+    }*/
+
+    /**
+     * Обновление ученика
+     *
+     * @param StudentRequest $request
+     * @param Student $student
+     * @return JsonResponse
+     */
+    public function update(StudentRequest $request, Student $student)
+    {
+        $prev_class = $student->schoolClass;
+        if ($prev_class) {
+            $prev_class->count_students -= 1;
+            $prev_class->save();
+        }
+
+        $new_class = SchoolClass::findOrfail((int)$request->input('class_id'));
+        $student->update($request->all());
+
+        $new_class->count_students++;
+        $new_class->save();
+        return response()->json(collect($student)->except('school_class'), 200);
+    }
+}

app/Http/Controllers/Users/TeacherController.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;
 
-use App\Http\Requests\TeacherRequest;
+use App\Http\Controllers\Controller;
-use App\Models\SchoolClass;
 use App\Models\Teacher;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -13,10 +12,10 @@ class TeacherController extends Controller
     /**
      * Получение списка всех учителей
      *
-     * @param TeacherRequest $request
+     * @param Request $request
      * @return JsonResponse
      */
-    public function index()
+    public function index(Request $request)
     {
         return response()->json(Teacher::all(), 200);
     }
@@ -25,10 +24,10 @@ class TeacherController extends Controller
      * Получение одного учителя
      *
      * @param Teacher $teacher
-     * @param TeacherRequest $request
+     * @param Request $request
      * @return JsonResponse
      */
-    public function show(Teacher $teacher)
+    public function show(Teacher $teacher, Request $request)
     {
         return response()->json($teacher, 200);
     }
@@ -36,11 +35,11 @@ class TeacherController extends Controller
     /**
      * Обновление учителя
      *
-     * @param TeacherRequest $request
+     * @param Request $request
      * @param Teacher $teacher
      * @return JsonResponse
      */
-    public function update(TeacherRequest $request, Teacher $teacher)
+    public function update(Request $request, Teacher $teacher)
     {
         $teacher->update($request->all());
         return response()->json($teacher, 200);

app/Http/Requests/BankTaskRequest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests;
+
+
+class BankTaskRequest extends ApiFormRequest
+{
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required',
+            'author' => 'required|max:128',
+            'short_description' => 'required',
+            'theme_id' => 'nullable|integer|gt:0',
+            'subject_id' => 'required|integer|gt:0'
+        ];
+    }
+}

app/Http/Requests/SchoolClassRequest.php

@@ -2,8 +2,6 @@
 
 namespace App\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
-
 class SchoolClassRequest extends ApiFormRequest
 {
     /**
@@ -13,11 +11,12 @@ class SchoolClassRequest extends ApiFormRequest
      */
     public function rules()
     {
+
         return [
             'number' => 'required|integer|between:1,11',
-            'letter' => 'required|max:1',
+            'letter' => 'required|max:1|regex:/[а-я]/',
-            'count_students' => 'required|integer',
             'profile' => 'required',
         ];
     }
+
 }

app/Http/Requests/StudentRequest.php

@@ -2,9 +2,7 @@
 
 namespace App\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
+class StudentRequest extends ApiFormRequest
-
-class StudentRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -14,9 +12,7 @@ class StudentRequest extends FormRequest
     public function rules()
     {
         return [
-            'date_of_birth' => 'date_format:Y/m/d|before:today|after:1900-01-01',
+            'class_id' => 'required|integer|gt:0',
-            'phone_number' => 'regex:/^\+?7\d{10}$/',
-            'class_id' => 'integer|gt:0',
         ];
     }
 }

app/Http/Requests/SubjectRequest.php

@@ -2,7 +2,8 @@
 
 namespace App\Http\Requests;
 
-class HeadTeacherRequest extends ApiFormRequest
+
+class SubjectRequest extends ApiFormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -12,8 +13,7 @@ class HeadTeacherRequest extends ApiFormRequest
     public function rules()
     {
         return [
-            'date_of_birth' => 'date_format:Y/m/d|before:today|after:1900-01-01',
+            'name' => 'required|unique:subjects',
-            'phone_number' => 'regex:/^\+?7\d{10}$/',
         ];
     }
 }

app/Http/Requests/TeacherRequest.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class TeacherRequest extends ApiFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'date_of_birth' => 'date_format:Y/m/d|before:today|after:1900-01-01',
-            'phone_number' => 'regex:/^\+?7\d{10}$/',
-        ];
-    }
-}

app/Http/Requests/ThemeRequest.php

@@ -4,8 +4,9 @@ namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ParentRequest extends FormRequest
+class ThemeRequest extends ApiFormRequest
 {
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -14,8 +15,8 @@ class ParentRequest extends FormRequest
     public function rules()
     {
         return [
-            'date_of_birth' => 'date_format:Y/m/d|before:today|after:1900-01-01',
+            'name' => 'required',
-            'phone_number' => 'regex:/^\+?7\d{10}$/',
+            'variant' => 'required',
         ];
     }
 }

app/Models/BankTask.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class BankTask extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [
+        'user_id',
+    ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function subject()
+    {
+        return $this->belongsTo(Subject::class);
+    }
+
+    public function theme()
+    {
+        return $this->belongsTo(Theme::class);
+    }
+
+}

app/Models/BankTaskFile.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class BankTaskFile extends Model
+{
+    use HasFactory;
+    protected $table = 'bank_tasks_files';
+    protected $fillable = ['name', 'type', 'extension', 'url', 'banktask_id'];
+}

app/Models/HeadTeacher.php

@@ -4,13 +4,12 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Validator;
 
 class HeadTeacher extends Model
 {
     use HasFactory;
 
-    protected $fillable = [
+    protected $guarded = [
         'user_id',
     ];
 

app/Models/Parentt.php

@@ -10,7 +10,7 @@ class Parentt extends Model
 {
     use HasFactory;
 
-    protected $fillable = [
+    protected $guarded = [
         'user_id',
     ];
 

app/Models/SchoolClass.php

@@ -12,12 +12,11 @@ class SchoolClass extends Model
     protected $fillable = [
         'number',
         'letter',
-        'count_students',
         'profile',
     ];
 
-    public function teacher()
+    public function students()
     {
-        return $this->belongsTo(Teacher::class, 'classroom_teacher');
+        return $this->hasMany(Student::class);
     }
 }

app/Models/Student.php

@@ -10,7 +10,14 @@ class Student extends Model
 {
     use HasFactory;
 
-    protected $fillable = [
+    protected $guarded = [
         'user_id',
+        'updated_at',
     ];
+
+    public function schoolClass()
+    {
+        return $this->belongsTo(SchoolClass::class, 'class_id');
+    }
+
 }

app/Models/Subject.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Subject extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'name',
+    ];
+
+    public function banktasks()
+    {
+        return $this->hasMany(BankTask::class);
+    }
+}

app/Models/Teacher.php

@@ -10,7 +10,7 @@ class Teacher extends Model
 {
     use HasFactory;
 
-    protected $fillable = [
+    protected $guarded = [
         'user_id',
     ];
 
@@ -18,4 +18,5 @@ class Teacher extends Model
     {
         return $this->hasOne(SchoolClass::class, 'classroom_teacher');
     }
+
 }

app/Models/Theme.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Theme extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'name',
+        'variant'
+    ];
+
+    public function banktaks()
+    {
+        return $this->hasMany(BankTask::class);
+    }
+}

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
+
 class AppServiceProvider extends ServiceProvider
 {
     /**
@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+
     }
 }

app/Providers/RouteServiceProvider.php

@@ -38,7 +38,8 @@ class RouteServiceProvider extends ServiceProvider
         $this->configureRateLimiting();
 
         $this->routes(function () {
-            Route::middleware('api')
+            Route::prefix('/api')
+                ->middleware('api')
                 ->namespace($this->namespace)
                 ->group(base_path('routes/api.php'));
 

config/app.php

@@ -204,7 +204,7 @@ return [
         'DB' => Illuminate\Support\Facades\DB::class,
         'Eloquent' => Illuminate\Database\Eloquent\Model::class,
         'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
+        'BankTaskFile' => Illuminate\Support\Facades\File::class,
         'Gate' => Illuminate\Support\Facades\Gate::class,
         'Hash' => Illuminate\Support\Facades\Hash::class,
         'Http' => Illuminate\Support\Facades\Http::class,

config/filesystems.php

@@ -46,6 +46,16 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'permissions' => [
+                'file' => [
+                    'public' => 0664,
+                    'private' => 0600,
+                ],
+                'dir' => [
+                    'public' => 0775,
+                    'private' => 0600,
+                ]
+            ]
         ],
 
         'public' => [
@@ -53,6 +63,16 @@ return [
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
+            'permissions' => [
+                'file' => [
+                    'public' => 0664,
+                    'private' => 0600,
+                ],
+                'dir' => [
+                    'public' => 0775,
+                    'private' => 0600,
+                ]
+            ]
         ],
 
         's3' => [

config/session.php

@@ -50,7 +50,7 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Session File Location
+    | Session BankTaskFile Location
     |--------------------------------------------------------------------------
     |
     | When using the native session driver, we need a location where session

database/migrations/2020_11_17_152940_create_teachers_table.php

@@ -17,15 +17,11 @@ class CreateTeachersTable extends Migration
             $table->id();
             $table->unsignedBigInteger('user_id');
             $table->string('photo')->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('name')->nullable();
-            $table->string('second_name')->nullable();
+            $table->string('surname')->nullable();
-            $table->string('middle_name')->nullable();
+            $table->string('patronymic')->nullable();
-            $table->date('date_of_birth')->nullable();
+            $table->string('specialization')->nullable();
-            $table->string('phone_number')->nullable();
+            $table->string('information_about_me')->nullable();
-            $table->string('address')->nullable();
-            $table->string('passport')->nullable();
-            $table->string('qualification')->nullable();
-            $table->unsignedTinyInteger('experience')->nullable();
             $table->timestamps();
 
             $table->foreign('user_id')

database/migrations/2020_11_17_153838_create_school_classes_table.php

@@ -17,7 +17,7 @@ class CreateSchoolClassesTable extends Migration
             $table->id();
             $table->unsignedTinyInteger('number');
             $table->string('letter', 1);
-            $table->unsignedTinyInteger('count_students');
+            $table->unsignedTinyInteger('count_students')->default(0);
             $table->string('profile');
             $table->unsignedInteger('classroom_teacher')->nullable();
             $table->timestamps();
@@ -25,6 +25,8 @@ class CreateSchoolClassesTable extends Migration
             $table->foreign('classroom_teacher')
                 ->references('id')->on('teachers')
                 ->onDelete('set null');
+
+            $table->unique(['number', 'letter']);
         });
     }
 

database/migrations/2020_11_17_162258_create_parents_table.php

@@ -17,15 +17,10 @@ class CreateParentsTable extends Migration
             $table->id();
             $table->unsignedBigInteger('user_id');
             $table->string('photo')->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('name')->nullable();
-            $table->string('second_name')->nullable();
+            $table->string('surname')->nullable();
-            $table->string('middle_name')->nullable();
+            $table->string('patronymic')->nullable();
-            $table->date('date_of_birth')->nullable();
+            $table->string('information_about_me')->nullable();
-            $table->string('phone_number')->nullable();
-            $table->string('address')->nullable();
-            $table->string('passport')->nullable();
-            $table->string('place_of_work')->nullable();
-            $table->string('position_at_work')->nullable();
             $table->timestamps();
 
             $table->foreign('user_id')

database/migrations/2020_11_17_164043_create_students_table.php

@@ -17,14 +17,11 @@ class CreateStudentsTable extends Migration
             $table->id();
             $table->unsignedBigInteger('user_id');
             $table->string('photo')->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('name')->nullable();
-            $table->string('second_name')->nullable();
+            $table->string('surname')->nullable();
-            $table->string('middle_name')->nullable();
+            $table->string('patronymic')->nullable();
-            $table->date('date_of_birth')->nullable();
+            $table->unsignedInteger('class_id')->nullable();
-            $table->string('phone_number')->nullable();
+            $table->string('information_about_me')->nullable();
-            $table->string('address')->nullable();
-            $table->string('passport_or_certificate')->nullable();
-            $table->unsignedBigInteger('class_id')->nullable();
             $table->timestamps();
 
             $table->foreign('user_id')

database/migrations/2020_11_17_171010_create_head_teachers_table.php

@@ -17,14 +17,10 @@ class CreateHeadTeachersTable extends Migration
             $table->id();
             $table->unsignedBigInteger('user_id');
             $table->string('photo')->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('name')->nullable();
-            $table->string('second_name')->nullable();
+            $table->string('surname')->nullable();
-            $table->string('middle_name')->nullable();
+            $table->string('patronymic')->nullable();
-            $table->date('date_of_birth')->nullable();
+            $table->string('information_about_me')->nullable();
-            $table->string('phone_number')->nullable();
-            $table->string('address')->nullable();
-            $table->string('passport')->nullable();
-            $table->string('activity')->nullable();
             $table->unsignedTinyInteger('experience')->nullable();
             $table->timestamps();
 

database/migrations/2020_12_03_103635_create_themes_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateThemesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('themes', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('variant');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('themes');
+    }
+}

database/migrations/2020_12_03_103729_create_subjects_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateSubjectsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('subjects', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->unique();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('subjects');
+    }
+}

database/migrations/2020_12_03_104018_create_bank_tasks_table.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateBankTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('bank_tasks', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('short_description');
+            $table->text('description')->nullable();
+            $table->string('author', 128)->nullable();
+            $table->unsignedInteger('theme_id')->nullable();
+            $table->unsignedInteger('subject_id');
+            $table->timestamps();
+
+
+
+            $table->foreign('theme_id')
+                ->references('id')->on('themes')
+                ->onDelete('cascade');
+
+            $table->foreign('subject_id')
+                ->references('id')->on('subjects')
+                ->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('bank_tasks');
+    }
+}

database/migrations/2020_12_03_104028_create_bank_task_files_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateBankTaskFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('bank_tasks_files', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->string('type');
+            $table->string('extension');
+            $table->string('url', 400);
+            $table->timestamps();
+            $table->unsignedInteger('banktask_id');
+            $table->foreign('banktask_id')
+                ->references('id')->on('bank_tasks')
+                ->onDelete('no action');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('bank_tasks_files');
+    }
+}

routes/api.php

@@ -2,96 +2,38 @@
 
 use Illuminate\Support\Facades\Route;
 
-/*
-|--------------------------------------------------------------------------
-| API Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register API routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| is assigned the "api" middleware group. Enjoy building your API!
-|
-*/
 
 Route::group(['prefix' => 'auth'], function () {
-    Route::post('register', 'RegisterController');
+    Route::post('register', 'Auth\RegisterController');
-    Route::post('login', 'LoginController');
+    Route::post('login', 'Auth\LoginController');
-    Route::post('logout', 'LogoutController');
+    Route::post('logout', 'Auth\LogoutController');
 });
 
-Route::group(['prefix' => 'users'], function () {
+Route::apiResource('headteachers', 'Users\HeadTeacherController');
-    Route::group(['prefix' => 'headteachers'], function () {
-        Route::get('', 'HeadTeacherController@index'); //получение списка всех завучей
-        Route::get('{headteacher}', 'HeadTeacherController@show'); //получение завуча
-        Route::put('{headteacher}', 'HeadTeacherController@update')
-            ->middleware('role:headteacher'); //обновление завуча
-    });
 
-    Route::group(['prefix' => 'teachers'], function () {
+Route::apiResource('teachers', 'Users\TeacherController');
-        Route::get('', 'TeacherController@index'); //получение списка всех учителей
-        Route::get('{teacher}', 'TeacherController@show'); //получение учителя
-        Route::put('{teacher}', 'TeacherController@update')
-            ->middleware(['role:headteacher|teacher']); //обновление учителя
-    });
 
-    Route::group(['prefix' => 'students'], function () {
+Route::apiResource('students', 'Users\StudentController');
-        Route::get('', 'StudentController@index'); //получение списка всех учеников
-        Route::get('{student}', 'StudentController@show'); //получение ученика
-        Route::put('{student}', 'StudentController@update')
-            ->middleware(['role:headteacher|teacher|student']); //обновление ученика
-    });
 
-    Route::group(['prefix' => 'parents'], function () {
+Route::apiResource('parents', 'Users\ParenttController');
-        Route::get('', 'ParenttController@index'); //получение списка всех родителей
+
-        Route::get('{parent}', 'ParenttController@show'); //получение родителя
+Route::apiResource('subjects', 'SubjectController');
-        Route::put('{parent}', 'ParenttController@update')
+
-            ->middleware(['role:headteacher|teacher|parent']); //обновление родителя
+Route::apiResource('classes', 'SchoolClassController');
-    });
+Route::post('classes/{class}/teacher', 'SchoolClassController@addClassroomTeacher');
+
+Route::apiResource('themes', 'ThemeController');
+
+Route::get('banktasks', 'BankTaskController@index'); //получение списка всех заданий
+Route::group(['prefix' => 'banktask'], function () {
+    Route::post('', 'BankTaskController@store'); //создание задания
+    Route::get('{banktask}', 'BankTaskController@show'); //получение задания
+    Route::put('{banktask}', 'BankTaskController@update'); //обновление задания
+    Route::delete('{banktask}', 'BankTaskController@delete'); //удаление задания
+    Route::post('{banktask}/addfile', 'BankTaskFileController@store');
+    Route::get('{banktask}/files', 'BankTaskFileController@showFiles');
 });
 
-Route::group(['prefix' => 'classes', 'middleware' => 'role:headteacher'], function () {
+Route::get('/file/{file}/download', 'BankTaskFileController@download');
-    Route::get('', 'SchoolClassController@index'); //получение списка всех классов
+Route::delete('/file/{file}/delete', 'BankTaskFileController@delete');
-    Route::get('{schoolClass}', 'SchoolClassController@show'); //получение класса
+Route::put('/file/{file}/update', 'BankTaskFileController@update');
-    Route::post('', 'SchoolClassController@store'); //создание класса
-    Route::put('{schoolClass}', 'SchoolClassController@update'); //обновление класса
-});
-
-Route::group(['prefix' => 'tasks', 'middleware' => 'role:headteacher|teacher'], function () {
-    Route::get('', 'TaskController@allTasks');    // Просмотреть все задания(неоптимизированно)
-    Route::get('{task}', 'TaskController@showTask'); // Посмотреть задание {id}
-    Route::post('', 'TaskController@createTask'); // Добавить новое задание
-    Route::put('task}', 'TaskController@editTask'); // Изменить задание {id}
-    Route::delete('{task}', 'TaskController@deleteTask'); // Удалить задание {id}
-});
-
-
-//Route::get('headteachers', 'HeadTeacherController@index'); //получение списка всех завучей
-//Route::group(['prefix' => 'profile/headteacher'], function () {
-//    Route::get('{headteacher}', 'HeadTeacherController@show'); //получение завуча
-//    Route::put('{headteacher}', 'HeadTeacherController@update'); //обновление завуча
-//});
-//
-//Route::get('teachers', 'TeacherController@index'); //получение списка всех учителей
-//Route::group(['prefix' => 'profile/teacher'], function () {
-//    Route::get('{teacher}', 'TeacherController@show'); //получение учителя
-//    Route::put('{teacher}', 'TeacherController@update'); //обновление учителя
-//});
-//
-//Route::get('students', 'StudentController@index'); //получение списка всех завучей
-//Route::group(['prefix' => 'profile/student'], function () {
-//    Route::get('{student}', 'StudentController@show'); //получение завуча
-//    Route::put('{student}', 'StudentController@update'); //обновление завуча
-//});
-//
-//Route::get('parents', 'ParenttController@index'); //получение списка всех родителей
-//Route::group(['prefix' => 'profile/parent'], function () {
-//    Route::get('{parent}', 'ParenttController@show'); //получение родителя
-//    Route::put('{parent}', 'ParenttController@update'); //обновление родителя
-//});
-//
-//Route::get('classes', 'SchoolClassController@index'); //получение списка всех классов
-//Route::group(['prefix' => 'class'], function () {
-//    Route::post('', 'SchoolClassController@store'); //создание класса
-//    Route::get('{schoolClass}', 'SchoolClassController@show'); //получение класса
-//    Route::put('{schoolClass}', 'SchoolClassController@update'); //обновление класса
-//});