Move value helper under metadata (#180)

FastyBird · Nov 20, 2023 · 8fac456 · 8fac456
1 parent d7a5fcf
commit 8fac456
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/src/Drivers/Thermostat.php b/src/Drivers/Thermostat.php
@@ -25,6 +25,7 @@
 use FastyBird\DateTimeFactory;
 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\Entities as DevicesEntities;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Utilities as DevicesUtilities;
@@ -126,7 +127,7 @@ public function connect(): Promise\PromiseInterface
 				$actualValue = Helpers\Transformer::fromMappedParent($actor, $actualValue);
 			}
 
-			$actualValue = DevicesUtilities\ValueHelper::normalizeValue(
+			$actualValue = MetadataUtilities\ValueHelper::normalizeValue(
 				$actor->getDataType(),
 				$actualValue,
 				$actor->getFormat(),
@@ -153,7 +154,7 @@ public function connect(): Promise\PromiseInterface
 				$actualValue = Helpers\Transformer::fromMappedParent($sensor, $actualValue);
 			}
 
-			$actualValue = DevicesUtilities\ValueHelper::normalizeValue(
+			$actualValue = MetadataUtilities\ValueHelper::normalizeValue(
 				$sensor->getDataType(),
 				$actualValue,
 				$sensor->getFormat(),
@@ -183,7 +184,7 @@ public function connect(): Promise\PromiseInterface
 				$actualValue = Helpers\Transformer::fromMappedParent($opening, $actualValue);
 			}
 
-			$actualValue = DevicesUtilities\ValueHelper::normalizeValue(
+			$actualValue = MetadataUtilities\ValueHelper::normalizeValue(
 				$opening->getDataType(),
 				$actualValue,
 				$opening->getFormat(),

diff --git a/src/Queue/Consumers/StoreChannelPropertyState.php b/src/Queue/Consumers/StoreChannelPropertyState.php
@@ -26,6 +26,7 @@
 use FastyBird\Library\Exchange\Publisher as ExchangePublisher;
 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\Entities as DevicesEntities;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
@@ -185,7 +186,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 		}
 
 		$valueToStore = $entity->getValue();
-		$valueToStore = DevicesUtilities\ValueHelper::normalizeValue(
+		$valueToStore = MetadataUtilities\ValueHelper::normalizeValue(
 			$property->getDataType(),
 			$valueToStore,
 			$property->getFormat(),
@@ -200,12 +201,14 @@ public function consume(Entities\Messages\Entity $entity): bool
 			$this->channelsPropertiesManager->update(
 				$property,
 				Utils\ArrayHash::from([
-					'value' => DevicesUtilities\ValueHelper::flattenValue($valueToStore),
+					'value' => MetadataUtilities\ValueHelper::flattenValue($valueToStore),
 				]),
 			);
 		} elseif ($property instanceof DevicesEntities\Channels\Properties\Dynamic) {
 			$this->channelPropertiesStateManager->setValue($property, Utils\ArrayHash::from([
-				DevicesStates\Property::ACTUAL_VALUE_FIELD => DevicesUtilities\ValueHelper::flattenValue($valueToStore),
+				DevicesStates\Property::ACTUAL_VALUE_FIELD => MetadataUtilities\ValueHelper::flattenValue(
+					$valueToStore,
+				),
 				DevicesStates\Property::VALID_FIELD => true,
 			]));
 		} elseif ($property instanceof DevicesEntities\Channels\Properties\Mapped) {
@@ -224,7 +227,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 								'device' => $device->getId()->toString(),
 								'channel' => $channel->getId()->toString(),
 								'property' => $property->getId()->toString(),
-								'expected_value' => DevicesUtilities\ValueHelper::flattenValue($valueToStore),
+								'expected_value' => MetadataUtilities\ValueHelper::flattenValue($valueToStore),
 							]),
 							MetadataTypes\RoutingKey::get(
 								MetadataTypes\RoutingKey::CHANNEL_PROPERTY_ACTION,

diff --git a/src/Queue/Consumers/WriteChannelPropertyState.php b/src/Queue/Consumers/WriteChannelPropertyState.php
@@ -27,6 +27,7 @@
 use FastyBird\Library\Bootstrap\Helpers as BootstrapHelpers;
 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\Entities as DevicesEntities;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
@@ -249,7 +250,7 @@ public function consume(Entities\Messages\Entity $entity): bool
 			$valueToWrite = Helpers\Transformer::fromMappedParent($property, $valueToWrite);
 		}
 
-		$valueToWrite = DevicesUtilities\ValueHelper::normalizeValue(
+		$valueToWrite = MetadataUtilities\ValueHelper::normalizeValue(
 			$property->getDataType(),
 			$valueToWrite,
 			$property->getFormat(),

diff --git a/src/Writers/Periodic.php b/src/Writers/Periodic.php
@@ -24,6 +24,7 @@
 use FastyBird\DateTimeFactory;
 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\Entities as DevicesEntities;
 use FastyBird\Module\Devices\Exceptions as DevicesExceptions;
 use FastyBird\Module\Devices\Models as DevicesModels;
@@ -181,8 +182,10 @@ private function writeChannelsProperty(Entities\VirtualDevice $device): bool
 				}
 
 				$valueToWrite = $property instanceof DevicesEntities\Channels\Properties\Mapped
-					? DevicesUtilities\ValueHelper::flattenValue($state->getExpectedValue() ?? $state->getActualValue())
-					: DevicesUtilities\ValueHelper::flattenValue($state->getExpectedValue());
+					? MetadataUtilities\ValueHelper::flattenValue(
+						$state->getExpectedValue() ?? $state->getActualValue(),
+					)
+					: MetadataUtilities\ValueHelper::flattenValue($state->getExpectedValue());
 
 				if (
 					(

diff --git a/tests/fixtures/dummy/DummyChannelPropertyState.php b/tests/fixtures/dummy/DummyChannelPropertyState.php
@@ -8,7 +8,6 @@
 use Exception;
 use FastyBird\Library\Metadata\Types as MetadataTypes;
 use FastyBird\Module\Devices\States as DevicesStates;
-use FastyBird\Module\Devices\Utilities as DevicesUtilities;
 use Nette\Utils;
 use Ramsey\Uuid;
 use function is_bool;
@@ -126,8 +125,8 @@ public function toArray(): array
 	{
 		return [
 			'id' => $this->getId()->toString(),
-			'actual_value' => DevicesUtilities\ValueHelper::flattenValue($this->getActualValue()),
-			'expected_value' => DevicesUtilities\ValueHelper::flattenValue($this->getExpectedValue()),
+			'actual_value' => MetadataUtilities\ValueHelper::flattenValue($this->getActualValue()),
+			'expected_value' => MetadataUtilities\ValueHelper::flattenValue($this->getExpectedValue()),
 			'pending' => $this->getPending() instanceof DateTimeInterface ? $this->getPending()->format(
 				DateTimeInterface::ATOM,
 			) : $this->getPending(),