From 6f6a6abe3c9971b60aad585a198ced6c51329ef5 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Tue, 6 Sep 2016 00:23:26 +0200 Subject: Different root kinds instead of only strong/weak --- app/Http/Controllers/RootController.php | 24 +++++++++++++++++++++--- app/Root.php | 4 ++-- app/RootKind.php | 29 +++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 app/RootKind.php (limited to 'app') diff --git a/app/Http/Controllers/RootController.php b/app/Http/Controllers/RootController.php index e3cf3e1..3899754 100644 --- a/app/Http/Controllers/RootController.php +++ b/app/Http/Controllers/RootController.php @@ -18,19 +18,37 @@ */ namespace App\Http\Controllers; -use HebrewParseTrainer\Root; - use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Validator; use Laravel\Lumen\Routing\Controller as BaseController; +use HebrewParseTrainer\Root; +use HebrewParseTrainer\RootKind; + class RootController extends BaseController { public function create(Request $request) { + $_kinds = RootKind::all(); + $kinds = []; + foreach ($_kinds as $kind) + $kinds[] = $kind->id; + + $validator = Validator::make($request->input(), [ + 'root' => 'required', + 'root_kind_id' => 'in:' . implode(',', $kinds), + ]); + + if ($validator->fails()) { + return [ + 'success' => false, + 'message' => $validator->errors()->first() + ]; + } + $root = new Root; $root->root = $request->input('root'); - $root->strong = 1; + $root->root_kind_id = $request->input('root_kind_id'); $root->save(); return [ diff --git a/app/Root.php b/app/Root.php index a481dab..6c0f033 100644 --- a/app/Root.php +++ b/app/Root.php @@ -24,6 +24,6 @@ class Root extends Model { protected $table = 'roots'; public $timestamps = false; - protected $fillable = ['root', 'strong']; + protected $fillable = ['root', 'root_kind_id']; -} \ No newline at end of file +} diff --git a/app/RootKind.php b/app/RootKind.php new file mode 100644 index 0000000..6c68465 --- /dev/null +++ b/app/RootKind.php @@ -0,0 +1,29 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +namespace HebrewParseTrainer; + +use Illuminate\Database\Eloquent\Model; + +class RootKind extends Model { + + protected $table = 'root_kinds'; + public $timestamps = false; + protected $fillable = ['strong', 'name']; + +} -- cgit v1.2.3