Qualify model with Endpoint->getNamespace()

Author: mgerzabek

src/Drivers/EloquentEntitySet.php

@@ -20,6 +20,7 @@
 use Flat3\Lodata\Drivers\SQL\SQLOrderBy;
 use Flat3\Lodata\Drivers\SQL\SQLSchema;
 use Flat3\Lodata\Drivers\SQL\SQLWhere;
+use Flat3\Lodata\Endpoint;
 use Flat3\Lodata\Entity;
 use Flat3\Lodata\EntitySet;
 use Flat3\Lodata\EntityType;
@@ -111,7 +112,8 @@ public function __construct(string $model, ?EntityType $entityType = null)
 
         $name = self::convertClassName($model);
         if (!$entityType) {
-            $entityType = new EntityType(EntityType::convertClassName($model));
+            $identifier = app(Endpoint::class)->getNamespace().'.'.EntityType::convertClassName($model);
+            $entityType = new EntityType($identifier);
         }
 
         parent::__construct($name, $entityType);

src/Endpoint.php

@@ -46,6 +46,22 @@ public function route(): string
     }
 
     /**
+     * This method is intended to be overridden by subclasses.
+     *
+     * The value of the function will be presented in the Schema Namespace attribute,
+     * https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#sec_Schema
+     *
+     * @return string
+     */
+    public function getNamespace(): string
+    {
+        // override this function to set Schema Namespace attribute
+        return config('lodata.namespace');
+    }
+
+    /**
+     * This method is intended to be overridden by subclasses.
+     *
      * Discovers Schema and Annotations of the `$metadata` file for
      * the service.
      */

src/Model.php

@@ -199,7 +199,7 @@ public function getTypeDefinition(string $name): ?Type
      */
     public static function getNamespace(): string
     {
-        return config('lodata.namespace');
+        return app(Endpoint::class)->getNamespace();
     }
 
     /**

src/PathSegment/Metadata/XML.php

@@ -239,14 +239,14 @@ public function emitStream(Transaction $transaction): void
                 case $resource instanceof Singleton:
                     // https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530395
                     $resourceElement = $entityContainer->addChild('Singleton');
-                    $resourceElement->addAttribute('Name', $resource->getIdentifier()->getResolvedName($namespace));
+                    $resourceElement->addAttribute('Name', $resource->getIdentifier()->getName());
                     $resourceElement->addAttribute('Type', $resource->getType()->getIdentifier()->getQualifiedName());
                     break;
 
                 case $resource instanceof EntitySet:
                     // https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#sec_EntitySet
                     $resourceElement = $entityContainer->addChild('EntitySet');
-                    $resourceElement->addAttribute('Name', $resource->getIdentifier()->getResolvedName($namespace));
+                    $resourceElement->addAttribute('Name', $resource->getIdentifier()->getName());
                     $resourceElement->addAttribute(
                         'EntityType',
                         $resource->getType()->getIdentifier()->getQualifiedName()