Moving doctrine classes into separate namespaces (#161)

FastyBird · Nov 7, 2023 · 194af6c · 194af6c
1 parent c40b6fc
commit 194af6c
Show file tree

Hide file tree

Showing 60 changed files with 173 additions and 162 deletions.
diff --git a/composer.json b/composer.json
@@ -56,6 +56,7 @@
     "react/async": "^4.0",
     "react/event-loop": "^1.3",
     "react/promise": "~2.2",
+    "softcreatr/jsonpath": "^0.8",
     "symfony/console": "^5.0|^6.0",
     "symfony/event-dispatcher": "^5.4",
     "symplify/vendor-patches": "^11.2"

diff --git a/src/Commands/Connector.php b/src/Commands/Connector.php
@@ -294,7 +294,7 @@ private function executeConnector(
 		) {
 			$connectorId = $input->getOption('connector');
 
-			$findConnectorQuery = new Queries\FindConnectors();
+			$findConnectorQuery = new Queries\Entities\FindConnectors();
 
 			if (Uuid\Uuid::isValid($connectorId)) {
 				$findConnectorQuery->byId(Uuid\Uuid::fromString($connectorId));
@@ -314,11 +314,11 @@ private function executeConnector(
 		} else {
 			$connectors = [];
 
-			$findConnectorsQuery = new Queries\FindConnectors();
+			$findConnectorsQuery = new Queries\Entities\FindConnectors();
 
 			foreach ($this->connectorsRepository->findAllBy($findConnectorsQuery) as $connector) {
 				if ($this->mode === self::MODE_DISCOVER) {
-					$findConnectorControlQuery = new Queries\FindConnectorControls();
+					$findConnectorControlQuery = new Queries\Entities\FindConnectorControls();
 					$findConnectorControlQuery->forConnector($connector);
 					$findConnectorControlQuery->byName(MetadataTypes\ControlName::NAME_DISCOVER);
 
@@ -367,7 +367,7 @@ private function executeConnector(
 				return;
 			}
 
-			$findConnectorQuery = new Queries\FindConnectors();
+			$findConnectorQuery = new Queries\Entities\FindConnectors();
 			$findConnectorQuery->byIdentifier($connectorIdentifierKey);
 
 			$this->connector = $this->connectorsRepository->findOneBy($findConnectorQuery);
@@ -395,7 +395,7 @@ private function executeConnector(
 		}
 
 		if ($this->mode === self::MODE_DISCOVER) {
-			$findConnectorControlQuery = new Queries\FindConnectorControls();
+			$findConnectorControlQuery = new Queries\Entities\FindConnectorControls();
 			$findConnectorControlQuery->forConnector($this->connector);
 			$findConnectorControlQuery->byName(MetadataTypes\ControlName::NAME_DISCOVER);
 
@@ -616,7 +616,7 @@ private function resetConnector(
 		MetadataTypes\ConnectionState $state,
 	): void
 	{
-		$findConnectorPropertiesQuery = new Queries\FindConnectorDynamicProperties();
+		$findConnectorPropertiesQuery = new Queries\Entities\FindConnectorDynamicProperties();
 		$findConnectorPropertiesQuery->forConnector($connector);
 
 		foreach ($this->connectorsPropertiesRepository->findAllBy(
@@ -626,7 +626,7 @@ private function resetConnector(
 			$this->connectorPropertiesStateManager->setValidState($property, false);
 		}
 
-		$findDevicesQuery = new Queries\FindDevices();
+		$findDevicesQuery = new Queries\Entities\FindDevices();
 		$findDevicesQuery->byConnectorId($connector->getId());
 
 		foreach ($this->devicesRepository->findAllBy($findDevicesQuery) as $device) {
@@ -646,7 +646,7 @@ private function resetDevice(
 	{
 		$this->deviceConnectionManager->setState($device, $state);
 
-		$findDevicePropertiesQuery = new Queries\FindDeviceDynamicProperties();
+		$findDevicePropertiesQuery = new Queries\Entities\FindDeviceDynamicProperties();
 		$findDevicePropertiesQuery->forDevice($device);
 
 		foreach ($this->devicesPropertiesRepository->findAllBy(
@@ -656,11 +656,11 @@ private function resetDevice(
 			$this->devicePropertiesStateManager->setValidState($property, false);
 		}
 
-		$findChannelsQuery = new Queries\FindChannels();
+		$findChannelsQuery = new Queries\Entities\FindChannels();
 		$findChannelsQuery->forDevice($device);
 
 		foreach ($this->channelsRepository->findAllBy($findChannelsQuery) as $channel) {
-			$findChannelPropertiesQuery = new Queries\FindChannelDynamicProperties();
+			$findChannelPropertiesQuery = new Queries\Entities\FindChannelDynamicProperties();
 			$findChannelPropertiesQuery->forChannel($channel);
 
 			foreach ($this->channelsPropertiesRepository->findAllBy(
@@ -671,7 +671,7 @@ private function resetDevice(
 			}
 		}
 
-		$findChildrenQuery = new Queries\FindDevices();
+		$findChildrenQuery = new Queries\Entities\FindDevices();
 		$findChildrenQuery->forParent($device);
 
 		foreach ($this->devicesRepository->findAllBy($findChildrenQuery) as $child) {

diff --git a/src/Consumers/State.php b/src/Consumers/State.php
@@ -89,7 +89,7 @@ public function consume(
 		if (in_array($routingKey->getValue(), self::PROPERTIES_ACTIONS_ROUTING_KEYS, true)) {
 			if ($entity instanceof MetadataEntities\Actions\ActionConnectorProperty) {
 				if ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_SET)) {
-					$findConnectorPropertyQuery = new Queries\FindConnectorProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindConnectorProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->connectorPropertiesRepository->findOneBy($findConnectorPropertyQuery);
@@ -106,7 +106,7 @@ public function consume(
 						]),
 					);
 				} elseif ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_GET)) {
-					$findConnectorPropertyQuery = new Queries\FindConnectorProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindConnectorProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->connectorPropertiesRepository->findOneBy($findConnectorPropertyQuery);
@@ -139,7 +139,7 @@ public function consume(
 				}
 			} elseif ($entity instanceof MetadataEntities\Actions\ActionDeviceProperty) {
 				if ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_SET)) {
-					$findConnectorPropertyQuery = new Queries\FindDeviceProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindDeviceProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->devicePropertiesRepository->findOneBy($findConnectorPropertyQuery);
@@ -159,7 +159,7 @@ public function consume(
 						]),
 					);
 				} elseif ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_GET)) {
-					$findConnectorPropertyQuery = new Queries\FindDeviceProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindDeviceProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->devicePropertiesRepository->findOneBy($findConnectorPropertyQuery);
@@ -192,7 +192,7 @@ public function consume(
 				}
 			} elseif ($entity instanceof MetadataEntities\Actions\ActionChannelProperty) {
 				if ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_SET)) {
-					$findConnectorPropertyQuery = new Queries\FindChannelProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindChannelProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->channelPropertiesRepository->findOneBy($findConnectorPropertyQuery);
@@ -212,7 +212,7 @@ public function consume(
 						]),
 					);
 				} elseif ($entity->getAction()->equalsValue(MetadataTypes\PropertyAction::ACTION_GET)) {
-					$findConnectorPropertyQuery = new Queries\FindChannelProperties();
+					$findConnectorPropertyQuery = new Queries\Entities\FindChannelProperties();
 					$findConnectorPropertyQuery->byId($entity->getProperty());
 
 					$property = $this->channelPropertiesRepository->findOneBy($findConnectorPropertyQuery);

diff --git a/src/Controllers/ChannelControlsV1.php b/src/Controllers/ChannelControlsV1.php
@@ -68,7 +68,7 @@ public function index(
 		// & channel
 		$channel = $this->findChannel(strval($request->getAttribute(Router\ApiRoutes::URL_CHANNEL_ID)), $device);
 
-		$findQuery = new Queries\FindChannelControls();
+		$findQuery = new Queries\Entities\FindChannelControls();
 		$findQuery->forChannel($channel);
 
 		$controls = $this->channelControlsRepository->getResultSet($findQuery);
@@ -93,7 +93,7 @@ public function read(
 		$channel = $this->findChannel(strval($request->getAttribute(Router\ApiRoutes::URL_CHANNEL_ID)), $device);
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindChannelControls();
+			$findQuery = new Queries\Entities\FindChannelControls();
 			$findQuery->forChannel($channel);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 
@@ -131,7 +131,7 @@ public function readRelationship(
 		$relationEntity = Utils\Strings::lower(strval($request->getAttribute(Router\ApiRoutes::RELATION_ENTITY)));
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindChannelControls();
+			$findQuery = new Queries\Entities\FindChannelControls();
 			$findQuery->forChannel($channel);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 

diff --git a/src/Controllers/ChannelPropertiesV1.php b/src/Controllers/ChannelPropertiesV1.php
@@ -81,7 +81,7 @@ public function index(
 		// & channel
 		$channel = $this->findChannel(strval($request->getAttribute(Router\ApiRoutes::URL_CHANNEL_ID)), $device);
 
-		$findQuery = new Queries\FindChannelProperties();
+		$findQuery = new Queries\Entities\FindChannelProperties();
 		$findQuery->forChannel($channel);
 
 		$properties = $this->channelPropertiesRepository->getResultSet($findQuery);

diff --git a/src/Controllers/ChannelPropertyChildrenV1.php b/src/Controllers/ChannelPropertyChildrenV1.php
@@ -65,7 +65,7 @@ public function index(
 		// & property
 		$property = $this->findProperty(strval($request->getAttribute(Router\ApiRoutes::URL_PROPERTY_ID)), $channel);
 
-		$findQuery = new Queries\FindChannelProperties();
+		$findQuery = new Queries\Entities\FindChannelProperties();
 		$findQuery->forParent($property);
 
 		$children = $this->channelPropertiesRepository->getResultSet($findQuery);

diff --git a/src/Controllers/ChannelsV1.php b/src/Controllers/ChannelsV1.php
@@ -76,7 +76,7 @@ public function index(
 		// At first, try to load device
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
-		$findQuery = new Queries\FindChannels();
+		$findQuery = new Queries\Entities\FindChannels();
 		$findQuery->forDevice($device);
 
 		$channels = $this->channelsRepository->getResultSet($findQuery);
@@ -364,7 +364,7 @@ public function readRelationship(
 		$relationEntity = Utils\Strings::lower(strval($request->getAttribute(Router\ApiRoutes::RELATION_ENTITY)));
 
 		if ($relationEntity === Schemas\Channels\Channel::RELATIONSHIPS_PROPERTIES) {
-			$findChannelPropertiesQuery = new Queries\FindChannelProperties();
+			$findChannelPropertiesQuery = new Queries\Entities\FindChannelProperties();
 			$findChannelPropertiesQuery->forChannel($channel);
 
 			return $this->buildResponse(
@@ -373,7 +373,7 @@ public function readRelationship(
 				$this->channelPropertiesRepository->findAllBy($findChannelPropertiesQuery),
 			);
 		} elseif ($relationEntity === Schemas\Channels\Channel::RELATIONSHIPS_CONTROLS) {
-			$findChannelControlsQuery = new Queries\FindChannelControls();
+			$findChannelControlsQuery = new Queries\Entities\FindChannelControls();
 			$findChannelControlsQuery->forChannel($channel);
 
 			return $this->buildResponse(

diff --git a/src/Controllers/ConnectorControlsV1.php b/src/Controllers/ConnectorControlsV1.php
@@ -63,7 +63,7 @@ public function index(
 		// At first, try to load connector
 		$connector = $this->findConnector(strval($request->getAttribute(Router\ApiRoutes::URL_CONNECTOR_ID)));
 
-		$findQuery = new Queries\FindConnectorControls();
+		$findQuery = new Queries\Entities\FindConnectorControls();
 		$findQuery->forConnector($connector);
 
 		$controls = $this->connectorControlsRepository->getResultSet($findQuery);
@@ -85,7 +85,7 @@ public function read(
 		$connector = $this->findConnector(strval($request->getAttribute(Router\ApiRoutes::URL_CONNECTOR_ID)));
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindConnectorControls();
+			$findQuery = new Queries\Entities\FindConnectorControls();
 			$findQuery->forConnector($connector);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 
@@ -120,7 +120,7 @@ public function readRelationship(
 		$relationEntity = Utils\Strings::lower(strval($request->getAttribute(Router\ApiRoutes::RELATION_ENTITY)));
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindConnectorControls();
+			$findQuery = new Queries\Entities\FindConnectorControls();
 			$findQuery->forConnector($connector);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 

diff --git a/src/Controllers/ConnectorPropertiesV1.php b/src/Controllers/ConnectorPropertiesV1.php
@@ -78,7 +78,7 @@ public function index(
 		// At first, try to load connector
 		$connector = $this->findConnector(strval($request->getAttribute(Router\ApiRoutes::URL_CONNECTOR_ID)));
 
-		$findQuery = new Queries\FindConnectorProperties();
+		$findQuery = new Queries\Entities\FindConnectorProperties();
 		$findQuery->forConnector($connector);
 
 		$properties = $this->connectorPropertiesRepository->getResultSet($findQuery);
@@ -389,7 +389,7 @@ private function findProperty(
 	): Entities\Connectors\Properties\Property
 	{
 		try {
-			$findQuery = new Queries\FindConnectorProperties();
+			$findQuery = new Queries\Entities\FindConnectorProperties();
 			$findQuery->forConnector($connector);
 			$findQuery->byId(Uuid\Uuid::fromString($id));
 

diff --git a/src/Controllers/ConnectorsV1.php b/src/Controllers/ConnectorsV1.php
@@ -65,7 +65,7 @@ public function index(
 		Message\ResponseInterface $response,
 	): Message\ResponseInterface
 	{
-		$findQuery = new Queries\FindConnectors();
+		$findQuery = new Queries\Entities\FindConnectors();
 
 		$connectors = $this->connectorsRepository->getResultSet($findQuery);
 
@@ -168,12 +168,12 @@ public function readRelationship(
 		$relationEntity = Utils\Strings::lower(strval($request->getAttribute(Router\ApiRoutes::RELATION_ENTITY)));
 
 		if ($relationEntity === Schemas\Connectors\Connector::RELATIONSHIPS_DEVICES) {
-			$findDevicesQuery = new Queries\FindDevices();
+			$findDevicesQuery = new Queries\Entities\FindDevices();
 			$findDevicesQuery->forConnector($connector);
 
 			return $this->buildResponse($request, $response, $this->devicesRepository->findAllBy($findDevicesQuery));
 		} elseif ($relationEntity === Schemas\Connectors\Connector::RELATIONSHIPS_PROPERTIES) {
-			$findConnectorPropertiesQuery = new Queries\FindConnectorProperties();
+			$findConnectorPropertiesQuery = new Queries\Entities\FindConnectorProperties();
 			$findConnectorPropertiesQuery->forConnector($connector);
 
 			return $this->buildResponse(
@@ -182,7 +182,7 @@ public function readRelationship(
 				$this->propertiesRepository->findAllBy($findConnectorPropertiesQuery),
 			);
 		} elseif ($relationEntity === Schemas\Connectors\Connector::RELATIONSHIPS_CONTROLS) {
-			$findConnectorControlsQuery = new Queries\FindConnectorControls();
+			$findConnectorControlsQuery = new Queries\Entities\FindConnectorControls();
 			$findConnectorControlsQuery->forConnector($connector);
 
 			return $this->buildResponse(
@@ -202,7 +202,7 @@ public function readRelationship(
 	protected function findConnector(string $id): Entities\Connectors\Connector
 	{
 		try {
-			$findQuery = new Queries\FindConnectors();
+			$findQuery = new Queries\Entities\FindConnectors();
 			$findQuery->byId(Uuid\Uuid::fromString($id));
 
 			$connector = $this->connectorsRepository->findOneBy($findQuery);

diff --git a/src/Controllers/DeviceChildrenV1.php b/src/Controllers/DeviceChildrenV1.php
@@ -58,7 +58,7 @@ public function index(
 		// At first, try to load device
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
-		$findQuery = new Queries\FindDevices();
+		$findQuery = new Queries\Entities\FindDevices();
 		$findQuery->forParent($device);
 
 		$children = $this->devicesRepository->getResultSet($findQuery);

diff --git a/src/Controllers/DeviceControlsV1.php b/src/Controllers/DeviceControlsV1.php
@@ -63,7 +63,7 @@ public function index(
 		// At first, try to load device
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
-		$findQuery = new Queries\FindDeviceControls();
+		$findQuery = new Queries\Entities\FindDeviceControls();
 		$findQuery->forDevice($device);
 
 		$controls = $this->deviceControlsRepository->getResultSet($findQuery);
@@ -85,7 +85,7 @@ public function read(
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindDeviceControls();
+			$findQuery = new Queries\Entities\FindDeviceControls();
 			$findQuery->forDevice($device);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 
@@ -120,7 +120,7 @@ public function readRelationship(
 		$relationEntity = Utils\Strings::lower(strval($request->getAttribute(Router\ApiRoutes::RELATION_ENTITY)));
 
 		if (Uuid\Uuid::isValid(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID)))) {
-			$findQuery = new Queries\FindDeviceControls();
+			$findQuery = new Queries\Entities\FindDeviceControls();
 			$findQuery->forDevice($device);
 			$findQuery->byId(Uuid\Uuid::fromString(strval($request->getAttribute(Router\ApiRoutes::URL_ITEM_ID))));
 

diff --git a/src/Controllers/DeviceParentsV1.php b/src/Controllers/DeviceParentsV1.php
@@ -58,7 +58,7 @@ public function index(
 		// At first, try to load device
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
-		$findQuery = new Queries\FindDevices();
+		$findQuery = new Queries\Entities\FindDevices();
 		$findQuery->forChild($device);
 
 		$parents = $this->devicesRepository->getResultSet($findQuery);

diff --git a/src/Controllers/DevicePropertiesV1.php b/src/Controllers/DevicePropertiesV1.php
@@ -77,7 +77,7 @@ public function index(
 		// At first, try to load device
 		$device = $this->findDevice(strval($request->getAttribute(Router\ApiRoutes::URL_DEVICE_ID)));
 
-		$findQuery = new Queries\FindDeviceProperties();
+		$findQuery = new Queries\Entities\FindDeviceProperties();
 		$findQuery->forDevice($device);
 
 		$properties = $this->devicePropertiesRepository->getResultSet($findQuery);

diff --git a/src/Controllers/DevicePropertyChildrenV1.php b/src/Controllers/DevicePropertyChildrenV1.php
@@ -62,7 +62,7 @@ public function index(
 		// & property
 		$property = $this->findProperty(strval($request->getAttribute(Router\ApiRoutes::URL_PROPERTY_ID)), $device);
 
-		$findQuery = new Queries\FindDeviceProperties();
+		$findQuery = new Queries\Entities\FindDeviceProperties();
 		$findQuery->forParent($property);
 
 		$children = $this->devicePropertiesRepository->getResultSet($findQuery);