More request validation.

Author: galli-leo

app/Http/Controllers/API/MappingsController.php

@@ -24,6 +24,8 @@
 use App\MappingMovie;
 use App\Http\Requests;
 use App\Http\Requests\MappingAddRequest;
+use App\Http\Requests\MappingFindRequest;
+use App\Http\Requests\MappingGetRequest;
 
 
 class MappingsController extends JSONController
@@ -34,7 +36,7 @@ class MappingsController extends JSONController
      * @param  int  $id
      * @return Response
      */
-	 public function get(Request $request) {
+	 public function get(MappingGetRequest $request) {
          $id = $request->query("id");
 
          $mapping = Mapping::find($id);
@@ -47,14 +49,14 @@ public function get(Request $request) {
 		 return response()->json($mapping)->header("Access-Control-Allow-Origin", "*");
 	 }
 
-	 public function find(Request $request)
+	 public function find(MappingFindRequest $request)
      {
          $tmdbid = $request->query("tmdbid");
          $movie = MappingMovie::find($tmdbid);
 
          if ($movie == null)
          {
-             abort(404, "Movie with tmdbid $tmdbid was not found. Either it does not exist or no mappings have been added yet");
+             abort(404, "Movie with tmdbid $tmdbid was not found. Either it does not exist or no mappings have been added yet.");
          }
 
          $type = $request->query("type");
@@ -136,7 +138,7 @@ public function add(MappingAddRequest $request) {
         return response()->json($mapping)->header("Access-Control-Allow-Origin", "*");
    }
 
-   public function vote(Request $request) {
+   public function vote(MappingGetRequest $request) {
       $id = $request->query("id");
       $direction = $request->query("direction");
       if (!isset($direction) || $direction > 1)

app/Http/Requests/MappingRequests.php

@@ -69,3 +69,98 @@ public function messages()
     }
 
 }
+
+class MappingFindRequest extends JSONRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $arr = [
+            'tmdbid' => array(
+                "required",
+                "regex:/^\d+$/"
+            ),
+            'type' => array(
+                "sometimes",
+                "required",
+                Rule::in(['title', 'year', 'all']),
+            )
+        ];
+
+        return $arr;
+    }
+
+    /**
+     * Get the error messages for the defined validation rules.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'tmdbid.required' => 'A tmdbid to find mappings by is required.',
+            'tmdbid.regex'  => 'The format of the tmdbid given is invalid!',
+            "type.required" => "The type of mappings to return is required.",
+            "type.in" => "The type of mapping has to be on of 'title', 'year' or 'all'.",
+        ];
+    }
+
+}
+
+class MappingGetRequest extends JSONRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $arr = [
+            'id' => array(
+                "required",
+                "regex:/^\d+$/"
+            )
+        ];
+
+        return $arr;
+    }
+
+    /**
+     * Get the error messages for the defined validation rules.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'id.required' => 'The id of the mapping is required.',
+            'id.regex'  => 'The format of the id given is invalid!'
+        ];
+    }
+
+}

composer.lock

@@ -5,7 +5,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <title>Laravel</title>
+        <title>Radarr API</title>
 
         <!-- Fonts -->
         <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
@@ -66,7 +66,7 @@
     </head>
     <body>
         <div class="flex-center position-ref full-height">
-            @if (Route::has('login'))
+           <!-- @if (Route::has('login'))
                 <div class="top-right links">
                     @if (Auth::check())
                         <a href="{{ url('/home') }}">Home</a>
@@ -75,25 +75,18 @@
                         <a href="{{ url('/register') }}">Register</a>
                     @endif
                 </div>
-            @endif
+            @endif-->
 
 
 
             <div class="content">
                 <div class="title m-b-md">
-                    Laravel
+                    Radarr API
                 </div>
 
 
                 <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
-                                @foreach ($movies as $movie) 
-								<li>{{ $movie->title }}</li>
-								@endforeach
+                    In use by <a href="https://radarr.video">Radarr</a> and <a href="https://mappings.radarr.video">Radarr Mappings</a>.
                 </div>
             </div>
         </div>