Merge branch 'news' into journal

# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php

app/Http/Controllers/News/NewsController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\News;
+use App\Http\Controllers\Controller;
+use App\Models\NewsFile;
+use Illuminate\Http\Request;
+use App\Models\News;
+
+class NewsController extends Controller
+{
+    public function index(Request $request) {
+        $count = 5;
+        $news = new News;
+        if ($request->has('count')) {
+            $temp = (int)$request->count;
+            if ($temp>0 && $temp<= 100) {
+                $count = $temp;
+            }
+        }
+
+        return response()->json($news->orderByDesc('created_at')->paginate($count), 200);
+
+    }
+
+    public function store(Request $request) {
+        // Добавить проверку, после добавление авторизации
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required',
+                           ]);
+        $news = News::create($request->all());
+
+        return response()->json($news, 201);
+    }
+
+    public function show(News $news) {
+
+        return response()->json([
+            $news,
+            'photo_id' => NewsFile::where('news_id', '=', $news->id)->get(['id'])
+                                    ], 200);
+    }
+
+    public function edit(News $news, Request $request) {
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required'
+                           ]);
+        $news->update($request->all());
+
+        return response()->json($news, 200);
+
+    }
+
+    public function delete(News $news) {
+        $news->delete();
+
+        return response()->json(true, 204);
+    }
+}

app/Http/Controllers/News/NewsFileController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers\News;
+
+use App\Models\NewsFile;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Storage;
+use App\Models\News;
+
+
+class NewsFileController 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(News $news, Request $request)
+    {
+        $newsId = $news->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/news/' . $newsId . '/' . $type . '/', $file, $request->name)) {
+            NewsFile::create([
+                                     'name' => $request->name,
+                                     'type' => $type,
+                                     'extension' => $ext,
+                                     'news_id' => $newsId,
+                                      $file,
+                                      $request->name . $ext
+                                 ]);
+            $news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name;
+            $news->save();
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+
+    public function delete(NewsFile $file) {
+
+        if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
+            if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete(), 204);
+            }
+        }
+        return response()->json(['News 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/TimetableController.php

@@ -47,7 +47,7 @@ class TimetableController extends Controller
         }
 
         $dateTimetables = [];
-        if (!$filterTimetables->isEmpty()) {
+       // if (!$filterTimetables->isEmpty()) {
             for ($i = 0; $i < 6; $i++) {
                 $date = Carbon::parse($request->input('date'))
                     ->startOfWeek()
@@ -55,7 +55,7 @@ class TimetableController extends Controller
                     ->format('Y-m-d');
                 array_push($dateTimetables, [$date => $filterTimetables->where('date', $date)->values()]);
             }
-        }
+       // }
         return response()->json($dateTimetables, 200);
     }
 
@@ -69,22 +69,22 @@ class TimetableController extends Controller
     public function store(TimetableRequest $request)
     {
         try {
-            Timetable::create($request->all());
+            $timetable = Timetable::create($request->all());
         }catch (QueryException $e) {
             return response()->json(['message' => 'Not found class, teacher or subject'], 400);
         }
-        return response()->json(['message' => 'Timetable was created'], 201);
+        return response()->json($timetable, 201);
     }
 
     //обновление урока
-    public function update(TimetableRequest $timetable, Request $request)
+    public function update(Timetable $timetable, TimetableRequest $request)
     {
         try {
             $timetable->update($request->all());
         }catch (QueryException $e) {
             return response()->json(['message' => 'Not found class, teacher or subject'], 400);
         }
-        return response()->json(['message' => 'Timetable was updated'], 200);
+        return response()->json($timetable, 200);
     }
 
     //удаление урока

app/Http/Controllers/Users/HeadTeacherController.php

@@ -45,4 +45,11 @@ class HeadTeacherController extends Controller
         return response()->json($headteacher, 200);
     }
 
+    public function destroy(HeadTeacher $headteacher)
+    {
+        $user = $headteacher->user;
+        $user->delete();
+        return response()->json(null, 204);
+    }
+
 }

app/Http/Controllers/Users/ParenttController.php

@@ -44,4 +44,12 @@ class ParenttController extends Controller
         $parent->update($request->all());
         return response()->json($parent, 200);
     }
+
+    public function destroy(Parentt $parent)
+    {
+        $user = $parent->user;
+        $user->delete();
+        return response()->json(null, 204);
+    }
+
 }

app/Http/Controllers/Users/StudentController.php

@@ -31,18 +31,6 @@ class StudentController extends Controller
         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);
-    }*/
-
     /**
      * Обновление ученика
      *
@@ -65,4 +53,12 @@ class StudentController extends Controller
         $new_class->save();
         return response()->json(collect($student)->except('school_class'), 200);
     }
+
+    public function destroy(Student $student)
+    {
+        $user = $student->user;
+        $user->delete();
+        return response()->json(null, 204);
+    }
+
 }

app/Http/Controllers/Users/TeacherController.php

@@ -45,6 +45,24 @@ class TeacherController extends Controller
         $teacher->update($request->all());
         return response()->json($teacher, 200);
     }
+    //это нужно перенести в update
+    public function store(Request $request)
+    {
+        $path = '/var/www/EducationProject/storage/app/public/users/wd3TZnUTGxZsmIhTpXI4r9NTJIewP8E5MUfdC7u8.png';
+        return Response::download($path);
+        /*$teacher = Teacher::find(1);
+        $path = $request->file('photo')->store('users', 'public');
+        $teacher->update($request->all());
+        $teacher->photo = $path;
+        return response()->json($teacher, 200);*/
+    }
+
+    public function destroy(Teacher $teacher)
+    {
+        $user = $teacher->user;
+        $user->delete();
+        return response()->json(null, 204);
+    }
 
     public function getClasses(Teacher $teacher)
     {

app/Http/Requests/TimetableRequest.php

@@ -19,6 +19,7 @@ class TimetableRequest extends ApiFormRequest
             'date' => 'required|date_format:Y/m/d|',
             'time_start' => 'required|date_format:H:i',
             'time_end' => 'required|date_format:H:i',
+            'classroom' => 'required',
         ];
     }
 }