Added pseudo filter

FastyBird · Aug 3, 2022 · 291bf0b · 291bf0b
1 parent 20bf332
commit 291bf0b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/src/Models/DataStorage/ChannelPropertiesRepository.php b/src/Models/DataStorage/ChannelPropertiesRepository.php
@@ -108,13 +108,17 @@ public function findByIdentifier(
 	 *
 	 * @throws MetadataExceptions\FileNotFoundException
 	 */
-	public function findAllByChannel(Uuid\UuidInterface $channel): array
-	{
+	public function findAllByChannel(
+		Uuid\UuidInterface $channel,
+		?string $type = null
+	): array {
 		$entities = [];
 
 		foreach ($this->rawData as $id => $entity) {
 			if (array_key_exists('channel', $entity) && $channel->toString() === $entity['channel']) {
-				$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				if ($type === null || $entity instanceof $type) {
+					$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				}
 			}
 		}
 

diff --git a/src/Models/DataStorage/ConnectorPropertiesRepository.php b/src/Models/DataStorage/ConnectorPropertiesRepository.php
@@ -108,13 +108,17 @@ public function findByIdentifier(
 	 *
 	 * @throws MetadataExceptions\FileNotFoundException
 	 */
-	public function findAllByConnector(Uuid\UuidInterface $connector): array
-	{
+	public function findAllByConnector(
+		Uuid\UuidInterface $connector,
+		?string $type = null
+	): array {
 		$entities = [];
 
 		foreach ($this->rawData as $id => $entity) {
 			if (array_key_exists('connector', $entity) && $connector->toString() === $entity['connector']) {
-				$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				if ($type === null || $entity instanceof $type) {
+					$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				}
 			}
 		}
 

diff --git a/src/Models/DataStorage/DevicePropertiesRepository.php b/src/Models/DataStorage/DevicePropertiesRepository.php
@@ -108,13 +108,17 @@ public function findByIdentifier(
 	 *
 	 * @throws MetadataExceptions\FileNotFoundException
 	 */
-	public function findAllByDevice(Uuid\UuidInterface $device): array
-	{
+	public function findAllByDevice(
+		Uuid\UuidInterface $device,
+		?string $type = null
+	): array {
 		$entities = [];
 
 		foreach ($this->rawData as $id => $entity) {
 			if (array_key_exists('device', $entity) && $device->toString() === $entity['device']) {
-				$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				if ($type === null || $entity instanceof $type) {
+					$entities[] = $this->getEntity(Uuid\Uuid::fromString($id), $this->rawData[$id]);
+				}
 			}
 		}
 

diff --git a/src/Models/DataStorage/IChannelPropertiesRepository.php b/src/Models/DataStorage/IChannelPropertiesRepository.php
@@ -55,10 +55,14 @@ public function findByIdentifier(
 
 	/**
 	 * @param Uuid\UuidInterface $channel
+	 * @param string|null $type
 	 *
 	 * @return MetadataEntities\Modules\DevicesModule\IChannelStaticPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IChannelDynamicPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IChannelMappedPropertyEntity[]
 	 */
-	public function findAllByChannel(Uuid\UuidInterface $channel): array;
+	public function findAllByChannel(
+		Uuid\UuidInterface $channel,
+		?string $type = null
+	): array;
 
 	/**
 	 * @param Uuid\UuidInterface $id

diff --git a/src/Models/DataStorage/IConnectorPropertiesRepository.php b/src/Models/DataStorage/IConnectorPropertiesRepository.php
@@ -55,10 +55,14 @@ public function findByIdentifier(
 
 	/**
 	 * @param Uuid\UuidInterface $connector
+	 * @param string|null $type
 	 *
 	 * @return MetadataEntities\Modules\DevicesModule\IConnectorStaticPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IConnectorDynamicPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IConnectorMappedPropertyEntity[]
 	 */
-	public function findAllByConnector(Uuid\UuidInterface $connector): array;
+	public function findAllByConnector(
+		Uuid\UuidInterface $connector,
+		?string $type = null
+	): array;
 
 	/**
 	 * @param Uuid\UuidInterface $id

diff --git a/src/Models/DataStorage/IDevicePropertiesRepository.php b/src/Models/DataStorage/IDevicePropertiesRepository.php
@@ -55,10 +55,16 @@ public function findByIdentifier(
 
 	/**
 	 * @param Uuid\UuidInterface $device
+	 * @param string|null $type
 	 *
 	 * @return MetadataEntities\Modules\DevicesModule\IDeviceStaticPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IDeviceDynamicPropertyEntity[]|MetadataEntities\Modules\DevicesModule\IDeviceMappedPropertyEntity[]
+	 *
+	 * @phpstan-param class-string $type
 	 */
-	public function findAllByDevice(Uuid\UuidInterface $device): array;
+	public function findAllByDevice(
+		Uuid\UuidInterface $device,
+		?string $type = null
+	): array;
 
 	/**
 	 * @param Uuid\UuidInterface $id