handle optional entity for mapping

Author: janvt

src/Maker/MakeModel.php

@@ -221,7 +221,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $identityClassNameDetails = $this->generateIdentity($modelName, $input, $io, $generator);
         $this->generateEntityMappings($modelClassNameDetails, $input, $io, $generator);
         $this->generateEntity($modelClassNameDetails, $input, $generator);
-        $this->generateRepository($modelClassNameDetails, $identityClassNameDetails, $input, $generator);
+        $this->generateRepository($generator, $input, $modelClassNameDetails, $identityClassNameDetails);
 
         $this->writeSuccessMessage($io);
     }
@@ -423,9 +423,9 @@ private function generateEntityMappings(
                     [
                         'model_class' => $modelClassNameDetails->getFullName(),
                         'has_identity' => $hasIdentity,
-                        'type_name' => $this->templateVariables['type_name'],
+                        'type_name' => $hasIdentity ?? $this->templateVariables['type_name'],
                         'table_name' => $tableName,
-                        'identity_column_name' => $this->templateVariables['identity_type'],
+                        'identity_column_name' => $hasIdentity ?? $this->templateVariables['identity_type'],
                     ],
                 );
             } catch (YamlManipulationFailedException $e) {
@@ -474,7 +474,6 @@ private function generateEntity(
      * @param InputInterface $input
      * @param ClassNameDetails $modelClassNameDetails
      * @param ?ClassNameDetails $identityClassNameDetails
-     * @throws \Exception
      */
     private function generateRepository(
         Generator $generator,