WIP

src/Controller/Transaction.php

@@ -6,6 +6,7 @@
 use Flat3\Lodata\Drivers\ManualEntitySet;
 use Flat3\Lodata\Entity;
 use Flat3\Lodata\EntitySet;
+use Flat3\Lodata\EntityType;
 use Flat3\Lodata\Exception\Internal\PathNotHandledException;
 use Flat3\Lodata\Exception\Protocol\AcceptedException;
 use Flat3\Lodata\Exception\Protocol\BadRequestException;
@@ -212,11 +213,11 @@ class Transaction implements ArgumentInterface
      * @var PipeInterface[] $handlers
      */
     protected $handlers = [
+        Entity::class,
         EntitySet::class,
+        EntityType::class,
         PathSegment\Batch::class,
         PathSegment\Metadata::class,
-        PathSegment\Entity::class,
-        PathSegment\Type::class,
         PathSegment\Value::class,
         PathSegment\Count::class,
         PathSegment\Filter::class,

src/Entity.php

@@ -5,6 +5,7 @@
 use ArrayAccess;
 use Flat3\Lodata\Controller\Response;
 use Flat3\Lodata\Controller\Transaction;
+use Flat3\Lodata\Exception\Internal\PathNotHandledException;
 use Flat3\Lodata\Exception\Protocol\BadRequestException;
 use Flat3\Lodata\Exception\Protocol\InternalServerErrorException;
 use Flat3\Lodata\Exception\Protocol\MethodNotAllowedException;
@@ -30,6 +31,7 @@
 use Flat3\Lodata\Transaction\MetadataContainer;
 use Flat3\Lodata\Transaction\NavigationRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 /**
  * Entity
@@ -389,7 +391,26 @@ public static function pipe(
         ?string $nextSegment,
         ?PipeInterface $argument
     ): ?PipeInterface {
-        return $argument;
+        if ($currentSegment !== '$entity') {
+            throw new PathNotHandledException();
+        }
+
+        if ($argument) {
+            throw new BadRequestException('entity_argument', 'Entity cannot have a preceding path segment');
+        }
+
+        $id = $transaction->getIdOption();
+
+        if (!$id->hasValue()) {
+            throw new BadRequestException('missing_id', 'The entity id system query option must be provided');
+        }
+
+        $entityId = $id->getValue();
+        if (Str::startsWith($entityId, ServiceProvider::endpoint())) {
+            $entityId = Str::substr($entityId, strlen(ServiceProvider::endpoint()));
+        }
+
+        return EntitySet::pipe($transaction, $entityId);
     }
 
     /**

src/EntityType.php

@@ -2,14 +2,19 @@
 
 namespace Flat3\Lodata;
 
+use Flat3\Lodata\Controller\Transaction;
+use Flat3\Lodata\Exception\Internal\PathNotHandledException;
+use Flat3\Lodata\Exception\Protocol\NotFoundException;
+use Flat3\Lodata\Facades\Lodata;
 use Flat3\Lodata\Helper\Identifier;
+use Flat3\Lodata\Interfaces\PipeInterface;
 
 /**
  * Entity Type
  * @link https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530349
  * @package Flat3\Lodata
  */
-class EntityType extends ComplexType
+class EntityType extends ComplexType implements PipeInterface
 {
     /**
      * Primary key property
@@ -57,4 +62,27 @@ public function setKey(DeclaredProperty $key): self
 
         return $this;
     }
+
+    public static function pipe(
+        Transaction $transaction,
+        string $currentSegment,
+        ?string $nextSegment,
+        ?PipeInterface $argument
+    ): ?PipeInterface {
+        $entityType = Lodata::getEntityType($currentSegment);
+
+        if (!$entityType) {
+            throw new PathNotHandledException();
+        }
+
+        if (!$argument instanceof Entity) {
+            throw new PathNotHandledException();
+        }
+
+        if ($argument->getType()->getIdentifier() !== $entityType->getIdentifier()) {
+            throw new NotFoundException('invalid_entity_type', 'The provided type did not match the entity type');
+        }
+
+        return $argument;
+    }
 }