Fixing relations propagation

FastyBird · Sep 1, 2021 · 7fe6934 · 7fe6934
1 parent 75e718e
commit 7fe6934
Show file tree

Hide file tree

Showing 15 changed files with 466 additions and 474 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -19,3 +19,6 @@ max-attributes=10
 
 # Maximum number of statements in function / method body
 max-statements=300
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=0
diff --git a/devices_module/models.py b/devices_module/models.py
diff --git a/public/lib/jsonapi/JsonApiModelPropertiesMapper.ts b/public/lib/jsonapi/JsonApiModelPropertiesMapper.ts
@@ -30,20 +30,20 @@ class JsonApiModelPropertiesMapper extends ModelPropertiesMapper implements IMod
     ) {
       exceptProps.push('deviceId')
       exceptProps.push('device')
-      exceptProps.push('device_backward')
+      exceptProps.push('deviceBackward')
 
       if (model.type === DeviceConnectorEntityTypes.CONNECTOR) {
         exceptProps.push('connectorId')
         exceptProps.push('connector')
-        exceptProps.push('connector_backward')
+        exceptProps.push('connectorBackward')
       }
     } else if (
       model.type === ChannelPropertyEntityTypes.PROPERTY ||
       model.type === ChannelConfigurationEntityTypes.CONFIGURATION
     ) {
       exceptProps.push('channelId')
       exceptProps.push('channel')
-      exceptProps.push('channel_backward')
+      exceptProps.push('channelBackward')
     }
 
     if (Array.isArray(model[RELATIONSHIP_NAMES_PROP])) {

diff --git a/public/lib/models/channel-configuration/index.ts b/public/lib/models/channel-configuration/index.ts
@@ -378,7 +378,7 @@ const moduleActions: ActionTree<ChannelConfigurationState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'channel') {
-              const channel = Channel.query().where('channel', body[attrName]).first()
+              const channel = Channel.query().where('id', body[attrName]).first()
 
               if (channel !== null) {
                 entityData.channelId = channel.id

diff --git a/public/lib/models/channel-properties/index.ts b/public/lib/models/channel-properties/index.ts
@@ -378,7 +378,7 @@ const moduleActions: ActionTree<ChannelPropertyState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'channel') {
-              const channel = Channel.query().where('channel', body[attrName]).first()
+              const channel = Channel.query().where('id', body[attrName]).first()
 
               if (channel !== null) {
                 entityData.channelId = channel.id

diff --git a/public/lib/models/channels/index.ts b/public/lib/models/channels/index.ts
@@ -363,7 +363,7 @@ const moduleActions: ActionTree<ChannelState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'device') {
-              const device = Device.query().where('identifier', body[attrName]).first()
+              const device = Device.query().where('id', body[attrName]).first()
 
               if (device !== null) {
                 entityData.deviceId = device.id

diff --git a/public/lib/models/device-configuration/index.ts b/public/lib/models/device-configuration/index.ts
@@ -370,7 +370,7 @@ const moduleActions: ActionTree<DeviceConfigurationState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'device') {
-              const device = Device.query().where('device', body[attrName]).first()
+              const device = Device.query().where('id', body[attrName]).first()
 
               if (device !== null) {
                 entityData.deviceId = device.id

diff --git a/public/lib/models/device-connector/index.ts b/public/lib/models/device-connector/index.ts
@@ -37,6 +37,7 @@ import {
   JsonApiJsonPropertiesMapper,
 } from '@/lib/jsonapi'
 import { DeviceConnectorJsonModelInterface, ModuleApiPrefix, SemaphoreTypes } from '@/lib/types'
+import Connector from '@/lib/models/connectors/Connector'
 import { ConnectorInterface } from '@/lib/models/connectors/types'
 
 interface SemaphoreFetchingState {
@@ -402,11 +403,17 @@ const moduleActions: ActionTree<DeviceConnectorState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'device') {
-              const device = Device.query().where('identifier', body[attrName]).first()
+              const device = Device.query().where('id', body[attrName]).first()
 
               if (device !== null) {
                 entityData.deviceId = device.id
               }
+            } else if (camelName === 'connector') {
+              const connector = Connector.query().where('id', body[attrName]).first()
+
+              if (connector !== null) {
+                entityData.connectorId = connector.id
+              }
             } else {
               entityData[camelName] = body[attrName]
             }

diff --git a/public/lib/models/device-properties/index.ts b/public/lib/models/device-properties/index.ts
@@ -370,7 +370,7 @@ const moduleActions: ActionTree<DevicePropertyState, unknown> = {
             const camelName = attrName.replace(camelRegex, g => g[1].toUpperCase())
 
             if (camelName === 'device') {
-              const device = Device.query().where('identifier', body[attrName]).first()
+              const device = Device.query().where('id', body[attrName]).first()
 
               if (device !== null) {
                 entityData.deviceId = device.id

diff --git a/src/Entities/Channels/Channel.php b/src/Entities/Channels/Channel.php
@@ -400,7 +400,7 @@ public function toArray(): array
 
 			'params' => (array) $this->getParams(),
 
-			'owner'  => $this->getDevice()->getOwnerId(),
+			'device'  => $this->getDevice()->getPlainId(),
 		];
 	}
 

diff --git a/src/Entities/Channels/Configuration/Row.php b/src/Entities/Channels/Configuration/Row.php
@@ -76,7 +76,7 @@ public function __construct(
 	public function toArray(): array
 	{
 		return array_merge(parent::toArray(), [
-			'owner' => $this->getChannel()->getDevice()->getOwnerId(),
+			'channel' => $this->getChannel()->getPlainId(),
 		]);
 	}
 

diff --git a/src/Entities/Channels/Properties/Property.php b/src/Entities/Channels/Properties/Property.php
@@ -78,7 +78,7 @@ public function __construct(
 	public function toArray(): array
 	{
 		return array_merge(parent::toArray(), [
-			'owner' => $this->getChannel()->getDevice()->getOwnerId(),
+			'channel' => $this->getChannel()->getPlainId(),
 		]);
 	}
 

diff --git a/src/Entities/Devices/Configuration/Row.php b/src/Entities/Devices/Configuration/Row.php
@@ -76,7 +76,7 @@ public function __construct(
 	public function toArray(): array
 	{
 		return array_merge(parent::toArray(), [
-			'owner' => $this->getDevice()->getOwnerId(),
+			'device' => $this->getDevice()->getPlainId(),
 		]);
 	}
 

diff --git a/src/Entities/Devices/Connectors/Connector.php b/src/Entities/Devices/Connectors/Connector.php
@@ -233,8 +233,8 @@ public function toArray(): array
 	{
 		$baseProperties = [
 			'id'        => $this->getPlainId(),
-			'device'    => $this->getDevice()->getKey(),
-			'connector' => $this->getConnector()->getType(),
+			'device'    => $this->getDevice()->getPlainId(),
+			'connector' => $this->getConnector()->getPlainId(),
 		];
 
 		if ($this->getConnector() instanceof Entities\Connectors\FbBusConnector) {

diff --git a/src/Entities/Devices/Properties/Property.php b/src/Entities/Devices/Properties/Property.php
@@ -78,7 +78,7 @@ public function __construct(
 	public function toArray(): array
 	{
 		return array_merge(parent::toArray(), [
-			'owner' => $this->getDevice()->getOwnerId(),
+			'device' => $this->getDevice()->getPlainId(),
 		]);
 	}