fix dashboard pbg, add soft delete users, fix js create pbg task
This commit is contained in:
@@ -85,4 +85,17 @@ class UsersController extends Controller
|
||||
return response()->json(['message' => $e->getMessage()],500);
|
||||
}
|
||||
}
|
||||
|
||||
public function destroy($id){
|
||||
try{
|
||||
$user = User::findOrFail($id);
|
||||
DB::beginTransaction();
|
||||
$user->delete();
|
||||
DB::commit();
|
||||
return response()->json(['message' => 'Successfully deleted'], 200);
|
||||
}catch(\Exception $e){
|
||||
Log::error('Failed to delete user: '. $e->getMessage());
|
||||
return response()->json(['message' => 'Failed to delete user'],500);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Models;
|
||||
|
||||
// use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Laravel\Sanctum\HasApiTokens;
|
||||
@@ -11,7 +12,7 @@ use Laravel\Sanctum\HasApiTokens;
|
||||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<\Database\Factories\UserFactory> */
|
||||
use HasFactory, Notifiable, HasApiTokens;
|
||||
use HasFactory, Notifiable, HasApiTokens, SoftDeletes;
|
||||
|
||||
/**
|
||||
* The attributes that are mass assignable.
|
||||
@@ -27,6 +28,8 @@ class User extends Authenticatable
|
||||
'position'
|
||||
];
|
||||
|
||||
protected $dates = ['deleted_at'];
|
||||
|
||||
/**
|
||||
* The attributes that should be hidden for serialization.
|
||||
*
|
||||
@@ -50,6 +53,12 @@ class User extends Authenticatable
|
||||
];
|
||||
}
|
||||
|
||||
public function delete(){
|
||||
$this->email = $this->email . '_deleted_'. now()->timestamp;
|
||||
$this->save();
|
||||
return parent::delete();
|
||||
}
|
||||
|
||||
public function roles(){
|
||||
return $this->belongsToMany(Role::class, 'user_role')->withTimestamps();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user