refactor deleteNotification method
This commit is contained in:
parent
82f4aaf904
commit
fe56312f20
6 changed files with 70 additions and 33 deletions
|
|
@ -40,11 +40,14 @@ return [
|
|||
'comments' => $comments
|
||||
]);
|
||||
|
||||
echo json_encode(getFileData($newFile));
|
||||
|
||||
try {
|
||||
$user->sendNotification($page->parent()->uri(), $newComment->toArray());
|
||||
} catch (\Throwable $th) {
|
||||
throw new Exception($th->getMessage(), 1);
|
||||
}
|
||||
return getFileData($newFile);
|
||||
|
||||
exit;
|
||||
}
|
||||
];
|
||||
|
|
@ -30,32 +30,16 @@ return [
|
|||
}
|
||||
}
|
||||
|
||||
$comments = array_values($comments); // Réindexe les commentaires
|
||||
$comments = array_values($comments);
|
||||
|
||||
foreach (kirby()->users() as $user) {
|
||||
try {
|
||||
$notifications = $user->notifications()->isNotEmpty()
|
||||
? Yaml::decode($user->notifications()->value())
|
||||
: [];
|
||||
|
||||
foreach ($notifications as $key => $notification) {
|
||||
if ($notification['id'] === $data->id) {
|
||||
unset($notifications[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
$user->update([
|
||||
'notifications' => $notifications
|
||||
]);
|
||||
} catch (\Throwable $th) {
|
||||
throw new Exception("Error updating notifications: " . $th->getMessage() . ' line ' . $th->getLine(), 1);
|
||||
}
|
||||
}
|
||||
|
||||
$newFile = $file->update([
|
||||
'comments' => $comments
|
||||
]);
|
||||
|
||||
echo json_encode(getFileData($newFile));
|
||||
|
||||
kirby()->user()->deleteNotification($page, $data->id);
|
||||
|
||||
return getFileData($newFile);
|
||||
exit;
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<?php
|
||||
|
||||
Kirby::plugin('adrienpayet/pdc-notifications', [
|
||||
'routes' => [
|
||||
require(__DIR__ . '/routes/mark-as-read.php'),
|
||||
],
|
||||
// 'routes' => [
|
||||
// require(__DIR__ . '/routes/mark-as-read.php'),
|
||||
// ],
|
||||
'userMethods' => [
|
||||
'sendNotification' => require(__DIR__ . '/user-methods/send.php')
|
||||
'sendNotification' => require(__DIR__ . '/user-methods/send.php'),
|
||||
'deleteNotification' => require(__DIR__ . '/user-methods/delete.php')
|
||||
]
|
||||
]);
|
||||
|
|
|
|||
26
public/site/plugins/notifications/user-methods/delete.php
Normal file
26
public/site/plugins/notifications/user-methods/delete.php
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
return function($project, $notificationId) {
|
||||
$projectManagers = $project->managers()->toUsers();
|
||||
|
||||
foreach ($projectManagers as $user) {
|
||||
try {
|
||||
$notifications = $user->notifications()->isNotEmpty()
|
||||
? Yaml::decode($user->notifications()->value())
|
||||
: [];
|
||||
|
||||
foreach ($notifications as $key => $notification) {
|
||||
if ($notification['id'] === $notificationId) {
|
||||
unset($notifications[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
// Réindexation et ré-encodage en YAML avant la mise à jour
|
||||
$user->update([
|
||||
'notifications' => Yaml::encode(array_values($notifications))
|
||||
]);
|
||||
} catch (\Throwable $th) {
|
||||
throw new Exception("Error updating notifications: " . $th->getMessage() . ' line ' . $th->getLine(), 1);
|
||||
}
|
||||
}
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue