update the functionality

Author: subhobiswas

src/Models/Permission.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Lazycode\LaravelSimplePermission\Models;
+namespace Lazycode\Permissions\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Permission extends Model
 {
     protected $fillable = ['name'];
-    
+
     public function roles()
     {
-        return $this->belongsToMany(Role::class);
+        return $this->belongsToMany(Role::class, 'role_permission');
     }
 }

src/Models/Role.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Lazycode\LaravelSimplePermission\Models;
+namespace Lazycode\Permissions\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,6 +10,6 @@ class Role extends Model
 
     public function permissions()
     {
-        return $this->belongsToMany(Permission::class);
+        return $this->belongsToMany(Permission::class, 'role_permission');
     }
 }

src/Traits/HasRoleAndPermissions.php renamed to src/Traits/HasRolesAndPermissions.php

@@ -32,10 +32,12 @@ public function up()
             });
         }
 
-        if (!Schema::hasTable('users')) {
-            Schema::table('users', function (Blueprint $table) {
-                $table->foreignId('role_id')->nullable()->constrained('roles')->onDelete('set null');
-            });
+        if (Schema::hasTable('users')) {
+            if (!Schema::hasColumn('users', 'role_id')) {
+                Schema::table('users', function (Blueprint $table) {
+                    $table->foreignId('role_id')->nullable()->constrained('roles')->onDelete('set null');
+                });
+            }
         }
 
     }
@@ -45,8 +47,11 @@ public function down()
         Schema::dropIfExists('role_permission');
         Schema::dropIfExists('permissions');
         Schema::dropIfExists('roles');
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropForeign(['role_id']);
-        });
+        if (Schema::hasTable('users') && Schema::hasColumn('users', 'role_id')) {
+            Schema::table('users', function (Blueprint $table) {
+                $table->dropForeign(['role_id']);
+                $table->dropColumn('role_id');
+            });
+        }
     }
 };