Revize d58f0fda

#6638: Prejmenovana tabulka vozidla na vozidlo. Pridana zbyla implementace rest api. Pridany zbyle modely.

backend/app/Http/Controllers/DeviceController.php

@@ -10 +10 @@
 
 use App\Model\Device;
 use App\Model\Zarizeni;
+use App\Model\Zaznam;
 use Illuminate\Http\Request;
 
 class DeviceController extends Controller
 {
     public function getDevice(Request $request) {
-        $address='';
+        $town = null;
+        $street = null;
         $showDirection=0;
         if ($request->has('address')) {
             $address = $request->input('address');
+            // todo: what is a format of address ?
+            $addressParts = explode(";", $address);
+            if (count($addressParts) == 2) {
+                $town = $addressParts[0];
+                $street = $addressParts[1];
+            }
         }
 
         if ($request->has('showDirection')) {
             $showDirection = ($request->input('showDirection') === 1);
         }
 
-        $device = new Device();
-        $device->id = 1;
-        $device->name = 'device';
-        $device->street = $address;
-        $device->town = $address;
-
-//        return response()->json($device);
-        return Zarizeni::findByAddressJoinAddress('Česká Kubice', 'Česká Kubice');
+        return Zarizeni::findByAddressJoinAddress($street, $town);
     }
 
     /**
@@ -50 +51 @@
      */
     public function getDeviceById(Request $request, $id) {
 
-        return Zarizeni::findByIdJoinAddress($id);
+        $dateFrom = null;
+        $dateTo = null;
+        $timeFrom = null;
+        $timeTo = null;
+        $direction = null;
+
+        // nacti parametry
+        if ($request->has('dateFrom')) {
+            $dateFrom = $request->input('dateFrom');
+        }
+        if ($request->has('dateTo')) {
+            $dateTo = $request->input('dateTo');
+        }
+        if ($request->has('timeFrom')) {
+            $timeFrom = $request->input('timeFrom');
+        }
+        if ($request->has('timeTo')) {
+            $timeTo = $request->input('timeTo');
+        }
+        if ($request->has('direction')) {
+            $direction = $request->input('direction');
+        }
+
+        $device = Zarizeni::findByIdJoinAddress($id);
+        if ($device != null) {
+            $device[0]->traffic = Zaznam::findByDevice($id, $dateFrom, $dateTo, $timeFrom, $timeTo, $direction);
+        }
+
+        return $device;
     }
 
     public function getAll() {
         return Zarizeni::getAllJoinAddress();
     }
+
+    public function lastDay() {
+        return Zaznam::lastInsertedDate();
+    }
 }

backend/app/Http/Controllers/VehicleController.php

@@ -10 +10 @@
 
 
 use App\Model\Vehicle;
+use App\Model\Vozidlo;
 
 class VehicleController extends Controller
 {
@@ -17 +18 @@
      * Vrati vsechny typy vozidel.
      */
     public function getAll() {
-        $vehicles = [
-            0 => Vehicle::create(0, 'neznámé'),
-            1 => Vehicle::create(1, 'motocykl'),
-            2 => Vehicle::create(2, 'osobní auto'),
-            3 => Vehicle::create(4, 'dodávka')
-        ];
-
-        return $vehicles;
+        return Vozidlo::all();
     }
 }

backend/app/Http/routes.php

@@ -36 +36 @@
  */
 $app->get($apiUrlRoot.'devices/{id}', 'DeviceController@getDeviceById');
 
+//$app->get($apiUrlRoot.'devices/lastday', 'DeviceController@lastDay');
+
 /**
  * Vrati vsechny typy aut.
  */

backend/app/Model/Device.php

@@ -1 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zdenda
- * Date: 20.4.2018
- * Time: 20:08
- */
-
-namespace App\Model;
-
-
-class Device
-{
-    public $id;
-    public $street;
-    public $town;
-    public $name;
-
-    public function __construct() {
-    }
-}

backend/app/Model/Location.php

@@ -1 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zdenda
- * Date: 16.4.2018
- * Time: 13:22
- */
-
-namespace App\Model;
-
-
-class Location
-{
-    public $id;
-    public $name;
-    public $town;
-    public $street;
-    public $device;
-    public $area;
-
-    public function __construct() {
-    }
-
-    /**
-     * Vytvori novou instance lokace a naplni ji daty. Id je nastaveno na 0.
-     *
-     * @param $data Pole cislovane od nuly obsahujici data, kterymi bude naplnena nova instance.
-     *              Format: [0] = name, [1] = town, [2] = street, [3] = device, [4] = area
-     * @return Location
-     */
-    public static function withData($data) {
-        $instance = new self();
-        $instance ->id = 0;
-        $instance ->name = $data[0];
-        $instance ->town = $data[1];
-        $instance ->street = $data[2];
-        $instance ->device = $data[3];
-        $instance ->area = $data[4];
-
-        return $instance;
-    }
-
-    public function toString() {
-        return "<td>".$this->name."</td>"."<td>".$this->town."</td>"."<td>".$this->street."</td>".
-            "<td>".$this->device."</td>"."<td>".$this->area."</td>";
-    }
-}

backend/app/Model/Vehicle.php

@@ -1 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Zdenda
- * Date: 20.4.2018
- * Time: 20:25
- */
-
-namespace App\Model;
-
-
-class Vehicle
-{
-    public $id;
-    public $name;
-
-    public static function create($id, $name) {
-        $inst = new Vehicle();
-        $inst->id = $id;
-        $inst->name = $name;
-
-        return $inst;
-    }
-}

backend/app/Model/Vozidlo.php

@@ +1 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zdenda
+ * Date: 23.4.2018
+ * Time: 14:57
+ */
+
+namespace App\Model;
+
+
+/**
+ * Trida reprezentujici entitu vozidlo.
+ *
+ * @package App\Model
+ */
+class Vozidlo extends BaseModel
+{
+    /**
+     * Nazev tabulky v databazi.
+     * @var string
+     */
+    protected $table = 'vozidlo';
+}

backend/app/Model/Zarizeni.php

@@ -34 +34 @@
         return DB::table('zarizeni')
             ->join('ulice', 'zarizeni.ulice_id', '=', 'ulice.id')
             ->join('mesto', 'ulice.mesto_id', '=', 'mesto.id')
-            ->select('zarizeni.*', 'ulice.nazev as ulice_nazev', 'ulice.id as ulice_id', 'mesto.nazev as mesto_nazev', 'mesto.id as mesto_id')
+            ->select('zarizeni.id as id', 'zarizeni.smer_popis as name', 'ulice.nazev as street', 'ulice.id as street_id', 'mesto.nazev as town', 'mesto.id as town_id')
             ->get();
     }
 
@@ -50 +50 @@
         return DB::table('zarizeni')
             ->join('ulice', 'zarizeni.ulice_id', '=', 'ulice.id')
             ->join('mesto', 'ulice.mesto_id', '=', 'mesto.id')
-            ->select('zarizeni.*', 'ulice.nazev as ulice_nazev', 'ulice.id as ulice_id', 'mesto.nazev as mesto_nazev', 'mesto.id as mesto_id')
+            ->select('zarizeni.id as id', 'zarizeni.smer_popis as name', 'ulice.nazev as street', 'ulice.id as street_id', 'mesto.nazev as town', 'mesto.id as town_id')
             ->where('ulice.nazev', '=', $street)
             ->where('mesto.nazev', '=', $town)
             ->get();
@@ -67 +67 @@
         return DB::table('zarizeni')
             ->join('ulice', 'zarizeni.ulice_id', '=', 'ulice.id')
             ->join('mesto', 'ulice.mesto_id', '=', 'mesto.id')
-            ->select('zarizeni.*', 'ulice.nazev as ulice_nazev', 'ulice.id as ulice_id', 'mesto.nazev as mesto_nazev', 'mesto.id as mesto_id')
+            ->select('zarizeni.id as id', 'zarizeni.smer_popis as name', 'ulice.nazev as street', 'ulice.id as street_id', 'mesto.nazev as town', 'mesto.id as town_id')
             ->where('zarizeni.id', '=', $id)
+            ->orderBy('zarizeni.id')
             ->get();
     }
 

backend/app/Model/Zaznam.php

@@ +1 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Zdenda
+ * Date: 23.4.2018
+ * Time: 12:47
+ */
+
+namespace App\Model;
+
+use Illuminate\Support\Facades\DB;
+
+
+/**
+ * Trida reprezentujici entitu zarizeni v databazi.
+ * @package App\Model
+ */
+class Zaznam extends BaseModel
+{
+    protected $table = 'zaznam';
+
+    /**
+     * Vrati posledni datum pro ktere existuji nejake zaznamy.
+     */
+    public static function lastInsertedDate() {
+        return DB::table('zaznam_cas')->select(DB::raw('max(date(datetime_od)) as last_day'))->get();
+    }
+
+    /**
+     * Vrati zaznamy pro urcite zarizeni.
+     * Typ vozidla je vracen s kazdym zaznamem.
+     *
+     * @param $deviceId Id zarizeni pro ktere budou vraceny zaznamy.
+     * @param $dateFrom Pocatecni datum. Null znamená poledni vlozeny den.
+     * @param $dateTo Koncove datum. Null znamena posledni vlozeny den.
+     * @param $timeFrom Pocatecni cas. Null znamena 00:00.
+     * @param $timeTo Koncovy cas. Null znamena 23:59.
+     * @param $direction Pozadovany smer. Null znamena oba smery.
+     */
+    public static function findByDevice($deviceId, $dateFrom, $dateTo, $timeFrom, $timeTo, $direction) {
+        $dateTimeFrom = null;
+        $dateTimeTo = null;
+        $lastDate = null;
+        $dir = null;
+
+        // jedno z omezujicich dat je null => ziskej posledni vlozene datum
+        if ($dateFrom == null || $dateTo == null) {
+            $lastDate = Zaznam::lastInsertedDate();
+            if ($lastDate == null) {
+                // database is empty
+                // todo: error codes
+                return "no-data";
+            } else {
+                $lastDate = $lastDate[0]->last_day;
+            }
+        }
+        if ($dateFrom == null) {
+            $dateFrom = $lastDate;
+        }
+        if ($dateTo == null) {
+            $dateTo = $lastDate;
+        }
+        // omezujici casy
+        if ($timeFrom == null) {
+            $timeFrom = '00:00:00';
+        }
+        if ($timeTo == null) {
+            $timeTo = '23:59:59';
+        }
+        $dateTimeFrom = date('Y-m-d H:i:s', strtotime("$dateFrom $timeFrom"));
+        $dateTimeTo = date('Y-m-d H:i:s', strtotime("$dateTo $timeTo"));
+
+
+        // vytvoreni query - vsechno to dat dohromady
+        $query = DB::table('zaznam')
+            ->join('zaznam_cas', 'zaznam.zaznam_cas_id', '=', 'zaznam_cas.id')
+            ->join('vozidlo', 'zaznam.vozidlo_id', '=', 'vozidlo.id')
+            ->select('zaznam_cas.datetime_od as datetimeFrom',
+                'zaznam_cas.datetime_do as datetimeTo',
+                'zaznam_cas.smer as direction',
+                'zaznam.rychlost_prumer as speedAverage',
+                'vozidlo.nazev as typeVehicle',
+                'vozidlo.id as numberVehicle')
+            ->where('zaznam_cas.datetime_od', '>=', $dateTimeFrom)
+            ->where('zaznam_cas.datetime_do', '<=', $dateTimeTo)
+            ->where('zaznam_cas.zarizeni_id', '=', $deviceId);
+
+        if($direction != null) {
+            $query = $query->where('zaznam_cas.smer', '=', $direction);
+        }
+
+        return $query->get();
+    }
+}

backend/bootstrap/app.php

@@ -23 +23 @@
     realpath(__DIR__.'/../')
 );
 
-// $app->withFacades();
+$app->withFacades();
 
-// $app->withEloquent();
+$app->withEloquent();
 
 /*
 |--------------------------------------------------------------------------

db/v3__vozidlo_rename.sql

@@ +1 @@
+-- prejmenovani tabulky vozidla
+rename table `prujezd_vozidel`.`vozidla` to `prujezd_vozidel`.`vozidlo`;
+
+-- update ciziho klice
+alter table `prujezd_vozidel`.`zaznam` change column `vozidla_id` `vozidlo_id` bigint(20);