From 654947873ebde82b6a40d3f954c854576627fc73 Mon Sep 17 00:00:00 2001
From: ashen-1-dev <alen2014@gmail.com>
Date: Thu, 17 Dec 2020 02:40:47 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=B4?=
 =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AnswerToTaskController.php | 9 +++++----
 app/Http/Controllers/TaskController.php         | 2 +-
 app/Http/Controllers/TaskFileController.php     | 9 +++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/AnswerToTaskController.php b/app/Http/Controllers/AnswerToTaskController.php
index 5b32528..a456ebf 100644
--- a/app/Http/Controllers/AnswerToTaskController.php
+++ b/app/Http/Controllers/AnswerToTaskController.php
@@ -16,8 +16,9 @@ class AnswerToTaskController extends Controller
         $input = $request->all();
 
 
-        $answer = AnswerToTask::create($input+ ['task_id' =>  $task->id,
-                                           'student_id' => 1]);
+        $answer = AnswerToTask::create($input+
+                                       ['task_id' =>  $task->id,
+                                       'student_id' => auth()->user()->id]);
         return response()->json($answer, 201);
 
     }
@@ -32,13 +33,13 @@ class AnswerToTaskController extends Controller
         $answer->name = $name;
         $answer->deadline = $task->deadline;
         $studentFile = TaskFile::where([
-            ['user_id', '=', '2'], // Auth::id()
+            ['user_id', '=', $student->user_id],
             ['task_id', '=', $task->id],
             ['review', '=', 0]
                                 ])
             ->get(['id','name', 'type', 'url']);
         $teacherFile = TaskFile::where([
-            ['user_id', '=', '2'], // Auth::id()
+            ['user_id', '=', $student->user_id],
             ['task_id', '=', $task->id],
             ['review', '=', 1]
                                        ])
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 698f44b..5e3e984 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -44,7 +44,7 @@ class TaskController extends Controller
     }
 
     public function store(TaskRequest $request) {
-        $teacherId = 1; // Auth()->id();
+        $teacherId = auth()->user()->id;
         $banktaskName = BankTask::find($request->banktask_id)->name;
         $banktaskSubject = BankTask::find($request->banktask_id)->subject_id;
         $newTask = Task::create($request->all() + ['teacher_id' => $teacherId
diff --git a/app/Http/Controllers/TaskFileController.php b/app/Http/Controllers/TaskFileController.php
index 642efe6..1d20cd2 100644
--- a/app/Http/Controllers/TaskFileController.php
+++ b/app/Http/Controllers/TaskFileController.php
@@ -17,8 +17,9 @@ class TaskFileController extends Controller
     public function store(Task $task, Request $request)
     {
 
-        $taskId = $task->id;
-        $studentId = 1;
+        $taskId = $task->id;                        // НАДО ПОДУМАТЬ. СЕЙЧАС РАБОТАЕТ НЕКОРРЕКТНО. НУЖНО СДЕЛАТЬ ТАК ЧТО СИСТЕМА АВТОМАТИЧЕСКИ ОПРЕДЕЛЯЛА К КАКОМУ УЧЕНИКУ ЗАЛИВАТЬ ФАЙЛ УЧИТЕЛЮ
+        $studentId = auth()->user()->id;
+        $teacherId = auth()->user()->id;
         $max_size = (int)ini_get('upload_max_filesize') * 1000;
         $all_ext = implode(',', $this->allExtensions());
         $this->validate($request, [
@@ -30,7 +31,7 @@ class TaskFileController extends Controller
         $ext = $file->getClientOriginalExtension();
         $type = $this->getType($ext);
 
-        if ($request->has('by_teacher') && $request->by_teacher == 1) { // auth()->user()->role_id == 2
+        if ($request->has('by_teacher') && (auth()->user()->role_id == 2)) {
             $pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/review/' . $type . '/';
             $path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/review/' . $type . '/' . $request->name;
             $review = 1;
@@ -49,7 +50,7 @@ class TaskFileController extends Controller
                         'extension' => $ext,
                         'task_id' => $taskId,
                         'url' => $path,
-                        'user_id' => 2,
+                        'user_id' => $studentId,
                         'review' => $review,
                         $file,
                         $request->name . $ext