Connect requirements to blocks

app/Exceptions/Handler.php

@@ -38,7 +38,7 @@ class Handler extends ExceptionHandler
      * @throws Exception
      */
     public function report(Exception $exception) {
-        if (app()->bound('sentry') && $this->shouldReport($exception)) {
+        if (!env('APP_DEBUG') && app()->bound('sentry') && $this->shouldReport($exception)) {
             app('sentry')->captureException($exception);
         }
 

app/Http/Controllers/BlockController.php

@@ -41,7 +41,7 @@ public function store(BlockRequest $request, Course $course) {
             $data = $request->validated();
             $block = Block::create(array_merge($data, ['course_id' => $course->id]));
 
-            $block->requirements()->attach(array_filter(explode(',', $data['requirement_ids'])));
+            $block->requirements()->attach(array_filter(explode(',', $data['requirements'])));
 
             /** @var User $user */
             $user = Auth::user();
@@ -120,7 +120,7 @@ public function update(BlockRequest $request, Course $course, Block $block) {
             $block->update($data);
 
             $block->requirements()->detach(null);
-            $block->requirements()->attach(array_filter(explode(',', $data['requirement_ids'])));
+            $block->requirements()->attach(array_filter(explode(',', $data['requirements'])));
 
             /** @var User $user */
             $user = Auth::user();

app/Http/Controllers/ObservationController.php

@@ -25,7 +25,7 @@ class ObservationController extends Controller {
      * @return Response
      */
     public function create(Request $request) {
-        return view('observation.new', ['participant_id' => $request->input('participant'), 'block_id' => $request->input('block')]);
+        return view('observation.new', ['participants' => $request->input('participant'), 'block' => $request->input('block')]);
     }
 
     /**
@@ -41,13 +41,14 @@ public function store(ObservationRequest $request, Course $course) {
 
             $observation = Observation::create(array_merge($data, ['course_id' => $course->id, 'user_id' => Auth::user()->getAuthIdentifier()]));
 
-            $participants = $observation->attachRelatedRecords($course, 'participants', $data, 'participant_ids');
-            $observation->attachRelatedRecords($course, 'requirements', $data, 'requirement_ids');
-            $observation->attachRelatedRecords($course, 'categories', $data, 'category_ids');
+            $participantIds = array_filter(explode(',', $data['participants']));
+            $observation->participants()->attach($participantIds);
+            $observation->requirements()->attach(array_filter(explode(',', $data['requirements'])));
+            $observation->categories()->attach(array_filter(explode(',', $data['categories'])));
 
             $flash = (new HtmlString)->__('t.views.observations.add_success');
-            if (count($participants) == 1) {
-                $participant = $participants[0];
+            if (count($participantIds) == 1) {
+                $participant = $observation->participants()->first();
                 $route = route('participants.detail', ['course' => $course->id, 'participant' => $participant->id]);
                 $flash->s(" <a href=\"{$route}\">")
                       ->__('t.views.observations.back_to_participant', ['name' => $participant->scout_name])
@@ -56,7 +57,7 @@ public function store(ObservationRequest $request, Course $course) {
             $request->session()->flash('alert-success', $flash);
         });
 
-        return Redirect::route('observation.new', ['course' => $course->id, 'participant' => $data['participant_ids'], 'block' => $data['block_id']]);
+        return Redirect::route('observation.new', ['course' => $course->id, 'participant' => $data['participants'], 'block' => $data['block']]);
     }
 
     /**
@@ -134,9 +135,12 @@ public function update(ObservationRequest $request, Course $course, Observation
             $data = $request->validated();
             $observation->update($data);
 
-            $observation->attachRelatedRecords($course, 'participants', $data, 'participant_ids');
-            $observation->attachRelatedRecords($course, 'requirements', $data, 'requirement_ids');
-            $observation->attachRelatedRecords($course, 'categories', $data, 'category_ids');
+            $observation->participants()->detach();
+            $observation->participants()->attach(array_filter(explode(',', $data['participants'])));
+            $observation->requirements()->detach();
+            $observation->requirements()->attach(array_filter(explode(',', $data['requirements'])));
+            $observation->categories()->detach();
+            $observation->categories()->attach(array_filter(explode(',', $data['categories'])));
         });
 
         $request->session()->flash('alert-success', __('t.views.observations.edit_success'));

app/Http/Controllers/RequirementController.php

@@ -8,6 +8,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redirect;
 
 class RequirementController extends Controller {
@@ -28,8 +29,14 @@ public function index() {
      * @return RedirectResponse
      */
     public function store(RequirementRequest $request, Course $course) {
-        Requirement::create(array_merge($request->validated(), ['course_id' => $course->id]));
-        $request->session()->flash('alert-success', __('t.views.admin.requirements.create_success'));
+        DB::transaction(function () use ($request, $course) {
+            $data = $request->validated();
+            $requirement = Requirement::create(array_merge($data, ['course_id' => $course->id]));
+
+            $requirement->blocks()->attach(array_filter(explode(',', $data['blocks'])));
+
+            $request->session()->flash('alert-success', __('t.views.admin.requirements.create_success'));
+        });
         return Redirect::route('admin.requirements', ['course' => $course->id]);
     }
 
@@ -53,8 +60,14 @@ public function edit(Course $course, Requirement $requirement) {
      * @return RedirectResponse
      */
     public function update(RequirementRequest $request, Course $course, Requirement $requirement) {
-        $requirement->update($request->validated());
-        $request->session()->flash('alert-success', __('t.views.admin.requirements.edit_success'));
+        DB::transaction(function () use ($request, $course, $requirement) {
+            $data = $request->validated();
+            $requirement->update($data);
+
+            $requirement->blocks()->detach(null);
+            $requirement->blocks()->attach(array_filter(explode(',', $data['blocks'])));
+            $request->session()->flash('alert-success', __('t.views.admin.requirements.edit_success'));
+        });
         return Redirect::route('admin.requirements', ['course' => $course->id]);
     }
 

app/Http/Requests/BlockImportRequest.php

@@ -6,15 +6,13 @@
 use App\Services\Import\Blocks\BlockListImporter;
 use Illuminate\Foundation\Http\FormRequest;
 
-class BlockImportRequest extends FormRequest
-{
+class BlockImportRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -23,8 +21,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'source' => 'required|in:' . implode(',', array_keys(ImportServiceProvider::$BLOCK_IMPORTER_MAP)),
             'file' => 'required|max:2000',
@@ -37,6 +34,6 @@ public function rules()
      * @return BlockListImporter
      */
     public function getImporter() {
-       return app()->get(ImportServiceProvider::$BLOCK_IMPORTER_MAP[$this->input('source')]);
+        return app()->get(ImportServiceProvider::$BLOCK_IMPORTER_MAP[$this->input('source')]);
     }
 }

app/Http/Requests/BlockRequest.php

@@ -2,17 +2,17 @@
 
 namespace App\Http\Requests;
 
+use App\Models\Requirement;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
 
-class BlockRequest extends FormRequest
-{
+class BlockRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,13 +21,16 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'name' => 'required|max:255',
             'full_block_number' => 'regex:/^\d+\.\d+$/|nullable',
             'block_date' => 'date|required',
-            'requirement_ids' => 'regex:/^\d+(,\d+)*$/|nullable',
+            'requirements' => 'nullable|regex:/^\d+(,\d+)*$/|allExistInCourse',
         ];
     }
+
+    public function attributes() {
+        return Lang::get('t.models.block');
+    }
 }

app/Http/Requests/CategoryRequest.php

@@ -3,16 +3,15 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
 
-class CategoryRequest extends FormRequest
-{
+class CategoryRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,10 +20,13 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'name' => 'required|max:255',
         ];
     }
+
+    public function attributes() {
+        return Lang::get('t.models.category');
+    }
 }

app/Http/Requests/CourseRequest.php

@@ -3,16 +3,15 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
 
-class CourseRequest extends FormRequest
-{
+class CourseRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,11 +20,14 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'name' => 'required|max:255',
             'course_number' => 'max:255',
         ];
     }
+
+    public function attributes() {
+        return Lang::get('t.models.course');
+    }
 }

app/Http/Requests/ErrorReportRequest.php

@@ -4,15 +4,13 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ErrorReportRequest extends FormRequest
-{
+class ErrorReportRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,8 +19,7 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'name' => 'required|max:255',
             'email' => 'required|email|max:255',

app/Http/Requests/InvitationClaimRequest.php

@@ -3,16 +3,15 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
 
-class InvitationClaimRequest extends FormRequest
-{
+class InvitationClaimRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,10 +20,13 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'token' => 'required|max:128',
         ];
     }
+
+    public function attributes() {
+        return Lang::get('t.models.invitation_claim');
+    }
 }

app/Http/Requests/InvitationRequest.php

@@ -3,16 +3,15 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Lang;
 
-class InvitationRequest extends FormRequest
-{
+class InvitationRequest extends FormRequest {
     /**
      * Determine if the user is authorized to make this request.
      *
      * @return bool
      */
-    public function authorize()
-    {
+    public function authorize() {
         return true;
     }
 
@@ -21,10 +20,13 @@ public function authorize()
      *
      * @return array
      */
-    public function rules()
-    {
+    public function rules() {
         return [
             'email' => 'required|email|max:50',
         ];
     }
+
+    public function attributes() {
+        return Lang::get('t.models.invitation');
+    }
 }