Fixed Bug referring to Issue #19 reported by @user17476566786 and som…

…e other changes
alexstocker · Jun 20, 2017 · f8b4390 · f8b4390
1 parent 08d4f83
commit f8b4390
Show file tree

Hide file tree

Showing 128 changed files with 74 additions and 6 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+#SensorLogger (0.0.4.1)
+* **Enhancement**:
+* Now checking for already available DataTypes to omit duplicates on device registration
+* **Bugfix**:
+* Fixed Bug referring to Issue #19 reported by @user17476566786
+
 #SensorLogger (0.0.4)
 * **Enhancement**:
 * dashboard widget (chart)

diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
diff --git a/appinfo/database.xml b/appinfo/database.xml
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <description>SensorLogger for ownCloud enables users to log data provided by sensor devices</description>
     <licence>MIT</licence>
     <author>Alexander Stocker</author>
-    <version>0.0.4</version>
+    <version>0.0.4.1</version>
     <namespace>SensorLogger</namespace>
     <category>tool</category>
     <ocsid>174814</ocsid>
@@ -15,3 +15,4 @@
         <owncloud min-version="9.0" max-version="10.0"/>
         <database>mysql</database>
     </dependencies>
+</info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
diff --git a/controller/apisensorloggercontroller.php b/controller/apisensorloggercontroller.php
@@ -5,6 +5,7 @@
 use OC\OCS\Exception;
 use OC\OCS\Result;
 use OC\Share\Share;
+use OCA\SensorLogger\DataType;
 use OCA\SensorLogger\DataTypes;
 use OCA\SensorLogger\SensorDevices;
 use OCP\API;
@@ -15,6 +16,7 @@
 use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IRequest;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
@@ -36,6 +38,8 @@ class ApiSensorLoggerController extends ApiController {
 	private $groupManager;
 	/** @var IUserManager */
 	private $userManager;
+	/** @var IUser */
+	private $currentUser;
 	/** @var IL10N */
 	private $l;
 
@@ -232,7 +236,7 @@ protected function checkRequestParams($deviceId,$params) {
 			$deviceGroupId = $this->insertDeviceGroup($params['deviceGroup']);
 			if(is_int($deviceGroupId)) {
 				try {
-				SensorDevices::updateDevice($deviceId,'group_id',$deviceGroupId,$this->db);
+					SensorDevices::updateDevice($deviceId,'group_id',$deviceGroupId,$this->db);
 				} catch (\Exception $e) {}
 			}
 		}
@@ -246,7 +250,18 @@ protected function checkRequestParams($deviceId,$params) {
 			}
 		}
 		if(isset($params['deviceDataTypes']) && is_array($params['deviceDataTypes'])) {
-			foreach($params['deviceDataTypes'] as $array){
+			foreach($params['deviceDataTypes'] as $key => $array){
+				$availableDataTypes = DataTypes::getDataTypesByUserId($this->userId,$this->db);
+				/** @var DataType $availableDataType */
+				foreach($availableDataTypes as $availableDataType) {
+					if($availableDataType->getShort() === $array['unit'] && $availableDataType->getType() === $array['type']) {
+						$dataTypeId = $availableDataType->getId();
+						if(is_int($dataTypeId)) {
+							$this->insertDeviceDataTypes($deviceId,$dataTypeId);
+						}
+						continue 2;
+					}
+				}
 				$dataTypeId = $this->insertDataTypes($array);
 				if(is_int($dataTypeId)) {
 					$this->insertDeviceDataTypes($deviceId,$dataTypeId);
@@ -418,12 +433,31 @@ public function deleteShare() {
 	 * @return bool
 	 */
 	protected function canAccessShare(IShare $share) {
-
-		# TODO [GH21] Add apisensorloggercontroller::canAccessShare
-
+		// A file with permissions 0 can't be accessed by us. So Don't show it
 		if ($share->getPermissions() === 0) {
 			return false;
 		}
+
+		// Owner of the file and the sharer of the file can always get share
+		if ($share->getShareOwner() === $this->currentUser->getUID() ||
+			$share->getSharedBy() === $this->currentUser->getUID()
+		) {
+			return true;
+		}
+
+		// If the share is shared with you (or a group you are a member of)
+		if ($share->getShareType() === Share::SHARE_TYPE_USER &&
+			$share->getSharedWith() === $this->currentUser->getUID()) {
+			return true;
+		}
+
+		if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+			$sharedWith = $this->groupManager->get($share->getSharedWith());
+			if (!is_null($sharedWith) && $sharedWith->inGroup($this->currentUser)) {
+				return true;
+			}
+		}
+
 		return false;
 	}
 

diff --git a/controller/sensorloggercontroller.php b/controller/sensorloggercontroller.php
diff --git a/css/jquery-editable.css b/css/jquery-editable.css
diff --git a/css/style.css b/css/style.css
diff --git a/img/app.svg b/img/app.svg
diff --git a/img/clear.png b/img/clear.png
diff --git a/img/loading.gif b/img/loading.gif
diff --git a/img/save.svg b/img/save.svg
diff --git a/js/app.js b/js/app.js
diff --git a/js/deviceactions.js b/js/deviceactions.js
diff --git a/js/jquery-editable-poshytip.min.js b/js/jquery-editable-poshytip.min.js
diff --git a/js/jquery.jqplot.min.js b/js/jquery.jqplot.min.js
diff --git a/js/jquery.poshytip.min.js b/js/jquery.poshytip.min.js
diff --git a/js/navigation.js b/js/navigation.js
diff --git a/js/plugins/jqplot.BezierCurveRenderer.js b/js/plugins/jqplot.BezierCurveRenderer.js
diff --git a/js/plugins/jqplot.BezierCurveRenderer.min.js b/js/plugins/jqplot.BezierCurveRenderer.min.js
diff --git a/js/plugins/jqplot.barRenderer.js b/js/plugins/jqplot.barRenderer.js
diff --git a/js/plugins/jqplot.barRenderer.min.js b/js/plugins/jqplot.barRenderer.min.js
diff --git a/js/plugins/jqplot.blockRenderer.js b/js/plugins/jqplot.blockRenderer.js
diff --git a/js/plugins/jqplot.blockRenderer.min.js b/js/plugins/jqplot.blockRenderer.min.js
diff --git a/js/plugins/jqplot.bubbleRenderer.js b/js/plugins/jqplot.bubbleRenderer.js
diff --git a/js/plugins/jqplot.bubbleRenderer.min.js b/js/plugins/jqplot.bubbleRenderer.min.js
diff --git a/js/plugins/jqplot.canvasAxisLabelRenderer.js b/js/plugins/jqplot.canvasAxisLabelRenderer.js
diff --git a/js/plugins/jqplot.canvasAxisLabelRenderer.min.js b/js/plugins/jqplot.canvasAxisLabelRenderer.min.js
diff --git a/js/plugins/jqplot.canvasAxisTickRenderer.js b/js/plugins/jqplot.canvasAxisTickRenderer.js
diff --git a/js/plugins/jqplot.canvasAxisTickRenderer.min.js b/js/plugins/jqplot.canvasAxisTickRenderer.min.js
diff --git a/js/plugins/jqplot.canvasOverlay.js b/js/plugins/jqplot.canvasOverlay.js
diff --git a/js/plugins/jqplot.canvasOverlay.min.js b/js/plugins/jqplot.canvasOverlay.min.js
diff --git a/js/plugins/jqplot.canvasTextRenderer.js b/js/plugins/jqplot.canvasTextRenderer.js
diff --git a/js/plugins/jqplot.canvasTextRenderer.min.js b/js/plugins/jqplot.canvasTextRenderer.min.js
diff --git a/js/plugins/jqplot.categoryAxisRenderer.js b/js/plugins/jqplot.categoryAxisRenderer.js
diff --git a/js/plugins/jqplot.categoryAxisRenderer.min.js b/js/plugins/jqplot.categoryAxisRenderer.min.js
diff --git a/js/plugins/jqplot.ciParser.js b/js/plugins/jqplot.ciParser.js
diff --git a/js/plugins/jqplot.ciParser.min.js b/js/plugins/jqplot.ciParser.min.js
diff --git a/js/plugins/jqplot.cursor.js b/js/plugins/jqplot.cursor.js
diff --git a/js/plugins/jqplot.cursor.min.js b/js/plugins/jqplot.cursor.min.js
diff --git a/js/plugins/jqplot.dateAxisRenderer.js b/js/plugins/jqplot.dateAxisRenderer.js
diff --git a/js/plugins/jqplot.dateAxisRenderer.min.js b/js/plugins/jqplot.dateAxisRenderer.min.js
diff --git a/js/plugins/jqplot.donutRenderer.js b/js/plugins/jqplot.donutRenderer.js
diff --git a/js/plugins/jqplot.donutRenderer.min.js b/js/plugins/jqplot.donutRenderer.min.js
diff --git a/js/plugins/jqplot.dragable.js b/js/plugins/jqplot.dragable.js
diff --git a/js/plugins/jqplot.dragable.min.js b/js/plugins/jqplot.dragable.min.js
diff --git a/js/plugins/jqplot.enhancedLegendRenderer.js b/js/plugins/jqplot.enhancedLegendRenderer.js
diff --git a/js/plugins/jqplot.enhancedLegendRenderer.min.js b/js/plugins/jqplot.enhancedLegendRenderer.min.js
diff --git a/js/plugins/jqplot.funnelRenderer.js b/js/plugins/jqplot.funnelRenderer.js
diff --git a/js/plugins/jqplot.funnelRenderer.min.js b/js/plugins/jqplot.funnelRenderer.min.js
diff --git a/js/plugins/jqplot.highlighter.js b/js/plugins/jqplot.highlighter.js
diff --git a/js/plugins/jqplot.highlighter.min.js b/js/plugins/jqplot.highlighter.min.js
diff --git a/js/plugins/jqplot.json2.js b/js/plugins/jqplot.json2.js
diff --git a/js/plugins/jqplot.json2.min.js b/js/plugins/jqplot.json2.min.js
diff --git a/js/plugins/jqplot.logAxisRenderer.js b/js/plugins/jqplot.logAxisRenderer.js
diff --git a/js/plugins/jqplot.logAxisRenderer.min.js b/js/plugins/jqplot.logAxisRenderer.min.js
diff --git a/js/plugins/jqplot.mekkoAxisRenderer.js b/js/plugins/jqplot.mekkoAxisRenderer.js
diff --git a/js/plugins/jqplot.mekkoAxisRenderer.min.js b/js/plugins/jqplot.mekkoAxisRenderer.min.js
diff --git a/js/plugins/jqplot.mekkoRenderer.js b/js/plugins/jqplot.mekkoRenderer.js
diff --git a/js/plugins/jqplot.mekkoRenderer.min.js b/js/plugins/jqplot.mekkoRenderer.min.js
diff --git a/js/plugins/jqplot.meterGaugeRenderer.js b/js/plugins/jqplot.meterGaugeRenderer.js
diff --git a/js/plugins/jqplot.meterGaugeRenderer.min.js b/js/plugins/jqplot.meterGaugeRenderer.min.js
diff --git a/js/plugins/jqplot.mobile.js b/js/plugins/jqplot.mobile.js
diff --git a/js/plugins/jqplot.mobile.min.js b/js/plugins/jqplot.mobile.min.js
diff --git a/js/plugins/jqplot.ohlcRenderer.js b/js/plugins/jqplot.ohlcRenderer.js
diff --git a/js/plugins/jqplot.ohlcRenderer.min.js b/js/plugins/jqplot.ohlcRenderer.min.js
diff --git a/js/plugins/jqplot.pieRenderer.js b/js/plugins/jqplot.pieRenderer.js
diff --git a/js/plugins/jqplot.pieRenderer.min.js b/js/plugins/jqplot.pieRenderer.min.js
diff --git a/js/plugins/jqplot.pointLabels.js b/js/plugins/jqplot.pointLabels.js
diff --git a/js/plugins/jqplot.pointLabels.min.js b/js/plugins/jqplot.pointLabels.min.js
diff --git a/js/plugins/jqplot.pyramidAxisRenderer.js b/js/plugins/jqplot.pyramidAxisRenderer.js
diff --git a/js/plugins/jqplot.pyramidAxisRenderer.min.js b/js/plugins/jqplot.pyramidAxisRenderer.min.js
diff --git a/js/plugins/jqplot.pyramidGridRenderer.js b/js/plugins/jqplot.pyramidGridRenderer.js
diff --git a/js/plugins/jqplot.pyramidGridRenderer.min.js b/js/plugins/jqplot.pyramidGridRenderer.min.js
diff --git a/js/plugins/jqplot.pyramidRenderer.js b/js/plugins/jqplot.pyramidRenderer.js
diff --git a/js/plugins/jqplot.pyramidRenderer.min.js b/js/plugins/jqplot.pyramidRenderer.min.js
diff --git a/js/plugins/jqplot.trendline.js b/js/plugins/jqplot.trendline.js
diff --git a/js/plugins/jqplot.trendline.min.js b/js/plugins/jqplot.trendline.min.js
diff --git a/js/script.js b/js/script.js
diff --git a/js/utils.js b/js/utils.js
diff --git a/lib/App.php b/lib/App.php
diff --git a/lib/DataType.php b/lib/DataType.php
diff --git a/lib/DataTypes.php b/lib/DataTypes.php
@@ -50,6 +50,33 @@ public static function getDataTypeById($userId, $dataTypeId, IDBConnection $db)
 		return $data;
 	}
 
+	/**
+	 * @param $userId
+	 * @param IDBConnection $db
+	 * @return array
+	 */
+	public static function getDataTypesByUserId($userId, IDBConnection $db) {
+		$query = $db->getQueryBuilder();
+		$query->select('*')
+			->from('sensorlogger_data_types')
+			->where('user_id = "'.$userId.'"');
+		$results = $query->execute();
+
+		$data = [];
+
+		foreach($results->fetchAll() as $result) {
+			$data[] = DataType::fromRow($result);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @param $userId
+	 * @param $deviceId
+	 * @param IDBConnection $db
+	 * @return array
+	 */
 	public static function getDeviceDataTypesByDeviceId($userId, $deviceId, IDBConnection $db) {
 		$query = $db->getQueryBuilder();
 		$query->select(array('sdt.id','sdt.description','sdt.type','sdt.short','sdt.type'))

diff --git a/lib/Device.php b/lib/Device.php
diff --git a/lib/DeviceTypes.php b/lib/DeviceTypes.php
diff --git a/lib/Group.php b/lib/Group.php
diff --git a/lib/Log.php b/lib/Log.php
diff --git a/lib/LogExtended.php b/lib/LogExtended.php
diff --git a/lib/SensorDevices.php b/lib/SensorDevices.php
diff --git a/lib/SensorGroups.php b/lib/SensorGroups.php
diff --git a/lib/SensorLogs.php b/lib/SensorLogs.php
diff --git a/lib/Type.php b/lib/Type.php
diff --git a/lib/Widget.php b/lib/Widget.php
diff --git a/lib/Widgets.php b/lib/Widgets.php
diff --git a/phpunit.integration.xml b/phpunit.integration.xml
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/templates/main.php b/templates/main.php
diff --git a/templates/part.chart.php b/templates/part.chart.php
diff --git a/templates/part.dashboard.php b/templates/part.dashboard.php
diff --git a/templates/part.list.php b/templates/part.list.php
diff --git a/templates/part.listDataTypes.php b/templates/part.listDataTypes.php
diff --git a/templates/part.listDeviceGroups.php b/templates/part.listDeviceGroups.php
diff --git a/templates/part.listDeviceTypes.php b/templates/part.listDeviceTypes.php
diff --git a/templates/part.listDevices.php b/templates/part.listDevices.php
diff --git a/templates/part.listSharedDevices.php b/templates/part.listSharedDevices.php
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
diff --git a/templates/part.settings.php b/templates/part.settings.php
diff --git a/templates/widget_dashboard.php b/templates/widget_dashboard.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/curl/createlog_example.json b/tests/curl/createlog_example.json
diff --git a/tests/curl/createlog_extend_example.json b/tests/curl/createlog_extend_example.json
diff --git a/tests/curl/datatyperesponse.json b/tests/curl/datatyperesponse.json
diff --git a/tests/curl/getdatatypes.php b/tests/curl/getdatatypes.php
diff --git a/tests/curl/post.php b/tests/curl/post.php
diff --git a/tests/curl/post_extend.php b/tests/curl/post_extend.php
diff --git a/tests/curl/post_extend_0.php b/tests/curl/post_extend_0.php
diff --git a/tests/curl/put.php b/tests/curl/put.php
diff --git a/tests/curl/register.php b/tests/curl/register.php
diff --git a/tests/curl/register_extend_0.php b/tests/curl/register_extend_0.php
diff --git a/tests/curl/registerdevice_example.json b/tests/curl/registerdevice_example.json
diff --git a/tests/integration/AppTest.php b/tests/integration/AppTest.php