модуль Задания(почти готов)

app/Http/Controllers/AnswerToTaskController.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\AnswerToTask;
+use Illuminate\Http\Request;
+use App\Models\Task;
+use Illuminate\Support\Facades\Auth;
+use App\Models\Student;
+use App\Models\TaskFile;
+
+class AnswerToTaskController extends Controller
+{
+    public function store(Task $task, Request $request) {
+        $input = $request->all();
+        $input->class_id = $task->class_id;  // Не работает
+        $input->student_id = Student::where('user_id', '=', Auth::id())->get(['id']);       // Не работает
+
+        $answer = AnswerToTask::create($input);
+        return response()->json($answer, 201);
+
+    }
+
+    public function show(Task $task, Student $student) {
+        $answer = AnswerToTask::where([
+            ['student_id', '=', $student->id],
+            ['task_id', '=', $task->id]
+        ])->get();
+        $file = TaskFile::where([
+            ['student_id', '=', $student->id],
+            ['task_id', '=', $task->id]
+                                ])
+            ->get(['id','name', 'type', 'url']);
+
+        return response()->json([
+            'answer' => $answer,
+            'files' =>  $file
+        ],200);
+    }
+
+    public function delete(AnswerToTask $answer){
+        $answer->delete();
+
+        return response()->json(true, 204);
+    }
+
+    public function update(AnswerToTask $answer, Request $request) {
+        $answer->description = $request->input('description');
+        $answer->save();
+
+        return $answer;
+
+    }
+
+}

app/Http/Controllers/BankTask/BankTaskController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\BankTask;
 
 use App\Http\Requests\BankTaskRequest;
 use App\Models\BankTask;
@@ -12,6 +12,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Models\BankTaskFile;
 use Illuminate\Support\Facades\DB;
+use App\Http\Controllers\Controller;
 
 class BankTaskController extends Controller
 {
@@ -27,7 +28,7 @@ class BankTaskController extends Controller
         $tasks = $tasks->newQuery();
 
         if ($request->has('name')) {
-            $tasks->where('name', 'like', $request->input('name').'%');
+            $tasks->where('name', 'ilike', $request->input('name').'%');
         }
         if ($request->has('subject_id')) {
             $tasks->where('subject_id', $request->input('subject_id'));
@@ -37,7 +38,7 @@ class BankTaskController extends Controller
         }
 
         if ($request->has('author')) {
-            $tasks->where('author', 'like', $request->input('author').'%');
+            $tasks->where('author', 'ilike', $request->input('author').'%');
         }
 
         if ($request->has('count')) {

app/Http/Controllers/BankTask/BankTaskFileController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\BankTask;
 
 use App\Models\BankTask;
 use http\Env\Response;
 use Illuminate\Http\Request;
 use App\Models\BankTaskFile;
 use Illuminate\Support\Facades\Storage;
+use App\Http\Controllers\Controller;
 
 
 class BankTaskFileController extends Controller

app/Http/Controllers/BankTask/SubjectController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\BankTask;
 
 
 use App\Http\Requests\SubjectRequest;
 use App\Models\Subject;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 class SubjectController extends Controller
 {

app/Http/Controllers/BankTask/ThemeController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\BankTask;
 
 
 use App\Http\Requests\ThemeRequest;
@@ -9,6 +9,7 @@ use http\Env\Response;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 class ThemeController extends Controller
 {

app/Http/Controllers/TaskController.php

@@ -2,60 +2,88 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\AnswerToTask;
+use App\Models\SchoolClass;
+use App\Models\Student;
 use Illuminate\Http\Request;
 use App\Models\Task;
+use App\Http\Requests\TaskRequest;
+use App\Models\TaskHistory;
+use Illuminate\Support\Facades\Auth;
+use App\Models\TaskFile;
+use App\Models\Teacher;
 
 class TaskController extends Controller
+
 {
-    public function createTask(Request $request)
+    public function index(Request $request) {
-    {
+
+        return Task::where('class_id', '=', $request->class_id);
+    }
+
+    public function store(TaskRequest $request) {
+        $class = SchoolClass::find(1);
+        $teacherId = 1; // Auth()->id();
+        $newTask = $class->tasks()->create($request->all() + ['teacher_id' => $teacherId]);
+
+
+        return response()->json($newTask, 201);
+    }
+
+    public function addbanktask(Task $task, Request $request) {
+        $temp = new TaskHistory();
+        $temp->task_id = $task->id;
+        $temp->banktask_id = $request->input('banktask_id');      // Баг - можно впихнуть 2 одинаковых задания из банка задач в один таск
+
+        $temp->save();
+
+            return response()->json($temp, 201);
+    }
+
+    public function show(Task $task) {
+        $file = TaskFile::where([
+            ['task_id', '=', $task->id],
+            ['add_by_teacher', '=', '1']
+            ])->get(['id', 'name', 'type', 'url', 'user_id']);
+        return response()->json([
+            'task' => $task,
+            'files' => $file
+
+                                ], 200);
+    }
+
+    public function delete(Task $task) {
+        $task->delete();
+
+        return response()->json(true, 200);
+    }
+
+    public function update(Task $task, TaskRequest $request) {
         $request->validate([
-            'name' => 'required|min:5|max:100',
+                               'name' => 'required|min:5:max:100',
-            'subject_id' => 'required'
                            ]);
+    $task->update($request->all());
+//        $task->name = $request->input('name');
+//        $task->description = $request->input('description');
 
-        $add_new = new Task;
-        $add_new->name = $request->input('name');
-        $add_new->description = $request->input('description');
-        $add_new->subject_id = $request->input('subject_id');
-        $add_new->path_to_task = $request->input('path_to_task');
-        $add_new->save();
-
-        return Task::findOrFail($add_new->id);
-
-    }
-
-    public function index()
-    {
-        return Task::all(); // Здесь наверное лучше выводить только задания по конкретному предмету
-                            // Добавить сортировку
-    }
-
-    public function showTask($taskId)
-    {
-        return Task::where('id', '=', $taskId)->get();
-    }
-
-    public function editTask(Task $task, Request $request)
-    {
-        $request->validate([
-            'name' => 'required|min:5:max:100',
-            'subject_id' => 'required'
-                           ]);
-
-        $task->name = $request->input('name');
-        $task->description = $request->input('description');
-        $task->path_to_task = $request->input('path_to_task');
 
         $task->save();
 
         return Task::where('id', '=', $task->id)->get();
     }
 
-    public function deleteTask(Task $task)
+    public function checkAnswer(AnswerToTask $answer, Request $request) {
-    {
+        $request->validate([
-        $task->delete();
+            'mark' => 'required|numeric'
+                           ]);
 
-        return 'Task №' . $task->id . ' has been deleted';
+        $answer->comment_by_teacher = $request->input('comment_by_teacher');
+        $answer->mark = $request->input('mark');
+        $answer->checked = 1;
+        $answer->save();
+
+        return response()->json($answer, 200);
     }
-}
+
+
+}

app/Http/Controllers/TaskFileController.php

@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Student;
+use Illuminate\Http\Request;
+use App\Models\TaskFile;
+use App\Models\Task;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+
+class TaskFileController 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(Task $task, Request $request)
+    {
+
+        $taskId = $task->id;
+        $studentId = Student::where('user_id', '=', Auth::id())->get();
+        $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(auth()->user()->role_id == 2) {
+            if (Storage::putFileAs('public/task/' . $taskId . '/' . $type . '/', $file, $request->name)) {
+                TaskFile::create(
+                    [
+                        'name' => $request->name,
+                        'type' => $type,
+                        'extension' => $ext,
+                        'task_id' => $taskId,
+                        'url' => '/storage/task' . '/' . $taskId . '/' . $type . '/' . $request->name,
+                        'user_id' => Auth::id(),
+                        'add_by_teacher' => 1,
+                        $file,
+                        $request->name . $ext
+                    ]
+                );
+                return response()->json(true, 201);
+            }
+        } elseif (auth()->user()->role_id == 3) {
+            if (Storage::putFileAs('public/task/' . $taskId . '/student/'. Auth::id() . $type . '/', $file, $request->name)) {
+                TaskFile::create(
+                    [
+                        'name' => $request->name,
+                        'type' => $type,
+                        'extension' => $ext,
+                        'task_id' => $taskId,
+                        'url' => '/storage/task' . '/' . $taskId . '/student/'. Auth::id() . $type . '/' . $request->name,
+                        'user_id' => Auth::id(),
+                        $file,
+                        $request->name . $ext
+                    ]
+                );
+                return response()->json(true, 201);
+            }
+
+        }
+        return response()->json(false, 422);
+    }
+
+    public function showFiles(Task $task)
+    {
+
+        $taskId = $task->id;
+        $files = TaskFile::where('task_id', '=', $taskId)->get();
+
+        return response()->json($files, 200);
+
+    }
+
+    public function download(TaskFile $file)
+    {
+        return Storage::download('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name);
+    }
+
+//    public function update(TaskFile $file, Request $request)  Бесполезная функция
+//    {
+//
+//        $request->validate([
+//                               'name' => 'required'
+//                           ]);
+//        $old_filename = '/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name;
+//        $new_filename = '/public/task/' . $file->task_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/task/' . $file->task_id . '/' . $request->type . '/' . $file->name;
+//                return response()->json([$file->save(), $file]);
+//            }
+//        }
+//
+//        return response()->json(false, 404);
+//    }
+
+    public function delete(TaskFile $file) {
+        if (Storage::disk('local')->exists('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name )) {
+            if (Storage::disk('local')->delete('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete());
+            }
+        }
+        return response()->json(['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/Requests/TaskRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Requests;
+
+
+class TaskRequest extends ApiFormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:255',
+
+        ];
+    }
+}

app/Models/AnswerToTask.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class AnswerToTask extends Model
+{
+    use HasFactory;
+
+    protected $table = 'answers_to_task';
+    protected $fillable = ['description', 'student_id', 'task_id', 'class_id', 'checked', 'mark', 'comment_by_teacher'];
+}

app/Models/SchoolClass.php

@@ -26,4 +26,8 @@ class SchoolClass extends Model
             ->withPivot('hours_per_week', 'hours_per_year');
     }
 
+    public function tasks() {
+        return $this->hasMany(Task::class, 'class_id');
+    }
+
 }

app/Models/Task.php

@@ -8,6 +8,18 @@ use Illuminate\Database\Eloquent\Model;
 class Task extends Model
 {
     use HasFactory;
+    protected $fillable = ['name', 'description', 'deadline', 'teacher_id', 'subject_id'];
+
+    public function banktask() {
+        return $this->hasMany(BankTask::class, 'class_task');
+    }
+
+    public function teacher(){
+        return $this->belongsTo(Teacher::class);
+    }
+
+    public function class() {
+        $this->belongsTo(SchoolClass::class);
+    }
 
-    protected $table = 'tasks';
 }

app/Models/TaskFile.php

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

app/Models/TaskHistory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class TaskHistory extends Model
+{
+    use HasFactory;
+
+    protected $table = 'banktask_task';
+    protected $fillable = ['banktask_id', 'task_id'];
+    public $timestamps = false;
+}

app/Models/Teacher.php

@@ -24,4 +24,7 @@ class Teacher extends Model
         return $this->hasMany(Timetable::class);
     }
 
+    public function tasks(){
+        return $this->hasMany(Task::class);
+    }
 }

database/migrations/2020_12_03_172010_create_tasks_table.php

@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tasks', function (Blueprint $table) {
+            $table->id();
+            $table->string('name',255);
+            $table->text('description')->nullable();
+            $table->dateTime('deadline')->nullable();
+            $table->unsignedInteger('teacher_id')->nullable();
+            $table->unsignedInteger('class_id')->nullable();
+            $table->timestamps();
+            $table->integer('subject_id');
+
+            $table->foreign('subject_id')->references('id')->on('subjects')
+                ->onDelete('set null');
+
+//            $table->foreign('class_id')->references('id')->on('school_classes')
+//            ->onDelete('cascade');
+//            $table->foreign('teacher_id')->references('id')->on('teachers')
+//            ->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('tasks');
+    }
+}

database/migrations/2020_12_07_120455_create_answers_to_task_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAnswersToTaskTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('answers_to_task', function (Blueprint $table) {
+            $table->id();
+            $table->text('description')->nullable();
+            $table->smallInteger('mark')->nullable();
+            $table->text('comment_by_teacher')->nullable();
+            $table->boolean('checked')->default('false');
+            $table->unsignedInteger('task_id');
+            $table->unsignedInteger('student_id');
+            $table->timestamps();
+
+            $table->foreign('task_id')->references('id')->on('tasks')
+                ->onDelete('set null');
+            $table->foreign('student_id')->references('id')->on('students');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('answers_to_task');
+    }
+}

database/migrations/2020_12_08_122859_create_task_files_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTaskFilesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('task_files', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->string('type');
+            $table->string('extension');
+            $table->boolean('add_by_teacher')->default('0');
+            $table->string('url', 400);
+            $table->timestamps();
+            $table->unsignedInteger('task_id');
+            $table->unsignedInteger('user_id');
+
+            $table->foreign('task_id')->references('id')->on('tasks')
+                ->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('tasks')
+                ->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('task_files');
+    }
+}

routes/api.php

@@ -18,27 +18,47 @@ Route::apiResource('students', 'Users\StudentController');
 
 Route::apiResource('parents', 'Users\ParenttController');
 
-Route::apiResource('subjects', 'SubjectController');
+Route::apiResource('subjects', 'BankTask\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::apiResource('themes', 'ThemeController');
+Route::apiResource('themes',    'BankTask\ThemeController');
 
 Route::apiResource('timetables', 'TimetableController');
 
-Route::get('banktasks', 'BankTaskController@index'); //получение списка всех заданий
+Route::get('banktasks', 'BankTask\BankTaskController@index'); //получение списка всех заданий
 Route::group(['prefix' => 'banktask'], function () {
-    Route::post('', 'BankTaskController@store'); //создание задания
+    Route::post('', 'BankTask\BankTaskController@store'); //создание задания
-    Route::get('{banktask}', 'BankTaskController@show'); //получение задания
+    Route::get('{banktask}', 'BankTask\BankTaskController@show'); //получение задания
-    Route::put('{banktask}', 'BankTaskController@update'); //обновление задания
+    Route::put('{banktask}', 'BankTask\BankTaskController@update'); //обновление задания
-    Route::delete('{banktask}', 'BankTaskController@delete'); //удаление задания
+    Route::delete('{banktask}', 'BankTask\BankTaskController@delete'); //удаление задания
-    Route::post('{banktask}/addfile', 'BankTaskFileController@store');
+    Route::post('{banktask}/addfile', 'BankTask\BankTaskFileController@store');
-    Route::get('{banktask}/files', 'BankTaskFileController@showFiles');
+    Route::get('{banktask}/files', 'BankTask\BankTaskFileController@showFiles');
+    Route::get('/file/{file}', 'BankTask\BankTaskFileController@download');
+    Route::delete('/file/{file}', 'BankTask\BankTaskFileController@delete');
+    Route::put('/file/{file}', 'BankTask\BankTaskFileController@update');
 });
 
-Route::get('/file/{file}/download', 'BankTaskFileController@download');
+
-Route::delete('/file/{file}/delete', 'BankTaskFileController@delete');
+
-Route::put('/file/{file}/update', 'BankTaskFileController@update');
+Route::group(['prefix' => 'task'], function () {
+    Route::post('', 'TaskController@store'); // Добавить таск
+    Route::get('', 'TaskController@index'); // Показать задания для класса (в запросе нужно указывать Id класса)
+    Route::get('/{task}', 'TaskController@show'); //Показать задание
+    Route::put('/{task}', 'TaskController@update'); // Обновить задание
+    Route::delete('/{task}', 'TaskController@delete'); // Удалить задание
+    Route::post('/{task}/addbanktask', 'TaskController@addbanktask'); // Добавить к заданию задачи из банка
+    Route::put('/answer/check/{answer}', 'TaskController@checkAnswer'); // Проверить ответ ученика
+    Route::post('/{task}/addanswer', 'AnswerToTaskController@store'); // Добавить ответ(для ученика)
+    Route::get('/{task}/student/{student}', 'AnswerToTaskController@show'); // Показать ответ ученика
+    Route::delete('/answer/{answer}', 'AnswerToTask@delete'); // Удалить ответ
+    Route::put('/answer/{answer}', 'AnswerToTask@update'); // Изменить ответ
+    Route::post('/{task}/addfile', 'TaskFileController@store'); // Добавить файл
+    Route::get('/{task}/files', 'TaskFileController@showFiles'); // Посмотреть файлы у таска(только файлы
+                                                                           // которые добавил учитель).
+    Route::get('/{task}/file/{file}', 'TaskFileController@download'); // Скачать файл
+    Route::delete('/file/{file}', 'TaskFileController@delete'); // Удалить файл
+});