Refactoring processing of virtual connector (#184)

FastyBird · Nov 22, 2023 · 851454d · 851454d
1 parent 467ba2a
commit 851454d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/Controllers/CharacteristicsController.php b/src/Controllers/CharacteristicsController.php
@@ -521,7 +521,6 @@ private function readCharacteristic(
 	 * @throws MetadataExceptions\InvalidArgument
 	 * @throws MetadataExceptions\InvalidState
 	 * @throws MetadataExceptions\MalformedInput
-	 * @throws Utils\JsonException
 	 */
 	public function writeCharacteristic(
 		Uuid\UuidInterface $connectorId,
@@ -705,13 +704,12 @@ public function writeCharacteristic(
 									$this->channelsPropertiesStateManager->writeValue(
 										$row->getProperty(),
 										Utils\ArrayHash::from([
-											DevicesStates\Property::VALID_FIELD => true,
 											DevicesStates\Property::EXPECTED_VALUE_FIELD => $row->getValue(),
 											DevicesStates\Property::PENDING_FIELD => true,
 										]),
 									);
 								}
-							} catch (Exceptions\InvalidState $ex) {
+							} catch (DevicesExceptions\InvalidState | Utils\JsonException $ex) {
 								$this->logger->warning(
 									'State value could not be converted to mapped parent',
 									[

diff --git a/src/Writers/Exchange.php b/src/Writers/Exchange.php
@@ -29,7 +29,6 @@
 use FastyBird\Library\Metadata\Documents as MetadataDocuments;
 use FastyBird\Library\Metadata\Exceptions as MetadataExceptions;
 use FastyBird\Library\Metadata\Types as MetadataTypes;
-use FastyBird\Library\Metadata\Utilities as MetadataUtilities;
 use FastyBird\Module\Devices\Events as DevicesEvents;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
@@ -299,12 +298,9 @@ private function processProperty(
 
 						if ($parent instanceof MetadataDocuments\DevicesModule\ChannelDynamicProperty) {
 							try {
-								$characteristic->setActualValue(MetadataUtilities\ValueHelper::normalizeValue(
-									$entity->getDataType(),
+								$characteristic->setActualValue(
 									$entity->getExpectedValue() ?? $entity->getActualValue(),
-									$entity->getFormat(),
-									$entity->getInvalid(),
-								));
+								);
 							} catch (Exceptions\InvalidState $ex) {
 								$this->logger->warning(
 									'State value could not be converted from mapped parent',