diff --git a/app/Models/Agenda.php b/app/Models/Agenda.php
index 01d530d..09171af 100644
--- a/app/Models/Agenda.php
+++ b/app/Models/Agenda.php
@@ -11,7 +11,22 @@ class Agenda extends Model
     protected $table = 'ms_agenda';
 
     protected $fillable = [
-        'id', 'nama', 'tanggal', 'waktu_mulai', 'waktu_selesai', 'lokasi', 'statusacara', 'idunit', 'idkategori', 'linkzoom', 'idattachment', 'created_at', 'updated_at', 'deleted_at', 'userid_created', 'userid_updated'
+        'id',
+        'nama',
+        'tanggal',
+        'waktu_mulai',
+        'waktu_selesai',
+        'lokasi',
+        'statusacara',
+        'idunit',
+        'idkategori',
+        'linkzoom',
+        'idattachment',
+        'created_at',
+        'updated_at',
+        'deleted_at',
+        'userid_created',
+        'userid_updated'
     ];
 
     // public function rUserAgenda()
@@ -21,7 +36,7 @@ class Agenda extends Model
 
     public function rUnit()
     {
-        return $this->hasOne(Unit::class, 'idunit', 'id');
+        return $this->belongsTo(Unit::class, 'idunit', 'id');
     }
 
     public function rKategori()
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 76f6d34..800c089 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -11,16 +11,21 @@ class Attachment extends Model
     protected $table = 'ms_attachment';
 
     protected $fillable = [
-        'id', 'nama', 'id_kategori_dokumen', 'updated_at', 'created_at', 'deleted_at',
+        'id',
+        'nama',
+        'id_kategori_dokumen',
+        'updated_at',
+        'created_at',
+        'deleted_at',
     ];
 
     public function rAgenda()
     {
-        return $this->hasOne(Agenda::class, 'id', 'idattachment');
+        return $this->belongsTo(Agenda::class, 'idattachment', 'id');
     }
-    
+
     public function rKategoriDokumen()
     {
         return $this->hasOne(KategoriDokumen::class, 'id_kategori_dokumen', 'id');
-    } 
+    }
 }
diff --git a/app/Models/Kategori.php b/app/Models/Kategori.php
index 943af85..5b041e0 100644
--- a/app/Models/Kategori.php
+++ b/app/Models/Kategori.php
@@ -11,11 +11,15 @@ class Kategori extends Model
     protected $table = 'ms_kategori';
 
     protected $fillable = [
-        'id', 'nama','created_at', 'updated_at', 'deleted_at',
+        'id',
+        'nama',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
 
     public function rAgenda()
     {
-        return $this->hasMany(Agenda::class, 'id', 'idkategori');
-    } 
+        return $this->belongsToMany(Agenda::class, 'idkategori', 'id');
+    }
 }
diff --git a/app/Models/KategoriDokumen.php b/app/Models/KategoriDokumen.php
index c952091..80b189f 100644
--- a/app/Models/KategoriDokumen.php
+++ b/app/Models/KategoriDokumen.php
@@ -11,11 +11,15 @@ class KategoriDokumen extends Model
     protected $table = 'ms_kategori_attachment';
 
     protected $fillable = [
-        'id', 'nama','created_at', 'updated_at', 'deleted_at',
+        'id',
+        'nama',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
 
     public function rAttachment()
     {
-        return $this->hasMany(Attachment::class, 'id', 'id_kategori_dokumen');
-    } 
+        return $this->belongsToMany(Attachment::class, 'id_kategori_dokumen', 'id');
+    }
 }
diff --git a/app/Models/Pegawai.php b/app/Models/Pegawai.php
index d7b5a11..d5ce1c7 100644
--- a/app/Models/Pegawai.php
+++ b/app/Models/Pegawai.php
@@ -11,7 +11,14 @@ class Pegawai extends Model
     protected $table = 'pegawai';
 
     protected $fillable = [
-        'id', 'nama', 'nip', 'idunit', 'statusaktif', 'created_at', 'updated_at', 'deleted_at',
+        'id',
+        'nama',
+        'nip',
+        'idunit',
+        'statusaktif',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
 
     // public function rUserAgenda()
@@ -21,12 +28,12 @@ class Pegawai extends Model
 
     public function rUnit()
     {
-        return $this->hasOne(Unit::class, 'idunit', 'id');
+        return $this->belongsTo(Unit::class, 'idunit', 'id');
     }
 
     public function rUsers()
     {
-        return $this->hasOne(Users::class, 'id', 'idpegawai');
+        return $this->hasOne(Users::class, 'idpegawai', 'id');
     }
 
     public function rAgenda()
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 6f95f6f..cff7314 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -11,11 +11,15 @@ class Role extends Model
     protected $table = 'role';
 
     protected $fillable = [
-        'id', 'nama','created_at', 'updated_at', 'deleted_at',
+        'id',
+        'nama',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
-    
+
     public function rUser()
     {
-        return $this->hasMany(Users::class, 'id', 'idrole');
+        return $this->belongsToMany(Users::class, 'idrole', 'id');
     }
 }
diff --git a/app/Models/Unit.php b/app/Models/Unit.php
index 1703a82..944c08a 100644
--- a/app/Models/Unit.php
+++ b/app/Models/Unit.php
@@ -11,16 +11,23 @@ class Unit extends Model
     protected $table = 'ms_unit';
 
     protected $fillable = [
-        'id', 'idsatker', 'idparentsatker', 'namasatker', 'status', 'created_at', 'updated_at', 'deleted_at',
+        'id',
+        'idsatker',
+        'idparentsatker',
+        'namasatker',
+        'status',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
 
     public function rAgenda()
     {
-        return $this->hasMany(Agenda::class, 'id', 'idunit');
-    } 
+        return $this->hasMany(Agenda::class, 'idunit', 'id');
+    }
 
     public function rPegawai()
     {
-        return $this->hasMany(Pegawai::class, 'id', 'idunit');
-    } 
+        return $this->hasMany(Pegawai::class, 'idunit', 'id');
+    }
 }
diff --git a/app/Models/UserAgenda.php b/app/Models/UserAgenda.php
index 976d8f0..831ea1e 100644
--- a/app/Models/UserAgenda.php
+++ b/app/Models/UserAgenda.php
@@ -11,7 +11,13 @@ class UserAgenda extends Model
     protected $table = 'tr_agenda_pegawai';
 
     protected $fillable = [
-        'id', 'idpegawai', 'idagenda', 'statuskehadiran', 'created_at', 'updated_at', 'deleted_at',
+        'id',
+        'idpegawai',
+        'idagenda',
+        'statuskehadiran',
+        'created_at',
+        'updated_at',
+        'deleted_at',
     ];
 
     // public function rPegawai()
@@ -22,5 +28,5 @@ class UserAgenda extends Model
     // public function rAgenda()
     // {
     //     return $this->hasOne(UserAgenda::class, 'idagenda', 'id');
-    // }    
+    // }
 }
diff --git a/app/Models/Users.php b/app/Models/Users.php
index b72b8f7..c9b665a 100644
--- a/app/Models/Users.php
+++ b/app/Models/Users.php
@@ -11,16 +11,23 @@ class Users extends Model
     protected $table = 'user';
 
     protected $fillable = [
-        'id', 'nama', 'email', 'password', 'idrole', 'idpegawai', 'created_at', 'updated_at',
+        'id',
+        'nama',
+        'email',
+        'password',
+        'idrole',
+        'idpegawai',
+        'created_at',
+        'updated_at',
     ];
 
     public function rRole()
     {
-        return $this->belongsTo(Role::class, 'idrole', 'id');
+        return $this->hasOne(Role::class, 'idrole', 'id');
     }
 
     public function rPegawai()
     {
-        return $this->hasOne(Pegawai::class, 'idpegawai', 'id');
+        return $this->belongsTo(Pegawai::class, 'idpegawai', 'id');
     }
 }