AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename CommentModel::EVENT_REMOVE to CommentModel::EVENT_DELETE

This commit is contained in:
Frederic Guillot 2016-07-20 21:47:23 -04:00
parent 7b100cc57b
commit 3dd20c9c78
No known key found for this signature in database
GPG Key ID: 92D77191BA7FBC99
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/CommentModel.php
View File

@ -26,7 +26,7 @@ class CommentModel extends Base
*/
const EVENT_UPDATE = 'comment.update';
const EVENT_CREATE = 'comment.create';
const EVENT_REMOVE = 'comment.remove';
const EVENT_DELETE = 'comment.delete';
const EVENT_USER_MENTION = 'comment.user.mention';
/**
@ -166,7 +166,7 @@ class CommentModel extends Base
*/
public function remove($comment_id)
{
$this->commentEventJob->execute($comment_id, self::EVENT_REMOVE);
$this->commentEventJob->execute($comment_id, self::EVENT_DELETE);
return $this->db->table(self::TABLE)->eq('id', $comment_id)->remove();
}
}

6
app/Model/NotificationModel.php
View File

@ -76,7 +76,7 @@ class NotificationModel extends Base
return e('%s updated a comment on the task #%d', $event_author, $event_data['task']['id']);
case CommentModel::EVENT_CREATE:
return e('%s commented on the task #%d', $event_author, $event_data['task']['id']);
case CommentModel::EVENT_REMOVE:
case CommentModel::EVENT_DELETE:
return e('%s removed a comment on the task #%d', $event_author, $event_data['task']['id']);
case TaskFileModel::EVENT_CREATE:
return e('%s attached a file to the task #%d', $event_author, $event_data['task']['id']);
@ -106,7 +106,7 @@ class NotificationModel extends Base
return e('New comment on task #%d', $event_data['comment']['task_id']);
case CommentModel::EVENT_UPDATE:
return e('Comment updated on task #%d', $event_data['comment']['task_id']);
case CommentModel::EVENT_REMOVE:
case CommentModel::EVENT_DELETE:
return e('Comment removed on task #%d', $event_data['comment']['task_id']);
case SubtaskModel::EVENT_CREATE:
return e('New subtask on task #%d', $event_data['subtask']['task_id']);
@ -157,7 +157,7 @@ class NotificationModel extends Base
return $event_data['file']['task_id'];
case CommentModel::EVENT_CREATE:
case CommentModel::EVENT_UPDATE:
case CommentModel::EVENT_REMOVE:
case CommentModel::EVENT_DELETE:
return $event_data['comment']['task_id'];
case SubtaskModel::EVENT_CREATE:
case SubtaskModel::EVENT_UPDATE:

2
app/Subscriber/NotificationSubscriber.php
View File

@ -28,7 +28,7 @@ class NotificationSubscriber extends BaseSubscriber implements EventSubscriberIn
SubtaskModel::EVENT_DELETE => 'handleEvent',
CommentModel::EVENT_CREATE => 'handleEvent',
CommentModel::EVENT_UPDATE => 'handleEvent',
CommentModel::EVENT_REMOVE => 'handleEvent',
CommentModel::EVENT_DELETE => 'handleEvent',
CommentModel::EVENT_USER_MENTION => 'handleEvent',
TaskFileModel::EVENT_CREATE => 'handleEvent',
);

0
app/Template/event/comment_remove.php → app/Template/event/comment_delete.php
View File

0
app/Template/notification/comment_remove.php → app/Template/notification/comment_delete.php
View File

4
tests/units/Job/CommentEventJobTest.php
View File

@ -32,7 +32,7 @@ class CommentEventJobTest extends Base
{
$this->container['dispatcher']->addListener(CommentModel::EVENT_CREATE, function() {});
$this->container['dispatcher']->addListener(CommentModel::EVENT_UPDATE, function() {});
$this->container['dispatcher']->addListener(CommentModel::EVENT_REMOVE, function() {});
$this->container['dispatcher']->addListener(CommentModel::EVENT_DELETE, function() {});
$commentModel = new CommentModel($this->container);
$taskCreationModel = new TaskCreationModel($this->container);
@ -47,6 +47,6 @@ class CommentEventJobTest extends Base
$called = $this->container['dispatcher']->getCalledListeners();
$this->assertArrayHasKey(CommentModel::EVENT_CREATE.'.closure', $called);
$this->assertArrayHasKey(CommentModel::EVENT_UPDATE.'.closure', $called);
$this->assertArrayHasKey(CommentModel::EVENT_REMOVE.'.closure', $called);
$this->assertArrayHasKey(CommentModel::EVENT_DELETE.'.closure', $called);
}
}