New version of training. Better integration. Training saved in database

app/Http/Controllers/FeedbackController.php

@@ -2,7 +2,7 @@
 namespace App\Http\Controllers;
 
 use App\Feedback;
-use App\Jobs\FeedbackJob;
+use App\Jobs\WowaJob;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
@@ -115,7 +115,7 @@ class FeedbackController extends Controller
 
     public function compute()
     {
-        $feedbacks = Feedback::all();
-        FeedbackJob::dispatch($feedbacks);
+        WowaJob::dispatch();
     }
+
 }

app/Http/Controllers/WowaController.php

+<?php
+namespace App\Http\Controllers;
+
+use App\Feedback;
+use App\Jobs\WowaJob;
+use App\Wowa;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Http\Request;
+
+class WowaController extends Controller
+{
+
+    public function __construct()
+    {
+        // Uncomment to require authentication
+        // $this->middleware('auth');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array  $data
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => 'required|string|regex:/^[a-zA-Z0-9\s-\.]+$/|max:255'
+        ]);
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view("wowa.index", ["wowas" => Wowa::all()->sortBy("name")]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     * We use the same view for create and update => provide an empty Wowa.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $wowa = new Wowa();
+        return $this->saveAndQueue($wowa);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $this->validator($request->all())->validate();
+
+        $wowa = new Wowa();
+        $wowa->name = $request->name;
+        $wowa->save();
+        return redirect(action('WowaController@index'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  Wowa $wowa     * @return \Illuminate\Http\Response
+     */
+    public function show(Wowa $wowa)
+    {
+        return view("wowa.show", ["wowa" => $wowa]);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  Wowa $wowa     * @return \Illuminate\Http\Response
+     */
+    public function edit(Wowa $wowa)
+    {
+        return view("wowa.edit", ["wowa" => $wowa]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  Wowa $wowa     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Wowa $wowa)
+    {
+        $this->validator($request->all())->validate();
+
+        $wowa->name = $request->name;
+        $wowa->save();
+        return redirect(action('WowaController@index'));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        Wowa::find($id)->delete();
+        return redirect(action("WowaController@index"));
+    }
+
+    public function saveAndQueue(Wowa $wowa)
+    {
+        $wowa->user_id = Auth::user()->id;
+        $wowa->status = Wowa::STATE_QUEUED;
+        $wowa->save();
+        WowaJob::dispatch($wowa);
+        return redirect(action('WowaController@index'));
+    }
+}

app/Jobs/FeedbackJob.php → app/Jobs/WowaJob.php

@@ -2,7 +2,9 @@
 
 namespace App\Jobs;
 
+use App\Feedback;
 use App\Mark;
+use App\Wowa;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -12,19 +14,22 @@ use RUCD\Training\SolutionDistance;
 use RUCD\Training\Trainer;
 use RUCD\Training\TrainerParameters;
 
-class FeedbackJob implements ShouldQueue
+class WowaJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $feedbacks;
+    protected $wowa;
+
     /**
      * Create a new job instance.
      *
-     * @return void
+     * @param Wowa $wowa
      */
-    public function __construct($feedbacks)
+    public function __construct(Wowa $wowa)
     {
-        $this->feedbacks = $feedbacks;
+        $this->wowa = $wowa;
+        $this->feedbacks = Feedback::all();
     }
 
     /**
@@ -34,7 +39,12 @@ class FeedbackJob implements ShouldQueue
      */
     public function handle()
     {
+        $this->wowa->status = Wowa::STATE_RUNNING;
+        $this->wowa->start_time = time();
         if (count($this->feedbacks) == 0) {
+            $this->wowa->status = Wowa::STATE_FAILED;
+            $this->wowa->end_time = time();
+            $this->wowa->save();
             return;
         }
         $evidences = [];
@@ -59,6 +69,9 @@ class FeedbackJob implements ShouldQueue
         );
         $trainer = new Trainer($training_prameters, new SolutionDistance(count($evidences[0])));
         $solution = $trainer->run($evidences, $is_true_alert);
-        var_dump($solution);
+        //var_dump($solution);
+        $this->wowa->status = Wowa::STATE_SUCCESS;
+        $this->wowa->end_time = time();
+        $this->wowa->save();
     }
 }

app/Wowa.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Wowa extends Model
+{
+    const STATE_CREATED = "CREATED";
+    const STATE_QUEUED = "QUEUED";
+    const STATE_RUNNING = "RUNNING";
+    const STATE_SUCCESS = "SUCCESS";
+    const STATE_FAILED = "FAILED";
+
+    public static $status_classes = [
+        self::STATE_SUCCESS => "btn-success",
+        self::STATE_FAILED => "btn_danger"
+    ];
+
+    private function getStatusBadgeClass()
+    {
+        $status = $this->status;
+        if (!isset(self::$status_classes[$status])) {
+            return "btn-primary";
+        }
+
+        return self::$status_classes[$status];
+    }
+
+    public function statusBadge()
+    {
+        return "<span class='btn btn-badge btn-sm "
+            . $this->getStatusBadgeClass() . "'>" . $this->status . "</span>";
+    }
+}

composer.json

@@ -16,7 +16,8 @@
         "guzzlehttp/guzzle": "^6.3",
         "laravel/framework": "^7.24",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^2.4"
+        "laravel/ui": "^2.4",
+        "tdebatty/laravel-resource-generator": "^6.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",
@@ -26,8 +27,7 @@
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^4.1",
         "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "tdebatty/laravel-resource-generator": "^6.1"
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "config": {
         "optimize-autoloader": true,

database/migrations/2021_01_05_165631_create_wowas_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWowasTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('wowas', function (Blueprint $table) {
+            $table->id();
+            $table->integer("user_id");
+            $table->text("status");
+            $table->timestamps();
+            $table->integer("start_time");
+            $table->integer("end_time");
+            $table->text("w_weights");
+            $table->text("p_weights");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('wowas');
+    }
+}

database/migrations/2021_01_06_143557_nullable_several_columns.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class NullableSeveralColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('wowas', function (Blueprint $table) {
+            $table->integer('start_time')->nullable()->change();
+            $table->integer('end_time')->nullable()->change();
+            $table->text('w_weights')->nullable()->change();
+            $table->text('p_weights')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('wowas', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/feedback/index.blade.php

@@ -6,7 +6,7 @@
 <div class="container">
     <h1>Feedback</h1>
     <p>
-        <a href="{{action('FeedbackController@compute')}}" class="btn btn-outline-danger">
+        <a href="{{action('WowaController@create')}}" class="btn btn-outline-danger">
             <i class="fas fa-calculator"></i> Compute Wowa Weights
         </a>
     </p>

resources/views/layouts/app.blade.php

@@ -48,6 +48,7 @@
                             <div class="dropdown-menu dropdown-menu-left" aria-labelledby="navbarAdminDropdown">
                                 <a class="nav-link" href="{{ action('UserController@index') }}">Users</a>
                                 <a class="nav-link" href="{{ action('FeedbackController@index') }}">Feedback</a>
+                                <a class="nav-link" href="{{ action('WowaController@index') }}">Training</a>
                             </div>
                         </li>
                         @endif

resources/views/wowa/edit.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">Wowa</div>
+
+                <div class="card-body">
+                    @if (!$wowa->exists)
+                    <form method="POST" action="{{ action("WowaController@store") }}">
+                    @else
+                    <form method="POST"
+                          action="{{ action("WowaController@update", ["wowa" => $wowa]) }}">
+                    {{ method_field("PUT") }}
+                    @endif
+                        {{ csrf_field() }}
+
+                        <div class="form-group row">
+                            <label for="name" class="col-md-4 col-form-label text-md-right">Name</label>
+
+                            <div class="col-md-6">
+                                <input id="name" type="text"
+                                       class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
+                                       name="name"
+                                       value="{{ old('name', $wowa->name) }}" required autofocus>
+
+                                @if ($errors->has('name'))
+                                    <span class="invalid-feedback">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <div class="col-md-6 offset-md-4">
+                                <button type="submit" class="btn btn-primary">
+                                     Save
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/wowa/index.blade.php

+@extends('layouts.app')
+
+@section('title', 'Wowas')
+
+@section('content')
+<div class="container">
+    <h1>Wowas</h1>
+
+    <table class="table table-striped">
+        <tr>
+            <th>Id</th>
+            <th></th>
+        </tr>
+        @foreach($wowas as $wowa)
+        <tr>
+            <td>{{ $wowa->id }}</td>
+            <td class="text-right">
+                <a class="btn btn-primary btn-sm"
+                   href="{{ action('WowaController@show', ['wowa' => $wowa]) }}">
+                     Show
+                </a>
+
+                <a class="btn btn-primary btn-sm"
+                   href="{{ action('WowaController@edit', ['wowa' => $wowa]) }}">
+                     Edit
+                </a>
+
+                <form method="POST"
+                      action="{{ action('WowaController@destroy', ['wowa' => $wowa]) }}"
+                      style="display: inline-block">
+                    {{ csrf_field() }}
+                    {{ method_field("DELETE") }}
+                    <button class="btn btn-danger btn-sm">
+                         Delete
+                    </button>
+                </form>
+            </td>
+        </tr>
+        @endforeach
+    </table>
+</div>
+@endsection

resources/views/wowa/show.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ $wowa->name }}</div>
+
+                <div class="card-body">
+                    <p>Name: {{ $wowa->name }}</p>
+
+                    <div>
+                        <a class="btn btn-primary"
+                           href="{{ action('WowaController@edit', ['wowa' => $wowa]) }}">
+                             Edit
+                        </a>
+
+                        <form method="POST"
+                              action="{{ action('WowaController@destroy', ['wowa' => $wowa]) }}"
+                              style="display: inline-block">
+                            {{ csrf_field() }}
+                            {{ method_field("DELETE") }}
+                            <button class="btn btn-danger">
+                                 Delete
+                            </button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

routes/web.php

@@ -56,4 +56,6 @@ Route::prefix('admin')
             Route::get('users/{user}/toggle', 'UserController@toggleAdmin');
             Route::resource('feedback', 'FeedbackController');
             Route::get('compute', 'FeedbackController@compute');
+            Route::resource('wowas', 'WowaController');
         });
+