[virtual-connector] Refactoring commands (#217)

FastyBird · Dec 18, 2023 · a731473 · a731473
1 parent 9a69f1f
commit a731473
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 3 deletions.
diff --git a/src/Entities/Channels/Properties/Property.php b/src/Entities/Channels/Properties/Property.php
@@ -63,7 +63,7 @@ abstract class Property extends Entities\Property
 
 	/**
 	 * @IPubDoctrine\Crud(is="writable")
-	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Channels\Properties\Property", inversedBy="children", cascade={"persist"})
+	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Channels\Properties\Property", inversedBy="children")
 	 * @ORM\JoinColumn(name="parent_id", referencedColumnName="property_id", nullable=true, onDelete="CASCADE")
 	 */
 	protected self|null $parent = null;

diff --git a/src/Entities/Devices/Device.php b/src/Entities/Devices/Device.php
@@ -94,7 +94,7 @@ abstract class Device implements Entities\Entity,
 	 * @var Common\Collections\Collection<int, Device>
 	 *
 	 * @IPubDoctrine\Crud(is="writable")
-	 * @ORM\ManyToMany(targetEntity="FastyBird\Module\Devices\Entities\Devices\Device", inversedBy="children", cascade={"persist"})
+	 * @ORM\ManyToMany(targetEntity="FastyBird\Module\Devices\Entities\Devices\Device", inversedBy="children")
 	 * @ORM\JoinTable(
 	 *     name="fb_devices_module_devices_children",
 	 *     joinColumns={@ORM\JoinColumn(name="child_device", referencedColumnName="device_id", onDelete="CASCADE")},

diff --git a/src/Entities/Devices/Properties/Property.php b/src/Entities/Devices/Properties/Property.php
@@ -63,7 +63,7 @@ abstract class Property extends Entities\Property
 
 	/**
 	 * @IPubDoctrine\Crud(is="writable")
-	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Devices\Properties\Property", inversedBy="children", cascade={"persist"})
+	 * @ORM\ManyToOne(targetEntity="FastyBird\Module\Devices\Entities\Devices\Properties\Property", inversedBy="children")
 	 * @ORM\JoinColumn(name="parent_id", referencedColumnName="property_id", nullable=true, onDelete="CASCADE")
 	 */
 	protected self|null $parent = null;

diff --git a/src/Queries/Configuration/FindChannelProperties.php b/src/Queries/Configuration/FindChannelProperties.php
@@ -85,6 +85,16 @@ public function byParentId(Uuid\UuidInterface $parentId): void
 		$this->filter[] = '.[?(@.parent =~ /(?i).*^' . $parentId->toString() . '*$/)]';
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.settable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.queryable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
 	/**
 	 * @throws JSONPath\JSONPathException
 	 */

diff --git a/src/Queries/Configuration/FindConnectorProperties.php b/src/Queries/Configuration/FindConnectorProperties.php
@@ -73,6 +73,16 @@ public function byConnectorId(Uuid\UuidInterface $connectorId): void
 		$this->filter[] = '.[?(@.connector =~ /(?i).*^' . $connectorId->toString() . '*$/)]';
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.settable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.queryable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
 	/**
 	 * @throws JSONPath\JSONPathException
 	 */

diff --git a/src/Queries/Configuration/FindDeviceProperties.php b/src/Queries/Configuration/FindDeviceProperties.php
@@ -85,6 +85,16 @@ public function byParentId(Uuid\UuidInterface $parentId): void
 		$this->filter[] = '.[?(@.parent =~ /(?i).*^' . $parentId->toString() . '*$/)]';
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.settable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = '.[?(@.queryable == "' . ($state ? 'true' : 'false') . '")]';
+	}
+
 	/**
 	 * @throws JSONPath\JSONPathException
 	 */

diff --git a/src/Queries/Entities/FindChannelProperties.php b/src/Queries/Entities/FindChannelProperties.php
@@ -102,6 +102,20 @@ public function byParentId(Uuid\UuidInterface $parentId): void
 		};
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.settable = :settable')->setParameter('settable', $state);
+		};
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.queryable = :queryable')->setParameter('queryable', $state);
+		};
+	}
+
 	/**
 	 * @throws Exceptions\InvalidArgument
 	 */

diff --git a/src/Queries/Entities/FindConnectorProperties.php b/src/Queries/Entities/FindConnectorProperties.php
@@ -87,6 +87,20 @@ public function byConnectorId(Uuid\UuidInterface $connectorId): void
 		};
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.settable = :settable')->setParameter('settable', $state);
+		};
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.queryable = :queryable')->setParameter('queryable', $state);
+		};
+	}
+
 	/**
 	 * @throws Exceptions\InvalidArgument
 	 */

diff --git a/src/Queries/Entities/FindDeviceProperties.php b/src/Queries/Entities/FindDeviceProperties.php
@@ -102,6 +102,20 @@ public function byParentId(Uuid\UuidInterface $parentId): void
 		};
 	}
 
+	public function settable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.settable = :settable')->setParameter('settable', $state);
+		};
+	}
+
+	public function queryable(bool $state): void
+	{
+		$this->filter[] = static function (ORM\QueryBuilder $qb) use ($state): void {
+			$qb->andWhere('p.queryable = :queryable')->setParameter('queryable', $state);
+		};
+	}
+
 	/**
 	 * @throws Exceptions\InvalidArgument
 	 */

diff --git a/tests/cases/unit/Models/Configuration/Repositories/ChannelsPropertiesRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/ChannelsPropertiesRepositoryTest.php
@@ -136,6 +136,34 @@ public function testReadAll(): void
 		$entities = $repository->findAllBy($findQuery, MetadataDocuments\DevicesModule\ChannelMappedProperty::class);
 
 		self::assertCount(0, $entities);
+
+		$findQuery = new Queries\Configuration\FindChannelProperties();
+		$findQuery->settable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(1, $entities);
+
+		$findQuery = new Queries\Configuration\FindChannelProperties();
+		$findQuery->settable(false);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(2, $entities);
+
+		$findQuery = new Queries\Configuration\FindChannelProperties();
+		$findQuery->queryable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(3, $entities);
+
+		$findQuery = new Queries\Configuration\FindChannelProperties();
+		$findQuery->queryable(false);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(0, $entities);
 	}
 
 	/**

diff --git a/tests/cases/unit/Models/Configuration/Repositories/ConnectorsPropertiesRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/ConnectorsPropertiesRepositoryTest.php
@@ -131,6 +131,20 @@ public function testReadAll(): void
 		);
 
 		self::assertCount(2, $entities);
+
+		$findQuery = new Queries\Configuration\FindConnectorProperties();
+		$findQuery->settable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(0, $entities);
+
+		$findQuery = new Queries\Configuration\FindConnectorProperties();
+		$findQuery->queryable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(0, $entities);
 	}
 
 	/**

diff --git a/tests/cases/unit/Models/Configuration/Repositories/DevicesPropertiesRepositoryTest.php b/tests/cases/unit/Models/Configuration/Repositories/DevicesPropertiesRepositoryTest.php
@@ -137,6 +137,34 @@ public function testReadAll(): void
 		$entities = $repository->findAllBy($findQuery, MetadataDocuments\DevicesModule\DeviceMappedProperty::class);
 
 		self::assertCount(0, $entities);
+
+		$findQuery = new Queries\Configuration\FindDeviceProperties();
+		$findQuery->settable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(0, $entities);
+
+		$findQuery = new Queries\Configuration\FindDeviceProperties();
+		$findQuery->settable(false);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(2, $entities);
+
+		$findQuery = new Queries\Configuration\FindDeviceProperties();
+		$findQuery->queryable(true);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(2, $entities);
+
+		$findQuery = new Queries\Configuration\FindDeviceProperties();
+		$findQuery->queryable(false);
+
+		$entities = $repository->findAllBy($findQuery);
+
+		self::assertCount(0, $entities);
 	}
 
 	/**