Skip to content

[WIP] Allowed overriding user values in leantime.rpc.Comments.Comments.addComment #3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rimi-itk wants to merge 1 commit into from
Closed

[WIP] Allowed overriding user values in leantime.rpc.Comments.Comments.addComment #3068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions app/Domain/Comments/Services/Comments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Leantime\Domain\Comments\Repositories\Comments as CommentRepository;
use Leantime\Domain\Notifications\Models\Notification;
use Leantime\Domain\Projects\Services\Projects as ProjectService;
use Leantime\Domain\Users\Services\Users as UserService;

/**
* @api
Expand All @@ -17,15 +18,19 @@ class Comments

private ProjectService $projectService;

private UserService $userService;

private LanguageCore $language;

public function __construct(
CommentRepository $commentRepository,
ProjectService $projectService,
UserService $userService,
LanguageCore $language
) {
$this->commentRepository = $commentRepository;
$this->projectService = $projectService;
$this->userService = $userService;
$this->language = $language;
}

Expand All @@ -48,12 +53,26 @@ public function getComments($module, $entityId, int $commentOrder = 0, int $pare
public function addComment($values, $module, $entityId, $entity): bool
{
if (isset($values['text']) && $values['text'] != '' && isset($values['father']) && isset($module) && isset($entityId) && isset($entity)) {
$userId = $values['userId'] ?? session('userdata.id');
$user = $this->userService->getUser($userId ?? -1);
if (! $user) {
return false;
}
// Cf. \Leantime\Core\Middleware::setLeantimeSession().
$user['name'] = strip_tags($user['firstname']);

$projectId = $values['projectId'] ?? session('currentProject');
$project = $this->projectService->getProject($projectId ?? -1);
if (! $project) {
return false;
}

$mapper = [
'text' => $values['text'],
'date' => dtHelper()->dbNow()->formatDateTimeForDb(),
'userId' => (session('userdata.id')),
'userId' => $user['id'],
'moduleId' => $entityId,
'commentParent' => ($values['father']),
'commentParent' => $values['father'],
'status' => $values['status'] ?? '',
];

Expand All @@ -66,19 +85,20 @@ public function addComment($values, $module, $entityId, $entity): bool

switch ($module) {
case 'ticket':
$entity = (object) $entity;
$subject = sprintf($this->language->__('email_notifications.new_comment_todo_with_type_subject'), $this->language->__('label.'.strtolower($entity->type)), $entity->id, strip_tags($entity->headline));
$message = sprintf($this->language->__('email_notifications.new_comment_todo_with_type_message'), session('userdata.name'), $this->language->__('label.'.strtolower($entity->type)), strip_tags($entity->headline), strip_tags($values['text']));
$message = sprintf($this->language->__('email_notifications.new_comment_todo_with_type_message'), $user['name'], $this->language->__('label.'.strtolower($entity->type)), strip_tags($entity->headline), strip_tags($values['text']));
$linkLabel = $this->language->__('email_notifications.new_comment_todo_cta');
$currentUrl = BASE_URL.'#/tickets/showTicket/'.$entity->id;
break;
case 'project':
$subject = sprintf($this->language->__('email_notifications.new_comment_project_subject'), $entityId, strip_tags($entity['name']));
$message = sprintf($this->language->__('email_notifications.new_comment_project_message'), session('userdata.name'), strip_tags($entity['name']));
$message = sprintf($this->language->__('email_notifications.new_comment_project_message'), $user['name'], strip_tags($entity['name']));
$linkLabel = $this->language->__('email_notifications.new_comment_project_cta');
break;
default:
$subject = $this->language->__('email_notifications.new_comment_general_subject');
$message = sprintf($this->language->__('email_notifications.new_comment_general_message'), session('userdata.name'));
$message = sprintf($this->language->__('email_notifications.new_comment_general_message'), $user['name']);
$linkLabel = $this->language->__('email_notifications.new_comment_general_cta');
break;
}
Expand All @@ -87,15 +107,15 @@ public function addComment($values, $module, $entityId, $entity): bool

$urlQueryParameter = str_contains($currentUrl, '?') ? '&' : '?';
$notification->url = [
'url' => $currentUrl.$urlQueryParameter.'projectId='.session('currentProject'),
'url' => $currentUrl.$urlQueryParameter.'projectId='.$projectId,
'text' => $linkLabel,
];

$notification->entity = $mapper;
$notification->module = 'comments';
$notification->projectId = session('currentProject');
$notification->projectId = $projectId;
$notification->subject = $subject;
$notification->authorId = session('userdata.id');
$notification->authorId = $user['id'];
$notification->message = $message;

$this->projectService->notifyProjectUsers($notification);
Expand Down