Working on module CRUD

app/Console/Commands/MakeClass.php

@@ -11,7 +11,7 @@ use Nwidart\Modules\Commands\GeneratorCommand;
 use Nwidart\Modules\Support\Stub;
 use Nwidart\Modules\Traits\ModuleCommandTrait;
 
-class MakeRepository extends GeneratorCommand
+class MakeClass extends GeneratorCommand
 {
     use ModuleCommandTrait;
 
@@ -22,20 +22,21 @@ class MakeRepository extends GeneratorCommand
      *
      * @var string
      */
-    protected $name = 'ninja:make-repository';
+    protected $name = 'ninja:make-class';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Create repository stub';
+    protected $description = 'Create class stub';
 
     protected function getArguments()
     {
         return [
             ['name', InputArgument::REQUIRED, 'The name of the datatable.'],
-            ['module', InputArgument::OPTIONAL, 'The name of module will be used.'],
+            ['module', InputArgument::REQUIRED, 'The name of module will be used.'],
+            ['class', InputArgument::REQUIRED, 'The name of the class.'],
         ];
     }
 
@@ -43,8 +44,8 @@ class MakeRepository extends GeneratorCommand
     {
         $module = $this->laravel['modules']->findOrFail($this->getModuleName());
 
-        return (new Stub('/repository.stub', [
+        return (new Stub('/' . $this->argument('class') . '.stub', [
-            'NAMESPACE' => $this->getClassNamespace($module) . "\\" . config('modules.paths.generator.repository'),
+            'NAMESPACE' => $this->getClassNamespace($module) . "\\" . config('modules.paths.generator.' . $this->argument('class')),
             'LOWER_NAME' => $module->getLowerName(),
             'CLASS' => $this->getClass(),
             'STUDLY_NAME' => Str::studly($module->getLowerName()),
@@ -54,7 +55,7 @@ class MakeRepository extends GeneratorCommand
     public function getDestinationFilePath()
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
-        $seederPath = $this->laravel['modules']->config('paths.generator.repository');
+        $seederPath = $this->laravel['modules']->config('paths.generator.'  . $this->argument('class'));
 
         return $path . $seederPath . '/' . $this->getFileName() . '.php';
     }
@@ -64,7 +65,7 @@ class MakeRepository extends GeneratorCommand
      */
     protected function getFileName()
     {
-        return studly_case($this->argument('name')) . 'Repository';
+        return studly_case($this->argument('name')) . Str::studly($this->argument('class'));
     }
 
 }

app/Console/Commands/MakeDatatable.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-
-use Nwidart\Modules\Commands\GeneratorCommand;
-use Nwidart\Modules\Support\Stub;
-use Nwidart\Modules\Traits\ModuleCommandTrait;
-
-class MakeDatatable extends GeneratorCommand
-{
-    use ModuleCommandTrait;
-
-    protected $argumentName = 'name';
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $name = 'ninja:make-datatable';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create datatable stub';
-
-    protected function getArguments()
-    {
-        return [
-            ['name', InputArgument::REQUIRED, 'The name of the datatable.'],
-            ['module', InputArgument::OPTIONAL, 'The name of module will be used.'],
-        ];
-    }
-
-    public function getTemplateContents()
-    {
-        $module = $this->laravel['modules']->findOrFail($this->getModuleName());
-
-        return (new Stub('/datatable.stub', [
-            'NAMESPACE' => $this->getClassNamespace($module) . "\\" . config('modules.paths.generator.datatables'),
-            'LOWER_NAME' => $module->getLowerName(),
-            'CLASS' => $this->getClass(),
-        ]))->render();
-    }
-
-    public function getDestinationFilePath()
-    {
-        $path = $this->laravel['modules']->getModulePath($this->getModuleName());
-        $seederPath = $this->laravel['modules']->config('paths.generator.datatables');
-
-        return $path . $seederPath . '/' . $this->getFileName() . '.php';
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFileName()
-    {
-        return studly_case($this->argument('name')) . 'Datatable';
-    }
-
-}

app/Console/Commands/MakeModule.php

@@ -40,16 +40,22 @@ class MakeModule extends Command
     {
         $name = $this->argument('name');
         $fields = $this->argument('fields');
+        $lower = strtolower($name);
 
         $this->info("Creating module: {$name}");
-        $this->info("Fields: {$fields}");
+        //$this->info("Fields: {$fields}");
 
         Artisan::call('module:make', ['name' => [$name]]);
-        Artisan::call('module:make-migration', ['name' => "create_{$name}_table", '--fields' => $fields, 'module' => $name]);
+        Artisan::call('module:make-migration', ['name' => "create_{$lower}_table", '--fields' => $fields, 'module' => $name]);
+        Artisan::call('module:migrate', ['module' => $name]);
         Artisan::call('module:make-model', ['model' => $name, 'module' => $name]);
 
-        Artisan::call('ninja:make-datatable', ['name' => $name, 'module' => $name]);
+        Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'datatable']);
-        Artisan::call('ninja:make-repository', ['name' => $name, 'module' => $name]);
+        Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'repository']);
+        Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'policy']);
+        Artisan::call('ninja:make-class', ['name' => $name, 'module' => $name, 'class' => 'auth-provider']);
+
+        Artisan::call('module:dump');
     }
 
     protected function getArguments()

app/Console/Commands/stubs/migration/create.stub

@@ -12,14 +12,15 @@ class $CLASS$ extends Migration
      */
     public function up()
     {
-        Schema::create('$TABLE$', function (Blueprint $table) {
+        Schema::create(strtolower('$TABLE$'), function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('user_id')->index();
             $table->unsignedInteger('account_id')->index();
             $table->unsignedInteger('client_id')->index()->nullable();
-            
+
 $FIELDS$
             $table->timestamps();
+            $table->softDeletes();
             $table->boolean('is_deleted')->default(false);
 
             $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
@@ -38,6 +39,6 @@ $FIELDS$
      */
     public function down()
     {
-        Schema::dropIfExists('$TABLE$');
+        Schema::dropIfExists(strtolower('$TABLE$'));
     }
 }

app/Console/Commands/stubs/policy.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace $NAMESPACE$;
+
+class $STUDLY_NAME$Policy extends EntityPolicy
+{
+
+}

app/Console/Commands/stubs/repository.stub

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Ninja\Repositories;
+namespace $NAMESPACE$;
 
 use DB;
 use App\Models\$STUDLY_NAME$;
+use App\Ninja\Repositories\BaseRepository;
 //use App\Events\$STUDLY_NAME$WasCreated;
 //use App\Events\$STUDLY_NAME$WasUpdated;
 
@@ -41,7 +42,7 @@ class $STUDLY_NAME$Repository extends BaseRepository
             $query->where('clients.user_id', '=', $userId);
         }
         */
-        
+
         return $query;
     }
 

app/Console/Kernel.php

@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
         'App\Console\Commands\GenerateResources',
         'App\Console\Commands\TestOFX',
         'App\Console\Commands\MakeModule',
-        'App\Console\Commands\MakeDatatable',
+        'App\Console\Commands\MakeClass',
-        'App\Console\Commands\MakeRepository',
     ];
 
     /**

app/Policies/EntityPolicy.php

@@ -73,6 +73,7 @@ class EntityPolicy
     private static function checkModuleEnabled(User $user, $item)
     {
         $entityType = is_string($item) ? $item : $item->getEntityType();
+        
         return $user->account->isModuleEnabled($entityType);
     }
 }

app/Policies/GenericEntityPolicy.php

@@ -3,8 +3,9 @@
 namespace App\Policies;
 
 
-use App\Models\User;
 use Utils;
+use App\Models\User;
+use Illuminate\Support\Str;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 /**
@@ -16,14 +17,14 @@ class GenericEntityPolicy
 
     /**
      * @param User $user
-     * @param $itemType
+     * @param $entityType
      * @param $ownerUserId
      * @return bool|mixed
      */
-    public static function editByOwner(User $user, $itemType, $ownerUserId) {
+    public static function editByOwner(User $user, $entityType, $ownerUserId) {
-        $itemType = Utils::getEntityName($itemType);
+        $className = static::className($entityType);
-        if (method_exists("App\\Policies\\{$itemType}Policy", 'editByOwner')) {
+        if (method_exists($className, 'editByOwner')) {
-            return call_user_func(["App\\Policies\\{$itemType}Policy", 'editByOwner'], $user, $ownerUserId);
+            return call_user_func([$className, 'editByOwner'], $user, $ownerUserId);
         }
 
         return false;
@@ -31,14 +32,14 @@ class GenericEntityPolicy
 
     /**
      * @param User $user
-     * @param $itemType
+     * @param $entityTypee
      * @param $ownerUserId
      * @return bool|mixed
      */
-    public static function viewByOwner(User $user, $itemType, $ownerUserId) {
+    public static function viewByOwner(User $user, $entityType, $ownerUserId) {
-        $itemType = Utils::getEntityName($itemType);
+        $className = static::className($entityType);
-        if (method_exists("App\\Policies\\{$itemType}Policy", 'viewByOwner')) {
+        if (method_exists($className, 'viewByOwner')) {
-            return call_user_func(["App\\Policies\\{$itemType}Policy", 'viewByOwner'], $user, $ownerUserId);
+            return call_user_func([$className, 'viewByOwner'], $user, $ownerUserId);
         }
 
         return false;
@@ -46,13 +47,13 @@ class GenericEntityPolicy
 
     /**
      * @param User $user
-     * @param $itemType
+     * @param $entityType
      * @return bool|mixed
      */
-    public static function create(User $user, $itemType) {
+    public static function create(User $user, $entityType) {
-        $entityName = Utils::getEntityName($itemType);
+        $className = static::className($entityType);
-        if (method_exists("App\\Policies\\{$entityName}Policy", 'create')) {
+        if (method_exists($className, 'create')) {
-            return call_user_func(["App\\Policies\\{$entityName}Policy", 'create'], $user, $itemType);
+            return call_user_func([$className, 'create'], $user, $entityType);
         }
 
         return false;
@@ -60,16 +61,28 @@ class GenericEntityPolicy
 
     /**
      * @param User $user
-     * @param $itemType
+     * @param $entityType
      * @return bool|mixed
      */
-    public static function view(User $user, $itemType) {
+    public static function view(User $user, $entityType) {
-        $entityName = Utils::getEntityName($itemType);
+        $className = static::className($entityType);
-        if (method_exists("App\\Policies\\{$entityName}Policy", 'view')) {
+        if (method_exists($className, 'view')) {
-            return call_user_func(["App\\Policies\\{$entityName}Policy", 'view'], $user, $itemType);
+            return call_user_func([$className, 'view'], $user, $entityType);
         }
 
         return false;
     }
 
+    private static function className($entityType)
+    {
+        if ( ! Utils::isNinjaProd()) {
+            if ($module = \Module::find($entityType)) {
+                return "Modules\\{$module->getName()}\\Policies\\{$module->getName()}Policy";
+            }
+        }
+
+        $studly = Str::studly($entityType);
+        return "App\\Policies\\{$studly}Policy";
+    }
+
 }

config/modules.php

@@ -113,7 +113,8 @@ return [
             'jobs' => 'Jobs',
             'emails' => 'Emails',
             'notifications' => 'Notifications',
-            'datatables' => 'Datatables',
+            'datatable' => 'Datatables',
+            'policy' => 'Policies',
         ],
     ],
     /*