[common] Fixing property parent - child value mapping (#174)

FastyBird · Nov 19, 2023 · 8b212e0 · 8b212e0
1 parent b702ebc
commit 8b212e0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/Queue/Consumers/StoreDeviceConnectionState.php b/src/Queue/Consumers/StoreDeviceConnectionState.php
@@ -58,6 +58,7 @@ public function __construct(
 
 	/**
 	 * @throws DBAL\Exception
+	 * @throws DevicesExceptions\InvalidArgument
 	 * @throws DevicesExceptions\InvalidState
 	 * @throws DevicesExceptions\Runtime
 	 * @throws MetadataExceptions\InvalidArgument

diff --git a/src/Queue/Consumers/StoreDeviceState.php b/src/Queue/Consumers/StoreDeviceState.php
@@ -66,6 +66,7 @@ public function __construct(
 
 	/**
 	 * @throws DoctrineCrudExceptions\InvalidArgumentException
+	 * @throws DevicesExceptions\InvalidArgument
 	 * @throws DevicesExceptions\InvalidState
 	 * @throws ExchangeExceptions\InvalidArgument
 	 * @throws ExchangeExceptions\InvalidState
@@ -132,6 +133,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 	/**
 	 * @param array<Entities\Messages\CapabilityState> $state
 	 *
+	 * @throws DevicesExceptions\InvalidArgument
 	 * @throws DevicesExceptions\InvalidState
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
@@ -174,12 +176,12 @@ private function processSubDevice(
 			$this->channelPropertiesStatesManager->writeValue(
 				$property,
 				Utils\ArrayHash::from([
-					DevicesStates\Property::ACTUAL_VALUE_KEY => DevicesUtilities\ValueHelper::transformValueFromDevice(
+					DevicesStates\Property::ACTUAL_VALUE_FIELD => DevicesUtilities\ValueHelper::transformValueFromDevice(
 						$property->getDataType(),
 						$property->getFormat(),
 						DevicesUtilities\ValueHelper::flattenValue($item->getValue()),
 					),
-					DevicesStates\Property::VALID_KEY => true,
+					DevicesStates\Property::VALID_FIELD => true,
 				]),
 			);
 		}
@@ -189,6 +191,7 @@ private function processSubDevice(
 	 * @param array<Entities\Messages\CapabilityState> $state
 	 *
 	 * @throws DoctrineCrudExceptions\InvalidArgumentException
+	 * @throws DevicesExceptions\InvalidArgument
 	 * @throws DevicesExceptions\InvalidState
 	 * @throws ExchangeExceptions\InvalidArgument
 	 * @throws ExchangeExceptions\InvalidState
@@ -246,6 +249,7 @@ private function processThirdPartyDevice(
 
 	/**
 	 * @throws DoctrineCrudExceptions\InvalidArgumentException
+	 * @throws DevicesExceptions\InvalidArgument
 	 * @throws DevicesExceptions\InvalidState
 	 * @throws ExchangeExceptions\InvalidArgument
 	 * @throws ExchangeExceptions\InvalidState
@@ -297,8 +301,8 @@ private function writeProperty(
 			$this->channelPropertiesStatesManager->writeValue(
 				$property,
 				Utils\ArrayHash::from([
-					DevicesStates\Property::EXPECTED_VALUE_KEY => $value,
-					DevicesStates\Property::PENDING_KEY => true,
+					DevicesStates\Property::EXPECTED_VALUE_FIELD => $value,
+					DevicesStates\Property::PENDING_FIELD => true,
 				]),
 			);
 		}

diff --git a/src/Queue/Consumers/WriteSubDeviceState.php b/src/Queue/Consumers/WriteSubDeviceState.php
@@ -279,7 +279,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 								$this->channelPropertiesStatesManager->setValue(
 									$property,
 									Utils\ArrayHash::from([
-										DevicesStates\Property::PENDING_KEY => $now->format(DateTimeInterface::ATOM),
+										DevicesStates\Property::PENDING_FIELD => $now->format(DateTimeInterface::ATOM),
 									]),
 								);
 							}
@@ -292,8 +292,8 @@ public function consume(Entities\Messages\Entity $entity): bool
 							$this->channelPropertiesStatesManager->setValue(
 								$property,
 								Utils\ArrayHash::from([
-									DevicesStates\Property::EXPECTED_VALUE_KEY => null,
-									DevicesStates\Property::PENDING_KEY => false,
+									DevicesStates\Property::EXPECTED_VALUE_FIELD => null,
+									DevicesStates\Property::PENDING_FIELD => false,
 								]),
 							);
 						}

diff --git a/src/Queue/Consumers/WriteThirdPartyDeviceState.php b/src/Queue/Consumers/WriteThirdPartyDeviceState.php
@@ -292,7 +292,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 								$this->channelPropertiesStatesManager->setValue(
 									$property,
 									Utils\ArrayHash::from([
-										DevicesStates\Property::PENDING_KEY => $now->format(DateTimeInterface::ATOM),
+										DevicesStates\Property::PENDING_FIELD => $now->format(DateTimeInterface::ATOM),
 									]),
 								);
 							}
@@ -305,8 +305,8 @@ public function consume(Entities\Messages\Entity $entity): bool
 							$this->channelPropertiesStatesManager->setValue(
 								$property,
 								Utils\ArrayHash::from([
-									DevicesStates\Property::EXPECTED_VALUE_KEY => null,
-									DevicesStates\Property::PENDING_KEY => false,
+									DevicesStates\Property::EXPECTED_VALUE_FIELD => null,
+									DevicesStates\Property::PENDING_FIELD => false,
 								]),
 							);
 						}