sensors get/add/edit/del

app/Http/Business/SensorTypesBusiness.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Business;
+
+use Luticate\Utils\LuBusiness;
+use App\Http\DataAccess\SensorTypesDataAccess;
+use App\Http\DBO\SensorTypesDbo;
+
+class SensorTypesBusiness extends LuBusiness {
+    protected static function getDataAccess()
+    {
+        return new SensorTypesDataAccess();
+    }
+}

app/Http/Business/SensorsBusiness.php

@@ -11,4 +11,41 @@ class SensorsBusiness extends LuBusiness {
     {
         return new SensorsDataAccess();
     }
+
+    protected static function checkSensor(SensorsDbo $sensor, $sensor_id = null)
+    {
+        $existingSensor = SensorsDataAccess::getByName($sensor->getName());
+        if (!is_null($existingSensor) && $sensor_id != $existingSensor->getId()) {
+            self::badInput("Sensor name already exists");
+        }
+        if (is_null($sensor->getName()) || strlen($sensor->getName()) == 0) {
+            self::badInput("Missing sensor name");
+        }
+        HostsBusiness::getById($sensor->getHostId());
+        SensorTypesBusiness::getById($sensor->getSensorTypeId());
+        if (is_null($sensor->getDescription())) {
+            $sensor->setDescription("");
+        }
+        if (is_null($sensor->getData()) || strlen($sensor->getData()) == 0) {
+            $sensor->setData("{}");
+        }
+        $json = json_decode($sensor->getData());
+        if (is_null($json)) {
+            self::badInput("Sensor data could not be converted to json");
+        }
+    }
+
+    public static function add(SensorsDbo $sensor)
+    {
+        self::checkSensor($sensor);
+        return SensorsDataAccess::addId($sensor);
+    }
+
+    public static function edit(SensorsDbo $sensor, $sensor_id)
+    {
+        self::getById($sensor_id);
+        self::checkSensor($sensor, $sensor_id);
+        $sensor->setId($sensor_id);
+        return SensorsDataAccess::editById($sensor_id, $sensor);
+    }
 }

app/Http/Controller/SensorTypesController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controller;
+
+use Luticate\Utils\LuController;
+use App\Http\Business\SensorTypesBusiness;
+use App\Http\DBO\SensorTypesDbo;
+
+class SensorTypesController extends LuController {
+    protected function getBusiness()
+    {
+        return new SensorTypesBusiness();
+    }
+}

app/Http/Controller/SensorsController.php

@@ -2,13 +2,80 @@
 
 namespace App\Http\Controller;
 
+use App\Http\Business\SensorTypesBusiness;
 use Luticate\Utils\LuController;
 use App\Http\Business\SensorsBusiness;
 use App\Http\DBO\SensorsDbo;
+use Luticate\Utils\LuMultipleDbo;
 
 class SensorsController extends LuController {
     protected function getBusiness()
     {
         return new SensorsBusiness();
     }
+
+    /**
+     * Get all sensor types
+     * @param int $page The page number, 0 based
+     * @param int $perPage The number of items per page
+     * @param string $query The filter query
+     * @return LuMultipleDbo
+     */
+    public function getAllTypes($page = 0, $perPage = PHP_INT_MAX, $query = "")
+    {
+        return SensorTypesBusiness::getAll($page, $perPage, $query);
+    }
+
+    /**
+     * Get all sensors, sorted by name
+     * @param int $page The page number, 0 based
+     * @param int $perPage The number of items per page
+     * @param string $query The filter query
+     * @return \Luticate\Utils\LuMultipleDbo
+     */
+    public function getAll($page = 0, $perPage = PHP_INT_MAX, $query = "")
+    {
+        return SensorsBusiness::getAll($page, $perPage, $query);
+    }
+
+    /**
+     * Get a sensor
+     * @param $sensor_id int The sensor id
+     * @return SensorsDbo
+     */
+    public function get($sensor_id)
+    {
+        return SensorsBusiness::getById($sensor_id);
+    }
+
+    /**
+     * Add a new sensor
+     * @param SensorsDbo $sensor The sensor
+     * @return int
+     */
+    public function add(SensorsDbo $sensor)
+    {
+        return SensorsBusiness::add($sensor);
+    }
+
+    /**
+     * Edit an existing sensor
+     * @param SensorsDbo $sensor The sensor
+     * @param $sensor_id int The sensor id
+     * @return bool
+     */
+    public function edit(SensorsDbo $sensor, $sensor_id)
+    {
+        return SensorsBusiness::edit($sensor, $sensor_id);
+    }
+
+    /**
+     * Delete an existing sensor
+     * @param $sensor_id int The sensor id
+     * @return bool
+     */
+    public function del($sensor_id)
+    {
+        return SensorsBusiness::deleteById($sensor_id);
+    }
 }

app/Http/DBO/SensorTypesDbo.php

@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ */
+
+namespace App\Http\DBO;
+
+use Luticate\Utils\LuDbo;
+
+class SensorTypesDbo extends LuDbo {
+
+    public function jsonSerialize()
+    {
+        return array(
+            "Id" => $this->_id,
+            "Name" => $this->_name,
+            "Class" => $this->_class,
+            "DefaultData" => $this->_defaultData
+        );
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new SensorTypesDbo();
+        if (isset($json["Id"])) {
+            $dbo->setId($json["Id"]);
+        }
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["Class"])) {
+            $dbo->setClass($json["Class"]);
+        }
+        if (isset($json["DefaultData"])) {
+            $dbo->setDefaultData($json["DefaultData"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new SensorTypesDbo();
+        $dbo->setId(42);
+        $dbo->setName("sample string");
+        $dbo->setClass("sample string");
+        $dbo->setDefaultData("sample string");
+        return $dbo;
+    }
+
+    /**
+     * @var integer
+     */
+    protected $_id;
+    public function getId()
+    {
+        return $this->_id;
+    }
+    public function setId($value)
+    {
+        $this->_id = $value;
+    }
+
+    /**
+     * @var string
+     */
+    protected $_name;
+    public function getName()
+    {
+        return $this->_name;
+    }
+    public function setName($value)
+    {
+        $this->_name = $value;
+    }
+
+    /**
+     * @var string
+     */
+    protected $_class;
+    public function getClass()
+    {
+        return $this->_class;
+    }
+    public function setClass($value)
+    {
+        $this->_class = $value;
+    }
+
+    /**
+     * @var text
+     */
+    protected $_defaultData;
+    public function getDefaultData()
+    {
+        return $this->_defaultData;
+    }
+    public function setDefaultData($value)
+    {
+        $this->_defaultData = $value;
+    }
+}

app/Http/DBO/SensorsDbo.php

@@ -18,7 +18,7 @@ class SensorsDbo extends LuDbo {
             "Name" => $this->_name,
             "Description" => $this->_description,
             "HostId" => $this->_hostId,
-            "EntityTypeId" => $this->_entityTypeId,
+            "SensorTypeId" => $this->_sensorTypeId,
             "Data" => $this->_data
         );
     }
@@ -38,8 +38,8 @@ class SensorsDbo extends LuDbo {
         if (isset($json["HostId"])) {
             $dbo->setHostId($json["HostId"]);
         }
-        if (isset($json["EntityTypeId"])) {
-            $dbo->setEntityTypeId($json["EntityTypeId"]);
+        if (isset($json["SensorTypeId"])) {
+            $dbo->setSensorTypeId($json["SensorTypeId"]);
         }
         if (isset($json["Data"])) {
             $dbo->setData($json["Data"]);
@@ -54,7 +54,7 @@ class SensorsDbo extends LuDbo {
         $dbo->setName("sample string");
         $dbo->setDescription("sample string");
         $dbo->setHostId(42);
-        $dbo->setEntityTypeId(42);
+        $dbo->setSensorTypeId(42);
         $dbo->setData("sample string");
         return $dbo;
     }
@@ -114,14 +114,14 @@ class SensorsDbo extends LuDbo {
     /**
      * @var integer
      */
-    protected $_entityTypeId;
-    public function getEntityTypeId()
+    protected $_sensorTypeId;
+    public function getSensorTypeId()
     {
-        return $this->_entityTypeId;
+        return $this->_sensorTypeId;
     }
-    public function setEntityTypeId($value)
+    public function setSensorTypeId($value)
     {
-        $this->_entityTypeId = $value;
+        $this->_sensorTypeId = $value;
     }
 
     /**

app/Http/DataAccess/CamerasDataAccess.php

@@ -31,10 +31,10 @@ class CamerasDataAccess extends LuDataAccess {
      */
     public static function getByName($name)
     {
-        $host = Cameras::where("name", "=", $name)->first();
-        if (is_null($host)) {
+        $camera = Cameras::where("name", "=", $name)->first();
+        if (is_null($camera)) {
             return null;
         }
-        return $host->toDbo();
+        return $camera->toDbo();
     }
 }

app/Http/DataAccess/Models/SensorTypes.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\DataAccess\Models;
+
+use App\Http\DBO\SensorTypesDbo;
+
+class SensorTypes extends SensorTypesModel
+{
+}

app/Http/DataAccess/Models/SensorTypesModel.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ * DO NOT DIRECTLY USE THIS FILE
+ * USE SensorTypes.php
+ * TO MAKE YOUR CHANGES AND DATABASE ACCESS
+*/
+
+namespace App\Http\DataAccess\Models;
+
+use Luticate\Utils\LuModel;
+use App\Http\DBO\SensorTypesDbo;
+
+class SensorTypesModel extends LuModel
+{
+    function __construct()
+    {
+        parent::__construct();
+        $this->timestamps = false;
+    }
+
+    public function toDbo()
+    {
+        $dbo = new SensorTypesDbo();
+
+        $dbo->setId($this->id);
+        $dbo->setName($this->name);
+        $dbo->setClass($this->class);
+        $dbo->setDefaultData($this->default_data);
+
+        return $dbo;
+    }
+
+    /**
+     * @param $dbo SensorTypesDbo
+     * @param $model LuModel|null
+     * @return SensorTypes
+     */
+    public function fromDbo($dbo, $model = null)
+    {
+        if (is_null($model))
+            $model = new SensorTypes();
+
+        $model->id = $dbo->getId();
+        $model->name = $dbo->getName();
+        $model->class = $dbo->getClass();
+        $model->default_data = $dbo->getDefaultData();
+
+        return $model;
+    }
+}

app/Http/DataAccess/Models/SensorsModel.php

@@ -29,7 +29,7 @@ class SensorsModel extends LuModel
         $dbo->setName($this->name);
         $dbo->setDescription($this->description);
         $dbo->setHostId($this->host_id);
-        $dbo->setEntityTypeId($this->entity_type_id);
+        $dbo->setSensorTypeId($this->sensor_type_id);
         $dbo->setData($this->data);
 
         return $dbo;
@@ -49,7 +49,7 @@ class SensorsModel extends LuModel
         $model->name = $dbo->getName();
         $model->description = $dbo->getDescription();
         $model->host_id = $dbo->getHostId();
-        $model->entity_type_id = $dbo->getEntityTypeId();
+        $model->sensor_type_id = $dbo->getSensorTypeId();
         $model->data = $dbo->getData();
 
         return $model;

app/Http/DataAccess/SensorTypesDataAccess.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\DataAccess;
+
+use Luticate\Utils\LuDataAccess;
+use App\Http\DataAccess\Models\SensorTypes;
+use App\Http\DBO\SensorTypesDbo;
+
+class SensorTypesDataAccess extends LuDataAccess {
+    protected static function getModel()
+    {
+        return new SensorTypes();
+    }
+}

app/Http/DataAccess/SensorsDataAccess.php

@@ -11,4 +11,30 @@ class SensorsDataAccess extends LuDataAccess {
     {
         return new Sensors();
     }
+
+    protected static function getOrderBy()
+    {
+        return array(array("name", "ASC"));
+    }
+
+    protected static function getQueryPredicate($query)
+    {
+        return array(
+            array("name", "ilike", "%" . $query . "%", "or"),
+            array("description", "ilike", "%" . $query . "%", "or")
+        );
+    }
+
+    /**
+     * @param $name
+     * @return SensorsDbo|null
+     */
+    public static function getByName($name)
+    {
+        $sensor = Sensors::where("name", "=", $name)->first();
+        if (is_null($sensor)) {
+            return null;
+        }
+        return $sensor->toDbo();
+    }
 }

app/Http/routes.php

@@ -10,6 +10,7 @@ $route = LuRoute::getInstance();
 $int = LuRoute::REG_INT;
 $host_id = "{host_id:$int}";
 $camera_id = "{camera_id:$int}";
+$sensor_id = "{sensor_id:$int}";
 
 LuticateBusiness::setupAuth();
 LuticateBusiness::setupRoutes();
@@ -29,4 +30,12 @@ $route->post("/cameras/add", "Cameras", "add", array(CamotionPermissions::CAMERA
 $route->post("/cameras/$camera_id/edit", "Cameras", "edit", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_EDIT));
 $route->post("/cameras/$camera_id/del", "Cameras", "del", array(CamotionPermissions::CAMERA_GET, CamotionPermissions::CAMERA_DEL));
 
+
+$route->get("/sensors/types", "Sensors", "getAllTypes", array(CamotionPermissions::SENSOR_GET, CamotionPermissions::SENSOR_ADD));
+$route->get("/sensors", "Sensors", "getAll", CamotionPermissions::SENSOR_GET);
+$route->get("/sensors/$sensor_id", "Sensors", "get", CamotionPermissions::SENSOR_GET);
+$route->post("/sensors/add", "Sensors", "add", array(CamotionPermissions::SENSOR_GET, CamotionPermissions::SENSOR_ADD));
+$route->post("/sensors/$sensor_id/edit", "Sensors", "edit", array(CamotionPermissions::SENSOR_GET, CamotionPermissions::SENSOR_EDIT));
+$route->post("/sensors/$sensor_id/del", "Sensors", "del", array(CamotionPermissions::SENSOR_GET, CamotionPermissions::SENSOR_DEL));
+
 //sleep(1);