Updates to examples.

Author: jamesdordoy

Diff for: app/Http/Controllers/UserController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\User;
+use App\Role;
 use Illuminate\Http\Request;
 use JamesDordoy\LaravelVueDatatable\Http\Resources\DataTableCollectionResource;
 
@@ -35,10 +36,7 @@ public function queryBuilder(Request $request)
             $request->input('column'),
             $request->input('dir'),
             $searchValue
-        );
-
-        $query
-            ->join('roles', 'roles.id', '=', 'users.role_id')
+        )->join('roles', 'roles.id', '=', 'users.role_id')
             ->join('departments', 'departments.id', '=', 'roles.department_id')
             ->select(
                 'roles.name as role_name',
@@ -67,4 +65,37 @@ public function search(Request $request)
         $searchValue = $request->input('search');
         return User::where("name", "like", "%$searchValue%")->get();
     }
+
+    public function pivot(Request $request)
+    {
+        $searchValue = $request->input('search');
+        $orderBy = $request->input('column', 'id');
+        $orderByDir = $request->input('dir', 'asc');
+        $length = $request->input('length');
+
+        $query = User::eloquentQuery(
+            $orderBy,
+            $orderByDir,
+            $searchValue
+        );
+
+        if ($searchValue) {
+            $query = $query->whereHas('roles', function ($q) use ($searchValue) {
+                $q->orWhere('roles.name', "like",  "%$searchValue%");
+            });
+        }
+        
+        $data = $query->with('roles')->paginate($length);
+
+        return new DataTableCollectionResource($data);
+    }
+
+    public function checkForColumnNesting($column)
+    {
+        if (count(explode(".", $column)) > 1) {
+            return $column;
+        } else {
+            return $this->getTable() . ".$column";
+        }
+    }
 }

Diff for: app/User.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use JamesDordoy\LaravelVueDatatable\Traits\LaravelVueDatatableTrait;
@@ -65,4 +66,9 @@ public function role() : BelongsTo
     {
         return $this->belongsTo(\App\Role::class);
     }
+
+    public function roles() : BelongsToMany
+    {
+        return $this->belongsToMany('App\Role', 'role_user', 'user_id', 'role_id');
+    }
 }

Diff for: database/factories/RolesFactory.php

@@ -8,7 +8,7 @@
 $factory->define(Role::class, function (Faker $faker) {
 
     return [
-        'department_id' => factory(App\Department::class)->create()->id,
+        // 'department_id' => factory(App\Department::class)->create()->id,
         'name' => $faker->randomElement(['User', 'Staff', 'Admin']),
         'handle' => $faker->randomElement(['user', 'staff', 'admin']),
     ];

Diff for: database/factories/UserFactory.php

@@ -19,7 +19,7 @@
 $factory->define(User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
-        'role_id' => factory(App\Role::class)->create()->id,
+        // 'role_id' => factory(App\Role::class)->create()->id,
         'type' => $faker->randomElement(['admin', 'staff']),
         'email' => $faker->unique()->safeEmail,
         'email_verified_at' => now(),

Diff for: database/migrations/2019_12_24_143507_create_role_user_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRoleUserTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('role_user', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('role_id')->unsigned();
+            $table->foreign('role_id')->references('id')->on('roles'); 
+            $table->bigInteger('user_id')->unsigned();
+            $table->foreign('user_id')->references('id')->on('users'); 
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('role_user');
+    }
+}

Diff for: database/seeds/DatabaseSeeder.php

@@ -11,6 +11,52 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        factory(\App\User::class, 50)->create();
+        $customerService = factory(\App\Department::class)->create([
+            'name' => 'Customer Service',
+            'handle' => 'customer-service',
+        ]);
+
+        $technology = factory(\App\Department::class)->create([
+            'name' => 'Technology',
+            'handle' => 'technology',
+        ]);
+
+        $management = factory(\App\Department::class)->create([
+            'name' => 'Management',
+            'handle' => 'management',
+        ]);
+
+        $user = factory(\App\Role::class)->create([
+            'department_id' => \App\Department::all()->random(),
+            'name' => 'User',
+            'handle' => 'user',
+        ]);
+
+        $staff = factory(\App\Role::class)->create([
+            'department_id' => \App\Department::all()->random(),
+            'name' => 'Staff',
+            'handle' => 'staff',
+        ]);
+
+        $admin = factory(\App\Role::class)->create([
+            'department_id' => \App\Department::all()->random(),
+            'name' => 'Admin',
+            'handle' => 'admin',
+        ]);
+
+        $users = factory(\App\User::class, 50)->create([
+            'role_id' => \App\Role::all()->random(),
+        ]);
+
+        $users->each(function ($item, $key) {
+
+            $role = \App\Role::all()->random();
+
+            \DB::table('role_user')
+                ->insert([
+                    'role_id' => $role->id,
+                    'user_id' => $item->id,
+                ]);
+        });
     }
 }

Diff for: local.txt

@@ -6,4 +6,6 @@
             "symlink": true
         }
     }
-],
+],
+
+"jamesdordoy/laravelvuedatatable": "@dev",

Diff for: package-lock.json

@@ -11,7 +11,7 @@
     },
     "devDependencies": {
         "axios": "^0.18.1",
-        "bootstrap": "^4.0.0",
+        "bootstrap": "^4.4.1",
         "cross-env": "^5.2.1",
         "jquery": "^3.2",
         "laravel-mix": "^4.1.4",