composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2039 - Rename iTopNewsroom into NewsroomNotification

Browse Source
This commit is contained in:
Molkobain
2024-05-02 09:30:47 +02:00
parent 0d1c3aa464
commit 635c1bda6e
11 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources/Service/Notification/Event/EventiTopNotificationGC.php → sources/Service/Notification/Event/EventNotificationNewsroomGC.php
View File

@@ -9,17 +9,16 @@ use ExceptionLog;
use iBackgroundProcess;
use MetaModel;
class EventiTopNotificationGC implements iBackgroundProcess
class EventNotificationNewsroomGC implements iBackgroundProcess
{
public function Process($iUnixTimeLimit)
{
try {
$iDeletionTime = (int) MetaModel::GetConfig()->Get('notifications.itop.read_notification_retention');
$oDBObjectSearch = DBObjectSearch::FromOQL("SELECT EventiTopNotification WHERE read='yes' AND read_date < DATE_SUB(NOW(), INTERVAL :deletion_time DAY)", ['deletion_time' => $iDeletionTime]);
$oEventiTopNotificationSet = new DBObjectSet($oDBObjectSearch);
while($oEventiTopNotification = $oEventiTopNotificationSet->Fetch()){
$oEventiTopNotification->DBDelete();
$oDBObjectSearch = DBObjectSearch::FromOQL("SELECT EventNotificationNewsroom WHERE read='yes' AND read_date < DATE_SUB(NOW(), INTERVAL :deletion_time DAY)", ['deletion_time' => $iDeletionTime]);
$oEventNotificationNewsroomSet = new DBObjectSet($oDBObjectSearch);
while($oEventNotificationNewsroom = $oEventNotificationNewsroomSet->Fetch()){
$oEventNotificationNewsroom->DBDelete();
}
}
catch (Exception $e) {

20
sources/Service/Notification/Event/EventiTopNotificationService.php → sources/Service/Notification/Event/EventNotificationNewsroomService.php
View File

@@ -2,22 +2,22 @@
namespace Combodo\iTop\Service\Notification\Event;
use Action;
use Combodo\iTop\Application\Branding;
use EventiTopNotification;
use EventNotificationNewsroom;
use MetaModel;
use utils;
/**
* Class EventiTopNotificationService
* Class EventNotificationNewsroomService
*
* Service to create EventiTopNotification objects from various sources.
* Service to create EventNotificationNewsroom objects from various sources.
*
* @package Combodo\iTop\Service\Notification\Event
* @since 3.2.0
* @api
*/
class EventiTopNotificationService {
class EventNotificationNewsroomService {
/**
* @param \Action $oAction
* @param int $iContactId
@@ -29,15 +29,15 @@ class EventiTopNotificationService {
* @param string|null $sObjectClass
* @param string|null $sDate
*
* @return \EventiTopNotification
* @return \EventNotificationNewsroom
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \CoreUnexpectedValue
*/
public static function MakeEventFromAction(Action $oAction, int $iContactId, int $iTriggerId, string $sMessage, string $sTitle, string $sUrl, int $iObjectId, ?string $sObjectClass, string|null $sDate = null): EventiTopNotification
public static function MakeEventFromAction(Action $oAction, int $iContactId, int $iTriggerId, string $sMessage, string $sTitle, string $sUrl, int $iObjectId, ?string $sObjectClass, string|null $sDate = null): EventNotificationNewsroom
{
$oEvent = new EventiTopNotification();
$oEvent = new EventNotificationNewsroom();
$oEvent->Set('title', $sTitle);
$oEvent->Set('message', $sMessage);
// Compute icon
@@ -47,11 +47,11 @@ class EventiTopNotificationService {
}
// - Then, check if the action is for a DM object and if its class has an icon
elseif ($iObjectId > 0 && utils::IsNotNullOrEmptyString(MetaModel::GetClassIcon($sObjectClass, false))) {
$oIcon = MetaModel::GetAttributeDef(EventiTopNotification::class, 'icon')->MakeRealValue(MetaModel::GetClassIcon($sObjectClass, false), $oEvent);
$oIcon = MetaModel::GetAttributeDef(EventNotificationNewsroom::class, 'icon')->MakeRealValue(MetaModel::GetClassIcon($sObjectClass, false), $oEvent);
}
// - Otherwise, fallback on the compact logo of the application
else {
$oIcon = MetaModel::GetAttributeDef(EventiTopNotification::class, 'icon')->MakeRealValue(Branding::GetCompactMainLogoAbsoluteUrl(), $oEvent);
$oIcon = MetaModel::GetAttributeDef(EventNotificationNewsroom::class, 'icon')->MakeRealValue(Branding::GetCompactMainLogoAbsoluteUrl(), $oEvent);
}
$oEvent->Set('icon', $oIcon);

2
sources/Service/Notification/NotificationsRepository.php
View File

@@ -116,7 +116,7 @@ class NotificationsRepository
*/
protected function PrepareSearchForNotificationsByContact(int $iContactId, array $aNotificationIds = []): DBSearch
{
$oSearch = DBObjectSearch::FromOQL("SELECT EventiTopNotification WHERE contact_id = :contact_id");
$oSearch = DBObjectSearch::FromOQL("SELECT EventNotificationNewsroom WHERE contact_id = :contact_id");
$aParams = [
"contact_id" => $iContactId,
];