Модуль Задания

app/Http/Controllers/AnswerToTaskController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\AnswerToTask;
+use App\Models\BankTask;
 use Illuminate\Http\Request;
 use App\Models\Task;
 use Illuminate\Support\Facades\Auth;
@@ -13,28 +14,41 @@ 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);
+
+        $answer = AnswerToTask::create($input+ ['task_id' =>  $task->id,
+                                           'student_id' => 1]);
         return response()->json($answer, 201);
 
     }
 
     public function show(Task $task, Student $student) {
+        $name = BankTask::find($task->banktask_id)->name;
+
         $answer = AnswerToTask::where([
             ['student_id', '=', $student->id],
             ['task_id', '=', $task->id]
         ])->get();
-        $file = TaskFile::where([
+        $answer->name = $name;
-            ['student_id', '=', $student->id],
+        $answer->deadline = $task->deadline;
+        $studentFile = TaskFile::where([
+            ['user_id', '=', '2'], // Auth::id()
             ['task_id', '=', $task->id]
                                 ])
             ->get(['id','name', 'type', 'url']);
+        $teacherFile = TaskFile::where([
+            ['user_id', '=', '2'], // Auth::id()
+            ['task_id', '=', $task->id],
+            ['review', '=', 1]
+                                       ])
+            ->get(['id','name', 'type', 'url']);
 
         return response()->json([
             'answer' => $answer,
-            'files' =>  $file
+            'files' =>  [
+                'student' => $studentFile,
+                'teacher' => $teacherFile
+            ]
         ],200);
     }
 

app/Http/Controllers/BankTask/BankTaskFileController.php

@@ -79,7 +79,6 @@ class BankTaskFileController extends Controller
     }
 
     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());

app/Http/Controllers/BankTask/SubjectController.php

@@ -18,7 +18,7 @@ class SubjectController extends Controller
      */
     public function index()
     {
-        return response()->json(Subject::all()->sortBy('name'), 200);
+        return response()->json(Subject::all(), 200);
     }
 
     /**

app/Http/Controllers/BankTask/ThemeController.php

@@ -21,7 +21,7 @@ class ThemeController extends Controller
      */
     public function index(Request $request)
     {
-        return response()->json(Theme::all()->sortBy($request->input('sort_by')), 200);
+        return response()->json(Theme::all(), 200);
     }
 
     /**

app/Http/Controllers/TaskController.php

@@ -3,8 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Models\AnswerToTask;
+use App\Models\BankTask;
 use App\Models\SchoolClass;
 use App\Models\Student;
+use App\Models\User;
 use Illuminate\Http\Request;
 use App\Models\Task;
 use App\Http\Requests\TaskRequest;
@@ -17,37 +19,60 @@ class TaskController extends Controller
 
 {
     public function index(Request $request) {
+        $tasks = Task::where('class_id', '=', $request->class_id)->get()->sortBy('deadline');
+        $temp = [];
+        foreach ($tasks as $task) {
 
-        return Task::where('class_id', '=', $request->class_id);
+            $task->banktask->subject;
+            array_push($temp, collect($task)->except(
+                                     'banktask.id',
+                                          'banktask.description',
+                                          'banktask.short_description',
+                                          'banktask.theme_id',
+                                          'banktask.created_at',
+                                          'banktask.updated_at',
+                                          'banktask.author',
+                                          'banktask.subject.created_at',
+                                          'banktask.subject.updated_at',
+                                          'banktask.subject_id'
+            ));
+
+
+       }
+
+        return response()->json($temp , 200);
     }
 
     public function store(TaskRequest $request) {
-        $class = SchoolClass::find(1);
         $teacherId = 1; // Auth()->id();
-        $newTask = $class->tasks()->create($request->all() + ['teacher_id' => $teacherId]);
+        $banktaskName = BankTask::find($request->banktask_id)->name;
+        $banktaskSubject = BankTask::find($request->banktask_id)->subject_id;
+        $newTask = Task::create($request->all() + ['teacher_id' => $teacherId
+                                       ]);
 
 
         return response()->json($newTask, 201);
     }
 
-    public function addbanktask(Task $task, Request $request) {
+//    public function addbanktask(Task $task, Request $request) {
-        $temp = new TaskHistory();
+//        $temp = new TaskHistory();
-        $temp->task_id = $task->id;
+//        $temp->task_id = $task->id;
-        $temp->banktask_id = $request->input('banktask_id');      // Баг - можно впихнуть 2 одинаковых задания из банка задач в один таск
+//        $temp->banktask_id = $request->input('banktask_id');      // Баг - можно впихнуть 2 одинаковых задания из банка задач в один таск
-
+//
-        $temp->save();
+//        $temp->save();
-
+//
-            return response()->json($temp, 201);
+//            return response()->json($temp, 201);
-    }
+//    }
 
     public function show(Task $task) {
-        $file = TaskFile::where([
+        $userId = Teacher::find($task->teacher_id)->user_id;
-            ['task_id', '=', $task->id],
+
-            ['add_by_teacher', '=', '1']
+        $file = TaskFile::where('task_id', '=', $task->id)->get(['id', 'name', 'type', 'url', 'user_id']);
-            ])->get(['id', 'name', 'type', 'url', 'user_id']);
         return response()->json([
-            'task' => $task,
+            $task,
-            'files' => $file
+            'files' => $file,
+
+
 
                                 ], 200);
     }
@@ -58,13 +83,11 @@ class TaskController extends Controller
         return response()->json(true, 200);
     }
 
-    public function update(Task $task, TaskRequest $request) {
+    public function update(Task $task, Request $request) {
         $request->validate([
-                               'name' => 'required|min:5:max:100',
+                               'banktask_id' => 'required|exists:bank_tasks,id',
                            ]);
     $task->update($request->all());
-//        $task->name = $request->input('name');
-//        $task->description = $request->input('description');
 
 
         $task->save();
@@ -80,8 +103,12 @@ class TaskController extends Controller
         $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

@@ -18,7 +18,7 @@ class TaskFileController extends Controller
     {
 
         $taskId = $task->id;
-        $studentId = Student::where('user_id', '=', Auth::id())->get();
+        $studentId = 1;
         $max_size = (int)ini_get('upload_max_filesize') * 1000;
         $all_ext = implode(',', $this->allExtensions());
         $this->validate($request, [
@@ -30,40 +30,30 @@ class TaskFileController extends Controller
         $ext = $file->getClientOriginalExtension();
         $type = $this->getType($ext);
 
-        if(auth()->user()->role_id == 2) {
+        if ($request->has('by_teacher') && $request->by_teacher == 1) { // auth()->user()->role_id == 2
-            if (Storage::putFileAs('public/task/' . $taskId . '/' . $type . '/', $file, $request->name)) {
+            $path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/' .  '/review/' . $type . '/' . $request->name;
-                TaskFile::create(
+            $review = 1;
-                    [
+        } elseif (true) {
-                        'name' => $request->name,
+            $path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/' . $type . '/' . $request->name;
-                        'type' => $type,
+            $review = 0;
-                        '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);
         }
 
+
+            if (Storage::putFileAs('public/task/' . $taskId . '/student/' . $studentId . '/' . $type . '/', $file, $request->name)) {
+                TaskFile::create(
+                    [
+                        'name' => $request->name,
+                        'type' => $type,
+                        'extension' => $ext,
+                        'task_id' => $taskId,
+                        'url' => $path,
+                        'user_id' => '2',
+                        'review' => $review,
+                        $file,
+                        $request->name . $ext
+                    ]
+                );
+                return response()->json(true, 201);
             }
         return response()->json(false, 422);
     }
@@ -78,10 +68,10 @@ class TaskFileController extends Controller
 
     }
 
-    public function download(TaskFile $file)
+//    public function download(TaskFile $file)
-    {
+//    {
-        return Storage::download('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name);
+//        return Storage::download('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name);
-    }
+//    }
 
 //    public function update(TaskFile $file, Request $request)  Бесполезная функция
 //    {
@@ -104,8 +94,9 @@ class TaskFileController extends Controller
 //    }
 
     public function delete(TaskFile $file) {
-        if (Storage::disk('local')->exists('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name )) {
+        $studentId = Student::where('user_id', '=', $file->user_id)->get()->id;
-            if (Storage::disk('local')->delete('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name)) {
+        if (Storage::disk('local')->exists('/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name)) {
+            if (Storage::disk('local')->delete('/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name)) {
                 return response()->json($file->delete());
             }
         }

app/Http/Controllers/Users/StudentController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Users;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StudentRequest;
+use App\Models\AnswerToTask;
 use App\Models\SchoolClass;
 use App\Models\Student;
 use Illuminate\Http\JsonResponse;
@@ -65,4 +66,8 @@ class StudentController extends Controller
         $new_class->save();
         return response()->json(collect($student)->except('school_class'), 200);
     }
+
+    public function getAnswers(Student $student) {
+        return AnswerToTask::where('student_id', '=', $student->id)->get();
+    }
 }

app/Http/Kernel.php

@@ -15,12 +15,14 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
+        \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+
     ];
 
     /**

app/Http/Middleware/VerifyCsrfToken.php

@@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'api/*'
     ];
 }

app/Http/Requests/TaskRequest.php

@@ -19,7 +19,8 @@ class TaskRequest extends ApiFormRequest
     public function rules()
     {
         return [
-            'name' => 'required|max:255',
+            'banktask_id' => 'required|exists:bank_tasks,id',
+            'deadline' => 'required'
 
         ];
     }

app/Models/AnswerToTask.php

@@ -11,4 +11,5 @@ class AnswerToTask extends Model
 
     protected $table = 'answers_to_task';
     protected $fillable = ['description', 'student_id', 'task_id', 'class_id', 'checked', 'mark', 'comment_by_teacher'];
+
 }

app/Models/BankTask.php

@@ -28,4 +28,9 @@ class BankTask extends Model
         return $this->belongsTo(Theme::class);
     }
 
+    public function tasks() {
+        return $this->hasMany(Task::class);
+    }
+
+
 }

app/Models/BankTaskFile.php

@@ -8,6 +8,10 @@ use Illuminate\Database\Eloquent\Model;
 class BankTaskFile extends Model
 {
     use HasFactory;
-    protected $table = 'bank_tasks_files';
+    protected $table = 'bank_task_files';
     protected $fillable = ['name', 'type', 'extension', 'url', 'banktask_id'];
+
+    public function task() {
+        $this->belongsTo(Task::class);
+    }
 }

app/Models/Task.php

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

app/Models/TaskFile.php

@@ -9,5 +9,6 @@ class TaskFile extends Model
 {
     use HasFactory;
     protected $table = 'task_files';
-    protected $fillable = ['name', 'type', 'extension', 'url', 'task_id'];
+    protected $fillable = ['name', 'type', 'extension', 'url', 'task_id', 'user_id'];
+    protected $hidden = ['review'];
 }

composer.json

@@ -9,6 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
+        "barryvdh/laravel-cors": "^2.0",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d29a824fe1ba5e1a371425931ce19f0b",
+    "content-hash": "d6ea9a3551e5ba6dc98c62f6664c50a5",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -58,6 +58,79 @@
             ],
             "time": "2020-10-29T16:03:21+00:00"
         },
+        {
+            "name": "barryvdh/laravel-cors",
+            "version": "v2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruitcake/laravel-cors.git",
+                "reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
+                "reference": "01de0fe5f71c70d1930ee9a80385f9cc28e0f63a",
+                "shasum": ""
+            },
+            "require": {
+                "asm89/stack-cors": "^2.0.1",
+                "illuminate/contracts": "^6|^7|^8|^9",
+                "illuminate/support": "^6|^7|^8|^9",
+                "php": ">=7.2",
+                "symfony/http-foundation": "^4|^5",
+                "symfony/http-kernel": "^4.3.4|^5"
+            },
+            "require-dev": {
+                "laravel/framework": "^6|^7|^8",
+                "orchestra/testbench-dusk": "^4|^5|^6",
+                "phpunit/phpunit": "^6|^7|^8",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Fruitcake\\Cors\\CorsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fruitcake\\Cors\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fruitcake",
+                    "homepage": "https://fruitcake.nl"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
+            "keywords": [
+                "api",
+                "cors",
+                "crossdomain",
+                "laravel"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-22T13:57:20+00:00"
+        },
         {
             "name": "brick/math",
             "version": "0.9.1",

config/app.php

@@ -162,6 +162,7 @@ return [
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
 
+
         /*
          * Package Service Providers...
          */
@@ -175,6 +176,7 @@ return [
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
+
     ],
 
     /*

database/migrations/2020_12_03_104028_create_bank_task_files_table.php

@@ -13,17 +13,18 @@ class CreateBankTaskFilesTable extends Migration
      */
     public function up()
     {
-        Schema::create('bank_tasks_files', function (Blueprint $table) {
+        Schema::create('bank_task_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');
+                ->onDelete('cascade')->onUpdate('no action');
 
         });
     }

database/migrations/2020_12_03_172010_create_tasks_table.php

@@ -15,15 +15,13 @@ class CreateTasksTable extends Migration
     {
         Schema::create('tasks', function (Blueprint $table) {
             $table->id();
-            $table->string('name',255);
+            $table->unsignedInteger('banktask_id');
-            $table->text('description')->nullable();
+            $table->timestamp('deadline')->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')
+            $table->foreign('banktask_id')->references('id')->on('bank_tasks')
                 ->onDelete('set null');
 
 //            $table->foreign('class_id')->references('id')->on('school_classes')

database/migrations/2020_12_07_120455_create_answers_to_task_table.php

@@ -18,9 +18,10 @@ class CreateAnswersToTaskTable extends Migration
             $table->text('description')->nullable();
             $table->smallInteger('mark')->nullable();
             $table->text('comment_by_teacher')->nullable();
-            $table->boolean('checked')->default('false');
+            $table->boolean('checked')->default('0');
             $table->unsignedInteger('task_id');
             $table->unsignedInteger('student_id');
+            $table->boolean('review')->default('0');
             $table->timestamps();
 
             $table->foreign('task_id')->references('id')->on('tasks')

database/migrations/2020_12_08_122859_create_task_files_table.php

@@ -18,7 +18,6 @@ class CreateTaskFilesTable extends Migration
             $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');

routes/api.php

@@ -15,6 +15,7 @@ Route::apiResource('teachers', 'Users\TeacherController');
 Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses');
 
 Route::apiResource('students', 'Users\StudentController');
+Route::get('/student/{student}/answers', 'Users\StudentController@getAnswers');
 
 Route::apiResource('parents', 'Users\ParenttController');
 
@@ -37,9 +38,9 @@ Route::group(['prefix' => 'banktask'], function () {
     Route::delete('{banktask}', 'BankTask\BankTaskController@delete'); //удаление задания
     Route::post('{banktask}/addfile', 'BankTask\BankTaskFileController@store');
     Route::get('{banktask}/files', 'BankTask\BankTaskFileController@showFiles');
-    Route::get('/file/{file}', 'BankTask\BankTaskFileController@download');
+    Route::get('/file/{file}/download', 'BankTask\BankTaskFileController@download');
-    Route::delete('/file/{file}', 'BankTask\BankTaskFileController@delete');
+    Route::delete('/file/{file}/delete', 'BankTask\BankTaskFileController@delete');
-    Route::put('/file/{file}', 'BankTask\BankTaskFileController@update');
+    Route::put('/file/{file}/update', 'BankTask\BankTaskFileController@update');
 });
 
 
@@ -50,12 +51,11 @@ Route::group(['prefix' => 'task'], function () {
     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::delete('/answer/{answer}', 'AnswerToTaskController@delete'); // Удалить ответ
-    Route::put('/answer/{answer}', 'AnswerToTask@update'); // Изменить ответ
+    Route::put('/answer/{answer}', 'AnswerToTaskController@update'); // Изменить ответ
     Route::post('/{task}/addfile', 'TaskFileController@store'); // Добавить файл
     Route::get('/{task}/files', 'TaskFileController@showFiles'); // Посмотреть файлы у таска(только файлы
                                                                            // которые добавил учитель).