Merge pull request #2 from tattersoftware/arrays

Simplify to Arrays
tattersoftware · Aug 26, 2022 · 96132c5 · 96132c5
2 parents 7fd2c63 + d29d1dc
commit 96132c5
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 261 deletions.
diff --git a/src/Conditions/Condition.php → src/Condition.php b/src/Conditions/Condition.php → src/Condition.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Tatter\Repositories\Conditions;
+namespace Tatter\Repositories;
 
 use InvalidArgumentException;
+use Tatter\Repositories\Repository\Entity;
 
 final class Condition
 {
@@ -40,6 +41,16 @@ public static function fromString(string $input): self
         return new self($field, $operator, $value);
     }
 
+    /**
+     * Returns a condition to match an Entity by the given identifier.
+     *
+     * @param class-string<Entity> $class
+     */
+    public static function fromIdentity(string $class, int|string $id): self
+    {
+        return new self($class::IDENTIFIER, '=', $id);
+    }
+
     /**
      * @param array<int, scalar|null>|scalar|null $value
      */

diff --git a/src/Conditions/Conditions.php b/src/Conditions/Conditions.php
diff --git a/src/Objects/AttributesTrait.php b/src/Objects/AttributesTrait.php
diff --git a/src/Objects/DTO.php b/src/Objects/DTO.php
diff --git a/src/Objects/Entity.php b/src/Objects/Entity.php
diff --git a/src/Objects/ValueObject.php b/src/Objects/ValueObject.php
diff --git a/src/Persistence/SQLDatabase.php b/src/Persistence/SQLDatabase.php
@@ -8,14 +8,12 @@
 use Config\Database;
 use Generator;
 use RuntimeException;
-use Tatter\Repositories\Conditions\Conditions;
-use Tatter\Repositories\Objects\DTO;
+use Tatter\Repositories\Condition;
 
 /**
  * SQL Database Persistence Class
  *
- * A wrapper for the Query Builder to enforce
- * data types at boundaries.
+ * A wrapper for the Query Builder.
  */
 final class SQLDatabase
 {
@@ -35,8 +33,10 @@ private function __construct(private BaseBuilder $builder)
 
     /**
      * Gets the first row matching the conditions.
+     *
+     * @param Condition[] $conditions
      */
-    public function first(Conditions $conditions): ?DTO
+    public function first(array $conditions): ?array
     {
         $result = $this->builderFromConditions($conditions)
             ->limit(1)
@@ -45,54 +45,62 @@ public function first(Conditions $conditions): ?DTO
             throw new RuntimeException('Query Builder result failed.');
         }
 
-        return $result->getFirstRow(DTO::class);
+        return $result->getResultArray()[0] ?? null;
     }
 
     /**
-     * Gets an item from persistence by its ID.
+     * Yields matching results from persistence.
+     *
+     * @param Condition[] $conditions
      *
-     * @returns iterable<DTO>
+     * @returns iterable<array>
      */
-    public function get(Conditions $conditions): Generator
+    public function get(array $conditions): Generator
     {
         $result = $this->builderFromConditions($conditions)->get();
         if ($result === false) {
             throw new RuntimeException('Query Builder result failed.');
         }
 
-        while ($dto = $result->getUnbufferedRow(DTO::class)) {
-            yield $dto;
+        while ($array = $result->getUnbufferedRow('array')) {
+            yield $array;
         }
     }
 
     /**
      * Inserts a new row into the database.
      */
-    public function insert(DTO $dto): void
+    public function insert(array $data): void
     {
-        (clone $this->builder)->insert($dto->toArray());
+        (clone $this->builder)->insert($data);
     }
 
     /**
      * Updates rows in the database.
+     *
+     * @param Condition[] $conditions
      */
-    public function update(Conditions $conditions, DTO $dto): void
+    public function update(array $conditions, array $data): void
     {
-        $this->builderFromConditions($conditions)->update($dto->toArray());
+        $this->builderFromConditions($conditions)->update($data);
     }
 
     /**
      * Deletes matching items from the database.
+     *
+     * @param Condition[] $conditions
      */
-    public function delete(Conditions $conditions): void
+    public function delete(array $conditions): void
     {
         $this->builderFromConditions($conditions)->delete();
     }
 
     /**
      * Preps a Builder with "where" conditions.
+     *
+     * @param Condition[] $conditions
      */
-    private function builderFromConditions(Conditions $conditions): BaseBuilder
+    private function builderFromConditions(array $conditions): BaseBuilder
     {
         $builder = clone $this->builder;