mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 14:10:28 +01:00
Importing of tickets from email
Everything needed went into TicketImportHelper, with LegacyDB. Functions taken from TicketService, Gateway and AddressWrapper
This commit is contained in:
parent
6cbc0bd08e
commit
b2610079d6
@ -14,9 +14,12 @@ use Xentral\Components\MailClient\Client\MailClientInterface;
|
|||||||
use Xentral\Components\MailClient\Data\MailMessageInterface;
|
use Xentral\Components\MailClient\Data\MailMessageInterface;
|
||||||
use Xentral\Modules\SystemMailer\Data\EmailBackupAccount;
|
use Xentral\Modules\SystemMailer\Data\EmailBackupAccount;
|
||||||
use Xentral\Modules\Ticket\Importer\TicketFormatter;
|
use Xentral\Modules\Ticket\Importer\TicketFormatter;
|
||||||
|
use Xentral\Modules\Ticket\Exception\NumberGeneratorException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility functions for tickets_google cronjob for improved testability
|
* Utility functions for tickets cronjob for improved testability
|
||||||
|
* This is used to create and update tickets from emailbackup, called by the tickets.php cronjob
|
||||||
|
* It uses the TicketService to process the tickets
|
||||||
*/
|
*/
|
||||||
class TicketImportHelper
|
class TicketImportHelper
|
||||||
{
|
{
|
||||||
@ -76,6 +79,256 @@ class TicketImportHelper
|
|||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Function from AddressWrapper...
|
||||||
|
Still using legacy db
|
||||||
|
*/
|
||||||
|
public function tryGetAddressIdByEmailAddress(string $emailAddress): ?int
|
||||||
|
{
|
||||||
|
$searchByEmail = 'SELECT a.id FROM `adresse` AS `a`
|
||||||
|
WHERE a.email LIKE \''.$emailAddress.'\' AND a.geloescht = 0
|
||||||
|
ORDER BY a.id DESC';
|
||||||
|
|
||||||
|
$id = $this->db->Select($searchByEmail);
|
||||||
|
if ($id !== null && $id > 0) {
|
||||||
|
return $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$searchByResponsePerson = 'SELECT ap.adresse FROM `ansprechpartner` AS `ap`
|
||||||
|
WHERE ap.email LIKE \''.$emailAddress.'\'
|
||||||
|
ORDER BY ap.id DESC';
|
||||||
|
$id = $this->db->Select($searchByResponsePerson);
|
||||||
|
if ($id !== null && $id > 0) {
|
||||||
|
return $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$searchByContactInfo = 'SELECT ak.adresse FROM `adresse_kontakte` AS `ak`
|
||||||
|
WHERE ak.kontakt LIKE \''.$emailAddress.'\' ORDER BY ak.id DESC';
|
||||||
|
$id = $this->db->Select($searchByContactInfo);
|
||||||
|
|
||||||
|
return $id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Some functions taken from TicketService (sorry...) */
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function markTicketMessagesCompleted(string $ticketNumber): void
|
||||||
|
{
|
||||||
|
$this->setTicketMessagesStatus($ticketNumber, 'abgeschlossen'); // TicketGateway::STATUS_COMPLETED);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
* @param string $status
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
private function setTicketMessagesStatus(string $ticketNumber, string $status): void
|
||||||
|
{
|
||||||
|
$sql = "UPDATE `ticket_nachricht` SET `status` = '".$status."' WHERE `ticket` = '".$ticketNumber."';";
|
||||||
|
$this->db->Update($sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
*
|
||||||
|
* @throws InvalidArgumentException
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function resetTicketStatus(string $ticketNumber): void
|
||||||
|
{
|
||||||
|
$this->ensureTicketNumberExists($ticketNumber);
|
||||||
|
$sql = "UPDATE `ticket` SET
|
||||||
|
`status` = 'neu',
|
||||||
|
`zugewiesen` = '0',
|
||||||
|
`inbearbeitung` = '0'
|
||||||
|
WHERE `schluessel` = '".$ticket_number."'";
|
||||||
|
$this->db->Update($sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function updateTicketMessagesCount(string $ticketNumber): void
|
||||||
|
{
|
||||||
|
$this->ensureTicketNumberExists($ticketNumber);
|
||||||
|
$count = $this->getMessageCountByTicketNumber($ticketNumber);
|
||||||
|
$count++;
|
||||||
|
$sql = "UPDATE `ticket` SET `nachrichten_anz` = '".$count."' WHERE schluessel = '".$tickerNumber."';";
|
||||||
|
$this->db->Update($sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
private function ensureTicketNumberExists(string $ticketNumber): void
|
||||||
|
{
|
||||||
|
|
||||||
|
if (!$this->db->Select('SELECT id FROM ticket WHERE schluessel = '.$ticketNumber)) {
|
||||||
|
throw new InvalidArgumentException(
|
||||||
|
sprintf('ticket number "%s" does not exist', $ticketNumber)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws NumberGeneratorException
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private function generateRandomTicketNumber(): string
|
||||||
|
{
|
||||||
|
$random = rand(300,700);
|
||||||
|
$loopCounter = 0;
|
||||||
|
while(true) {
|
||||||
|
$candidate = sprintf('%s%04d', date('Ymd'), $random++);
|
||||||
|
|
||||||
|
/* if (!$this->gateway->existsTicketNumber($candidate)) {
|
||||||
|
return $candidate;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
if (!$this->db->Select('SELECT id FROM ticket WHERE schluessel = '.$candidate)) {
|
||||||
|
return($candidate);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($loopCounter > 99) {
|
||||||
|
throw new NumberGeneratorException('ticket number generation failed');
|
||||||
|
}
|
||||||
|
$loopCounter++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Function from Gateway */
|
||||||
|
/**
|
||||||
|
* @param string $ticketNumber
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getMessageCountByTicketNumber(string $ticketNumber): int
|
||||||
|
{
|
||||||
|
$sql = "SELECT COUNT(tm.id) FROM `ticket_nachricht` AS `tm` WHERE tm.ticket = '".$ticketNumber."';";
|
||||||
|
$count = $this->db->Select($sql);
|
||||||
|
if ($count === null) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) $count;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function createTicket(
|
||||||
|
int $projectId,
|
||||||
|
string $senderName,
|
||||||
|
string $senderAddress,
|
||||||
|
string $subject,
|
||||||
|
int $timestamp,
|
||||||
|
string $replyToName,
|
||||||
|
string $replyToAddress
|
||||||
|
): int
|
||||||
|
{
|
||||||
|
$assigneeAddressId = $this->mailAccount->getAddressId();
|
||||||
|
if ($assigneeAddressId < 1) {
|
||||||
|
$assigneeAddressId = $this->tryGetAddressIdByEmailAddress(
|
||||||
|
$this->mailAccount->getEmailAddress()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$ticketNumber = $this->generateRandomTicketNumber();
|
||||||
|
|
||||||
|
if($projectId < 1) {
|
||||||
|
$projectId = $this->mailAccount->getProjectId();
|
||||||
|
}
|
||||||
|
if ($this->mailAccount->isTicketMarkAsFinishedEnabled()) {
|
||||||
|
$status = 'abgeschlossen'; //TicketGateway::STATUS_COMPLETED;
|
||||||
|
} else {
|
||||||
|
$status = 'neu'; //TicketGateway::STATUS_NEW;
|
||||||
|
}
|
||||||
|
|
||||||
|
$insertTicket = "INSERT INTO `ticket` (
|
||||||
|
`schluessel`, `zeit`, `projekt`, `quelle`, `status`, `kunde`,
|
||||||
|
`mailadresse`, `prio`, `betreff`,`warteschlange`,`adresse`
|
||||||
|
) VALUES (
|
||||||
|
'".$ticketNumber."',
|
||||||
|
'".date('Y-m-d H:i:s', $timestamp)."',
|
||||||
|
'".$projectId."',
|
||||||
|
'".$this->mailAccount->getEmailAddress()."',
|
||||||
|
'".$status."',
|
||||||
|
'".$senderName."',
|
||||||
|
'".$senderAddress."',
|
||||||
|
'".'3'."',
|
||||||
|
'".$subject."',
|
||||||
|
'".$this->mailAccount->getTicketQueueId()."',
|
||||||
|
'".$assigneeAddressId."');";
|
||||||
|
|
||||||
|
$this->db->Insert($insertTicket);
|
||||||
|
$ticketId = $this->db->GetInsertID();
|
||||||
|
|
||||||
|
$this->logger->debug('inserted ticket',['id' => $ticketId,'ticketnr' => $ticketNumber]);
|
||||||
|
|
||||||
|
// todo als rueckgabe ticketnachricht
|
||||||
|
return (int) $ticketNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addTicketMessage(
|
||||||
|
string $ticketNumber,
|
||||||
|
int $timestamp,
|
||||||
|
string $message,
|
||||||
|
string $subject,
|
||||||
|
string $senderName,
|
||||||
|
string $senderAddress,
|
||||||
|
string $status,
|
||||||
|
string $replyToName,
|
||||||
|
string $replyToAddress
|
||||||
|
): int
|
||||||
|
{
|
||||||
|
// $this->db->beginTransaction();
|
||||||
|
try {
|
||||||
|
$this->markTicketMessagesCompleted($ticketNumber);
|
||||||
|
$sql = "INSERT INTO `ticket_nachricht` (
|
||||||
|
`ticket`, `zeit`, `text`, `betreff`, `medium`,
|
||||||
|
`verfasser`, `mail`,`status`, `verfasser_replyto`, `mail_replyto`
|
||||||
|
) VALUES (
|
||||||
|
'".$ticketNumber."',
|
||||||
|
'".date('Y-m-d H:i:s', $timestamp)."',
|
||||||
|
'".$message."',
|
||||||
|
'".$subject."',
|
||||||
|
'".'email'."',
|
||||||
|
'".$senderName."',
|
||||||
|
'".$senderAddress."',
|
||||||
|
'".$status."',
|
||||||
|
'".$replyToName."',
|
||||||
|
'".$replyToAddress."');";
|
||||||
|
|
||||||
|
$this->logger->debug('database insert',['query' => $sql]);
|
||||||
|
$this->db->Insert($sql);
|
||||||
|
$messageId = $this->db->GetInsertID();
|
||||||
|
|
||||||
|
$this->logger->debug('inserted',['id' => $messageId]);
|
||||||
|
|
||||||
|
$this->updateTicketMessagesCount($ticketNumber);
|
||||||
|
$this->resetTicketStatus($ticketNumber);
|
||||||
|
// $this->db->commit();
|
||||||
|
|
||||||
|
return (int) $messageId;
|
||||||
|
} catch (Throwable $e) {
|
||||||
|
// $this->db->rollBack();
|
||||||
|
|
||||||
|
$this->logger->error('Failed to insert ticket message into db', ['exception' => $e]);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* End TicketService */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $inboxMessageIds
|
* @param array $inboxMessageIds
|
||||||
*
|
*
|
||||||
@ -125,6 +378,7 @@ class TicketImportHelper
|
|||||||
// extract email data
|
// extract email data
|
||||||
$subject = $this->formatter->encodeToUtf8($message->getSubject());
|
$subject = $this->formatter->encodeToUtf8($message->getSubject());
|
||||||
$from = $this->formatter->encodeToUtf8($message->getSender()->getEmail());
|
$from = $this->formatter->encodeToUtf8($message->getSender()->getEmail());
|
||||||
|
$fromname = $this->formatter->encodeToUtf8($message->getSender()->getName());
|
||||||
$ccs = $message->getCcRecipients();
|
$ccs = $message->getCcRecipients();
|
||||||
$cc_recv = [];
|
$cc_recv = [];
|
||||||
foreach ($ccs as $cc) {
|
foreach ($ccs as $cc) {
|
||||||
@ -146,9 +400,6 @@ class TicketImportHelper
|
|||||||
if (strlen($action_html) < strlen($action)) {
|
if (strlen($action_html) < strlen($action)) {
|
||||||
$action_html = nl2br($action);
|
$action_html = nl2br($action);
|
||||||
}
|
}
|
||||||
$name_sender = $this->formatter->encodeToUtf8($message->getSender()->getName());
|
|
||||||
$mail_replyto = $this->formatter->encodeToUtf8($message->getReplyToAddress());
|
|
||||||
$verfasser_replyto = $this->formatter->encodeToUtf8($message->getSender()->getName());
|
|
||||||
|
|
||||||
//check if email exists in database
|
//check if email exists in database
|
||||||
$date = $message->getDate();
|
$date = $message->getDate();
|
||||||
@ -161,7 +412,13 @@ class TicketImportHelper
|
|||||||
AND `empfang`='$empfang'
|
AND `empfang`='$empfang'
|
||||||
AND `webmail`='" . $this->mailAccount->getId() . "'";
|
AND `webmail`='" . $this->mailAccount->getId() . "'";
|
||||||
|
|
||||||
|
|
||||||
|
$this->logger->debug('Importing message '.$from.' '.$fromname);
|
||||||
|
|
||||||
if ($this->db->Select($sql) == 0) {
|
if ($this->db->Select($sql) == 0) {
|
||||||
|
|
||||||
|
$this->logger->debug('Importing message',['']);
|
||||||
|
|
||||||
$attachments = $message->getAttachments();
|
$attachments = $message->getAttachments();
|
||||||
$anhang = count($attachments) > 0 ? 1 : 0;
|
$anhang = count($attachments) > 0 ? 1 : 0;
|
||||||
$mailacc = $this->mailAccount->getEmailAddress();
|
$mailacc = $this->mailAccount->getEmailAddress();
|
||||||
@ -201,6 +458,7 @@ class TicketImportHelper
|
|||||||
$this->db->InsertWithoutLog($sql);
|
$this->db->InsertWithoutLog($sql);
|
||||||
$id = $this->db->GetInsertID();
|
$id = $this->db->GetInsertID();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ($DEBUG) {
|
if ($DEBUG) {
|
||||||
echo "ticket suchen oder anlegen\n";
|
echo "ticket suchen oder anlegen\n";
|
||||||
@ -208,10 +466,10 @@ class TicketImportHelper
|
|||||||
|
|
||||||
$_schluessel = null;
|
$_schluessel = null;
|
||||||
$schluessel = null;
|
$schluessel = null;
|
||||||
$ticketexits = null;
|
$ticketexists = null;
|
||||||
if (preg_match("/Ticket #[0-9]{12}/i", $subject, $matches)) {
|
if (preg_match("/Ticket #[0-9]{12}/i", $subject, $matches)) {
|
||||||
$schluessel = str_replace('Ticket #', '', $matches[0]);
|
$schluessel = str_replace('Ticket #', '', $matches[0]);
|
||||||
$ticketexits = $this->db->Select(
|
$ticketexists = $this->db->Select(
|
||||||
"SELECT schluessel
|
"SELECT schluessel
|
||||||
FROM ticket
|
FROM ticket
|
||||||
WHERE schluessel LIKE '" . $schluessel . "'
|
WHERE schluessel LIKE '" . $schluessel . "'
|
||||||
@ -219,7 +477,40 @@ class TicketImportHelper
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
$ticketnachricht = null;
|
$ticketnachricht = null;
|
||||||
if ($ticketexits) {
|
|
||||||
|
if (!$ticketexists) {
|
||||||
|
|
||||||
|
$this->logger->debug('New ticket',['']);
|
||||||
|
|
||||||
|
$ticketNumber = $this->createTicket(
|
||||||
|
$this->projectId,
|
||||||
|
$fromname,
|
||||||
|
$from,
|
||||||
|
$subject,
|
||||||
|
$timestamp,
|
||||||
|
$fromname,
|
||||||
|
$from
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logger->debug('Add message to ticket',['']);
|
||||||
|
|
||||||
|
// Add message to new or existing ticket
|
||||||
|
$ticketnachricht = $this->addTicketMessage(
|
||||||
|
(string) $ticketNumber,
|
||||||
|
$timestamp,
|
||||||
|
$action_html, //?
|
||||||
|
$subject,
|
||||||
|
$fromname,
|
||||||
|
$from,
|
||||||
|
'Neu', // ?
|
||||||
|
$fromname,
|
||||||
|
$from
|
||||||
|
);
|
||||||
|
|
||||||
|
/* OLD CODE
|
||||||
|
if ($ticketexists) {
|
||||||
if ($DEBUG) {
|
if ($DEBUG) {
|
||||||
echo "ticket nummer in betreff gefunden\n";
|
echo "ticket nummer in betreff gefunden\n";
|
||||||
}
|
}
|
||||||
@ -346,7 +637,7 @@ class TicketImportHelper
|
|||||||
} else {
|
} else {
|
||||||
echo "Lege neues Ticket an\n";
|
echo "Lege neues Ticket an\n";
|
||||||
}
|
}
|
||||||
}
|
} */
|
||||||
|
|
||||||
if ($ticketnachricht > 0 && $id > 0) {
|
if ($ticketnachricht > 0 && $id > 0) {
|
||||||
$this->db->Update(
|
$this->db->Update(
|
||||||
@ -459,13 +750,6 @@ class TicketImportHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$text = $this->mailAccount->getAutoresponseText();
|
|
||||||
$betreff = $this->mailAccount->getAutoresponseSubject();
|
|
||||||
$text = str_replace('{TICKET}', $schluessel, $text);
|
|
||||||
$text = str_replace('{BETREFF}', $subject, $text);
|
|
||||||
$betreff = str_replace('{TICKET}', $schluessel, $betreff);
|
|
||||||
$betreff = str_replace('{BETREFF}', $subject, $betreff);
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$this->mailAccount->isAutoresponseEnabled()
|
$this->mailAccount->isAutoresponseEnabled()
|
||||||
&& $this->mailAccount->getAutoresponseText() !== ''
|
&& $this->mailAccount->getAutoresponseText() !== ''
|
||||||
@ -474,6 +758,19 @@ class TicketImportHelper
|
|||||||
|| $this->mailAccount->isAutoresponseLimitEnabled() === false
|
|| $this->mailAccount->isAutoresponseLimitEnabled() === false
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
$text = $this->mailAccount->getAutoresponseText();
|
||||||
|
$betreff = $this->mailAccount->getAutoresponseSubject();
|
||||||
|
|
||||||
|
if (empty($text)) $text = '';
|
||||||
|
if (empty($betreff)) $betreff = '';
|
||||||
|
|
||||||
|
$text = str_replace('{TICKET}', $schluessel, $text);
|
||||||
|
$text = str_replace('{BETREFF}', $subject, $text);
|
||||||
|
$betreff = str_replace('{TICKET}', $schluessel, $betreff);
|
||||||
|
$betreff = str_replace('{BETREFF}', $subject, $betreff);
|
||||||
|
|
||||||
|
|
||||||
if (!$this->erpApi->isHTML($text)) {
|
if (!$this->erpApi->isHTML($text)) {
|
||||||
$text = str_replace("\r\n", '<br>', $text);
|
$text = str_replace("\r\n", '<br>', $text);
|
||||||
}
|
}
|
||||||
@ -488,4 +785,3 @@ class TicketImportHelper
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user