Added --composed flag for composed PK

Author: Admin

README.md

@@ -20,15 +20,17 @@ Library for [laravel-crud-wizard-free](https://github.com/macropay-solutions/lar
 
 ## Usage
 
-``` php artisan make:api-resource {resourceName} {--decorated} {--table=} {--connection=}```
+``` php artisan make:api-resource {resourceName} {--decorated} {--table=} {--connection=} {--composed}```
 
 This will create a template for **controller**, **service** and **model (with prepopulated columns from DB)** (optionally, with the **--decorated** flag it will create also a **decorator** and **middleware**) and will print instructions on what is left to be done manually.
 
 If connection is not the default one, it can be specified in the command option.
 
-If table is not the plural snake cased resourceName, then it can be specified in the table option.
+If table is not the snake cased resourceName, then it can be specified in the table option.
 
-Run just **php artisan make:api-resource** for interactive mode that will try to guess the tableName and use default connectionName (except --decorated).
+Run just **php artisan make:api-resource** or **php artisan make:api-resource --decorated** for interactive mode that will try to guess the tableName and use default connectionName.
+
+**--composed** flag will generate model and service for composed primary key 
 
 Example:
 ```
@@ -41,8 +43,6 @@ TODO:
 - Fill the model's properties and relations,
 - Define validations in controller,
 - Expose resource in DbCrudMap::MODEL_FQN_TO_CONTROLLER_MAP.
-Created Decorator: /var/www/html/project/app/Decorators/OperationDecorator.php
-Created Middleware: /var/www/html/project/app/Http/Midleware/Decorators/OperationsMiddleware.php
 ```
 
 ```

src/Console/MakeLaravelCrudWizard.php

@@ -50,6 +50,7 @@ public function handle(int $try = 0): void
         $this->resourceName ??= $this->argument('resourceName');
         $this->connection ??= $this->option('connection');
         $this->table ??= $this->option('table');
+        $composedPk = $this->option('composed');
         $columns = [];
 
         try {
@@ -58,7 +59,8 @@ public function handle(int $try = 0): void
                 $ns = $this->laravel->getNamespace(),
                 $this->connection,
                 $this->table,
-                $this->ignoreError
+                $this->ignoreError,
+                $composedPk,
             );
         } catch (\Throwable $e) {
             $this->resourceName ??= $this->ask('resourceName ?');
@@ -88,7 +90,7 @@ public function handle(int $try = 0): void
             }
         }
 
-        $this->makeServiceService->makeCompleteServiceFile($this->resourceName, $ns);
+        $this->makeServiceService->makeCompleteServiceFile($this->resourceName, $ns, $composedPk);
         $this->makeControllerService->makeCompleteControllerFile(
             $this->resourceName,
             $ns,

src/Services/MakeModelService.php

@@ -29,10 +29,18 @@ public function makeCompleteModelFile(
         ?string $connection,
         ?string $table,
         bool $ignoreError,
+        bool $composedPk,
     ): array {
         $this->createModelFile(
             $resourceName,
-            $this->replaceContentModelStub($laravelNamespace, $resourceName, $connection, $table, $ignoreError)
+            $this->replaceContentModelStub(
+                $laravelNamespace,
+                $resourceName,
+                $connection,
+                $table,
+                $ignoreError,
+                $composedPk
+            ),
         );
 
         return $this->columns;
@@ -47,6 +55,7 @@ protected function replaceContentModelStub(
         ?string $connection,
         ?string $table,
         bool $ignoreError,
+        bool $composedPk,
     ): string {
         $table ??= Str::snake(Str::camel($resourceName));
 
@@ -80,7 +89,7 @@ protected function replaceContentModelStub(
             $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName),
             $fillable,
             (string)$connection !== '' ? '    protected $connection = \'' . $connection . '\';' : '',
-        ], File::get($this->pathsAndNamespacesService->getModelStubPath()));
+        ], File::get($this->pathsAndNamespacesService->getModelStubPath($composedPk)));
     }
 
     protected function createModelFile(string $resourceName, string $modelStub) : void

src/Services/MakeServiceService.php

@@ -17,13 +17,19 @@ public function __construct(
         $this->output = $consoleOutput;
     }
 
-    public function makeCompleteServiceFile(string $resourceName, string $laravelNamespace): void
+    public function makeCompleteServiceFile(string $resourceName, string $laravelNamespace, bool $composedPk): void
     {
-        $this->createServiceFile($this->replaceContentServiceStub($resourceName, $laravelNamespace), $resourceName);
+        $this->createServiceFile(
+            $this->replaceContentServiceStub($resourceName, $laravelNamespace, $composedPk),
+            $resourceName
+        );
     }
 
-    protected function replaceContentServiceStub(string $resourceName, string $laravelNamespace): string
-    {
+    protected function replaceContentServiceStub(
+        string $resourceName,
+        string $laravelNamespace,
+        bool $composedPk
+    ): string {
         return \str_replace([
             'DummyNamespace',
             'DummyModel',
@@ -32,7 +38,7 @@ protected function replaceContentServiceStub(string $resourceName, string $larav
             \trim($laravelNamespace, '\\'),
             $this->pathsAndNamespacesService->singularUcFirstCamelCase($resourceName),
             $this->pathsAndNamespacesService->pluralUcFirstCamelCase($resourceName) . 'Service',
-        ], File::get($this->pathsAndNamespacesService->getServiceStubPath()));
+        ], File::get($this->pathsAndNamespacesService->getServiceStubPath($composedPk)));
     }
 
     protected function createServiceFile(string $serviceStub, string $resourceName): void

src/Services/PathsAndNamespacesService.php

@@ -16,14 +16,14 @@ public function getRealpathBase(string $directory): string
         return \realpath(\base_path($directory));
     }
 
-    public function getModelStubPath(): string
+    public function getModelStubPath(bool $composedPk): string
     {
-        return $this->getStubPath() . DIRECTORY_SEPARATOR . 'Model.stub';
+        return $this->getStubPath() . DIRECTORY_SEPARATOR . ($composedPk ? 'ModelComposed.stub' : 'Model.stub');
     }
 
-    public function getServiceStubPath(): string
+    public function getServiceStubPath(bool $composedPk): string
     {
-        return $this->getStubPath() . DIRECTORY_SEPARATOR . 'Service.stub';
+        return $this->getStubPath() . DIRECTORY_SEPARATOR . ($composedPk ? 'ServiceComposed.stub' : 'Service.stub');
     }
 
     public function getControllerStubPath(): string

src/stubs/Model.stub

@@ -8,7 +8,20 @@ class DummyClass extends BaseModel
 {
     public const RESOURCE_NAME = 'DummyResourceName';
 DummyConnection
+    protected $primaryKey = 'id';
+    protected $keyType = 'int';
     protected $table = 'DummyTableName';
+    protected array $ignoreExternalCreateFor = [
+        'id',
+        'updated_at',
+    ];
+    protected array $ignoreUpdateFor = [
+        'id',
+        'created_at',
+    ];
+    protected array $allowNonExternalUpdatesFor = [
+        'updated_at',
+    ];
 
     protected $fillable = [
 DummyFillable

src/stubs/ModelComposed.stub

@@ -0,0 +1,36 @@
+<?php
+
+namespace DummyNamespace\Models;
+
+use MacropaySolutions\LaravelCrudWizard\Models\BaseModel;
+
+class DummyClass extends BaseModel
+{
+    public const RESOURCE_NAME = 'DummyResourceName';
+DummyConnection
+    protected $primaryKey = '';
+    protected $keyType = 'string';
+    protected $table = 'DummyTableName';
+    protected array $ignoreExternalCreateFor = [
+        'updated_at',
+    ];
+    protected array $ignoreUpdateFor = [
+        'created_at',
+    ];
+    protected array $allowNonExternalUpdatesFor = [
+        'updated_at',
+    ];
+
+    protected $fillable = [
+DummyFillable
+    ];
+
+    public function getPrimaryKeyFilter(): array
+    {
+        return [
+            'id_1' => $this->getAttribute('id_1'), // todo
+            'id_2' => $this->getAttribute('id_2'), // todo
+            // ... todo
+        ];
+    }
+}

src/stubs/ServiceComposed.stub

@@ -0,0 +1,31 @@
+<?php
+
+namespace DummyNamespace\Services;
+
+use DummyNamespace\Models\DummyModel;
+use MacropaySolutions\LaravelCrudWizard\Services\BaseResourceService;
+
+class DummyClass extends BaseResourceService
+{
+    /**
+     * @inheritDoc
+     */
+    protected function setBaseModel(): void
+    {
+        $this->model = new DummyModel();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function extractIdentifierConditions(string $identifier): array
+    {
+        $exploded = \explode($this->model::COMPOSITE_PK_SEPARATOR, $identifier);
+
+        return [
+            ['id_1', \reset($exploded)], // todo
+            ['id_2', \next($exploded)], // todo
+            // ... todo
+        ];
+    }
+}