Fixing using state entity data

FastyBird · Aug 11, 2021 · cda8863 · cda8863
1 parent 5cb8305
commit cda8863
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/ruleset.xml b/ruleset.xml
@@ -5,10 +5,6 @@
         <!-- we want brace on same line for multi-line definitions, checked by Squiz.Functions.MultiLineFunctionDeclaration -->
         <exclude name="Generic.Functions.OpeningFunctionBraceBsdAllman.BraceOnSameLine"/>
 
-        <exclude name="SlevomatCodingStandard.ControlStructures.RequireTernaryOperator"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.AssignmentInCondition.assignmentInCondition"/>
-
         <exclude name="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden"/>
         <exclude name="SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectLinesCountBetweenDifferentAnnotationsTypes"/>
 

diff --git a/src/Helpers/PropertyHelper.php b/src/Helpers/PropertyHelper.php
@@ -35,7 +35,7 @@ final class PropertyHelper
 	 *
 	 * @return bool|float|int|string|null
 	 */
-	public function normalizeValue(
+	public static function normalizeValue(
 		Entities\IProperty $property,
 		$value
 	) {

diff --git a/src/Schemas/Channels/Properties/PropertySchema.php b/src/Schemas/Channels/Properties/PropertySchema.php
@@ -17,6 +17,7 @@
 
 use FastyBird\DevicesModule;
 use FastyBird\DevicesModule\Entities;
+use FastyBird\DevicesModule\Helpers;
 use FastyBird\DevicesModule\Models;
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
@@ -99,8 +100,8 @@ public function getAttributes($property, JsonApi\Contracts\Schema\ContextInterfa
 			'data_type'      => $property->getDataType() !== null ? $property->getDataType()->getValue() : null,
 			'unit'           => $property->getUnit(),
 			'format'         => is_array($property->getFormat()) ? implode(',', $property->getFormat()) : $property->getFormat(),
-			'actual_value'   => $state !== null ? $state->getActualValue() : null,
-			'expected_value' => $state !== null ? $state->getExpectedValue() : null,
+			'actual_value'   => $state !== null ? Helpers\PropertyHelper::normalizeValue($property, $state->getActualValue()) : null,
+			'expected_value' => $state !== null ? Helpers\PropertyHelper::normalizeValue($property, $state->getExpectedValue()) : null,
 			'pending'        => $state !== null && $state->isPending(),
 		];
 	}

diff --git a/src/Schemas/Devices/Properties/PropertySchema.php b/src/Schemas/Devices/Properties/PropertySchema.php
@@ -17,6 +17,7 @@
 
 use FastyBird\DevicesModule;
 use FastyBird\DevicesModule\Entities;
+use FastyBird\DevicesModule\Helpers;
 use FastyBird\DevicesModule\Models;
 use FastyBird\DevicesModule\Router;
 use FastyBird\DevicesModule\Schemas;
@@ -99,8 +100,8 @@ public function getAttributes($property, JsonApi\Contracts\Schema\ContextInterfa
 			'data_type'      => $property->getDataType() !== null ? $property->getDataType()->getValue() : null,
 			'unit'           => $property->getUnit(),
 			'format'         => is_array($property->getFormat()) ? implode(',', $property->getFormat()) : $property->getFormat(),
-			'actual_value'   => $state !== null ? $state->getActualValue() : null,
-			'expected_value' => $state !== null ? $state->getExpectedValue() : null,
+			'actual_value'   => $state !== null ? Helpers\PropertyHelper::normalizeValue($property, $state->getActualValue()) : null,
+			'expected_value' => $state !== null ? Helpers\PropertyHelper::normalizeValue($property, $state->getExpectedValue()) : null,
 			'pending'        => $state !== null && $state->isPending(),
 		];
 	}

diff --git a/src/Subscribers/EntitiesSubscriber.php b/src/Subscribers/EntitiesSubscriber.php
@@ -70,7 +70,8 @@ public function __construct(
 		ApplicationExchangePublisher\IPublisher $publisher,
 		ORM\EntityManagerInterface $entityManager,
 		?Models\States\IPropertyRepository $propertyStateRepository = null
-	) {
+	)
+	{
 		$this->numberHashHelper = $numberHashHelper;
 		$this->dateTimeFactory = $dateTimeFactory;
 		$this->propertyStateRepository = $propertyStateRepository;
@@ -192,7 +193,11 @@ private function processEntityAction(Entities\IEntity $entity, string $action):
 				$this->publisher->publish(
 					ModulesMetadata\Constants::MODULE_DEVICES_ORIGIN,
 					$publishRoutingKey,
-					array_merge($state !== null ? $state->toArray() : [], $this->toArray($entity))
+					array_merge($state !== null ? [
+						'actual_value'   => Helpers\PropertyHelper::normalizeValue($entity, $state->getActualValue()),
+						'expected_value' => Helpers\PropertyHelper::normalizeValue($entity, $state->getExpectedValue()),
+						'pending'        => $state->isPending(),
+					] : [], $this->toArray($entity))
 				);
 			} else {
 				$this->publisher->publish(