sbrl-github/Air-Quality-Web
1
0
Fork 0
mirror of https://github.com/ConnectedHumber/Air-Quality-Web synced 2024-11-21 06:22:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bugfix/performance' into dev

Browse source
This commit is contained in:
Starbeamrainbowlabs 2019-11-07 18:45:33 +00:00
commit c8174f47be
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
.serenata/
*.backup *.backup
.cache/ .cache/
app/ app/

4
build
View file

@ -28,7 +28,7 @@ cache_dir="./.cache";
build_output_folder="./app"; build_output_folder="./app";
# Database settings for ssh port forwarding task # Database settings for ssh port forwarding task
database_host="db.connectedhumber.org"; database_host="aq.connectedhumber.org";
database_name="aq_db"; database_name="aq_db";
database_user="www-data"; database_user="www-data";
@ -37,7 +37,7 @@ min_npm_version_major="6";
# Deployment settings # Deployment settings
deploy_ssh_user="ci"; deploy_ssh_user="ci";
deploy_ssh_host="aq.connectedhumber.org"; deploy_ssh_host="sensors.connectedhumber.org";
deploy_ssh_port="22"; deploy_ssh_port="22";
deploy_root_dir="Air-Quality-Web"; deploy_root_dir="Air-Quality-Web";

3
logic/Actions/ListReadingTypes.php
View file

@ -37,6 +37,7 @@ class ListReadingTypes implements IAction {
// 1: Parse & validate parameters // 1: Parse & validate parameters
$device_id = !empty($_GET["device-id"]) ? intval($_GET["device-id"]) : null; $device_id = !empty($_GET["device-id"]) ? intval($_GET["device-id"]) : null;
$days_to_analyse = intval($_GET["days"] ?? "1") - 1;
$format = $_GET["format"] ?? "json"; $format = $_GET["format"] ?? "json";
if(!in_array($format, ["json", "csv"])) { if(!in_array($format, ["json", "csv"])) {
@ -53,7 +54,7 @@ class ListReadingTypes implements IAction {
if(!is_int($device_id)) if(!is_int($device_id))
$data = $this->types_repo->get_all_types(); $data = $this->types_repo->get_all_types();
else else
$data = $this->types_repo->get_types_by_device($device_id); $data = $this->types_repo->get_types_by_device($device_id. $days_to_analyse);
$this->perfcounter->end("sql"); $this->perfcounter->end("sql");
// 1.5: Validate data from database // 1.5: Validate data from database

4
logic/Repositories/IMeasurementTypeRepository.php
View file

@ -32,7 +32,9 @@ interface IMeasurementTypeRepository {
/** /**
* Gets the all the measurement types ever reported by a given device id. * Gets the all the measurement types ever reported by a given device id.
* @param int $device_id The id of the device to get the reading types for.
* @param int $day_to_analyse The number of days worth fo data to analyse. Defaults to -1, which is everything. Set to 0 for readings recorded in the last 24 hours, which is much faster.
* @return string[] A list of device ids. * @return string[] A list of device ids.
*/ */
public function get_types_by_device(int $device_id); public function get_types_by_device(int $device_id, int $days_to_analyse);
} }

6
logic/Repositories/MariaDBMeasurementTypeRepository.php
View file

@ -81,7 +81,7 @@ class MariaDBMeasurementTypeRepository implements IMeasurementTypeRepository {
)->fetchAll(); )->fetchAll();
} }
public function get_types_by_device($device_id) { public function get_types_by_device($device_id, $days_to_analyse = -1) {
$s = $this->get_static; $s = $this->get_static;
$o = $this->get_static_extra; $o = $this->get_static_extra;
return $this->database->query( return $this->database->query(
@ -93,7 +93,9 @@ class MariaDBMeasurementTypeRepository implements IMeasurementTypeRepository {
{$o(MariaDBMeasurementDataRepository::class, "table_name_metadata")}.{$o(MariaDBMeasurementDataRepository::class, "column_metadata_id")} = {$o(MariaDBMeasurementDataRepository::class, "table_name_values")}.{$o(MariaDBMeasurementDataRepository::class, "column_values_reading_id")} {$o(MariaDBMeasurementDataRepository::class, "table_name_metadata")}.{$o(MariaDBMeasurementDataRepository::class, "column_metadata_id")} = {$o(MariaDBMeasurementDataRepository::class, "table_name_values")}.{$o(MariaDBMeasurementDataRepository::class, "column_values_reading_id")}
JOIN {$s("table_name")} ON JOIN {$s("table_name")} ON
{$s("table_name")}.{$s("column_id")} = {$o(MariaDBMeasurementDataRepository::class, "table_name_values")}.{$o(MariaDBMeasurementDataRepository::class, "column_values_reading_type")} {$s("table_name")}.{$s("column_id")} = {$o(MariaDBMeasurementDataRepository::class, "table_name_values")}.{$o(MariaDBMeasurementDataRepository::class, "column_values_reading_type")}
WHERE {$o(MariaDBMeasurementDataRepository::class, "table_name_metadata")}.{$o(MariaDBMeasurementDataRepository::class, "column_metadata_device_id")} = :device_id WHERE
{$o(MariaDBMeasurementDataRepository::class, "table_name_metadata")}.{$o(MariaDBMeasurementDataRepository::class, "column_metadata_device_id")} = :device_id
" . ($days_to_analyse >= 0 ? "AND and DATEDIFF(NOW(),s_or_r) = 0" : "") . "
GROUP BY {$s("table_name")}.{$s("column_id")};", [ GROUP BY {$s("table_name")}.{$s("column_id")};", [
"device_id" => $device_id "device_id" => $device_id
] ]