lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates remaining services and plugins to generated rtiddsgen API

Browse Source 
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp
+92 -92
View File
@@ -29,14 +29,14 @@ ObjectNotification::ObjectNotification(const std::shared_ptr<DdsHandler> &ddsHan
} // end of ctor()
//-----------------------------------------------------------------------------
ObjectNotification::~ObjectNotification() { m_ddsHandler->dts()->removeNomNotificationByKey(m_dataNotificationObject.id()); } // end of dtor()
ObjectNotification::~ObjectNotification() { m_ddsHandler->dts()->removeNomNotificationByKey(m_dataNotificationObject.id); } // end of dtor()
//-----------------------------------------------------------------------------
Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification &data)
{
m_dataNotificationObject = data;
if (data.id() <= 0)
if (data.id <= 0)
{
Database::NomNotification dbDataNotification = toDbData(data);
dbDataNotification.timeStamp = QDateTime::currentMSecsSinceEpoch();
@@ -45,15 +45,15 @@ Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting NomNotification-data into database"));
// Neue DB Id in lokale Struktur uebernehmen
m_dataNotificationObject.id(dbDataNotification.id);
m_dataNotificationObject.id = dbDataNotification.id;
DEBUG_LOG(m_logger) << "New NotificationId: " << dbDataNotification.id;
DEBUG_LOG(m_logger) << "Handle Address for notificationId:" << dbDataNotification.id << " number of depending recipients: " << data.recipientIds().size();
DEBUG_LOG(m_logger) << "Handle Address for notificationId:" << dbDataNotification.id << " number of depending recipients: " << data.recipientIds.size();
// Behandlung von Recipients
for (size_t i = 0; i < data.recipientIds().size(); ++i)
for (size_t i = 0; i < data.recipientIds.size(); ++i)
{
Address &recipientAddress = m_dataNotificationObject.recipientIds()[i];
Address &recipientAddress = m_dataNotificationObject.recipientIds[i];
Database::NomAddress dbDataRecipientAddr = toDbData(recipientAddress);
// Struct Address vorbereiten
@@ -64,10 +64,10 @@ Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification
if (!m_db->insert(dbDataRecipientAddr))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting RecipientAddress-data into database"));
// Neue DB Id in lokale Struktur uebernehmen
recipientAddress.id(dbDataRecipientAddr.id);
recipientAddress.id = dbDataRecipientAddr.id;
}
Address &senderAddress = m_dataNotificationObject.sender();
Address &senderAddress = m_dataNotificationObject.sender;
Database::NomAddress dbDataSenderAddr = toDbData(senderAddress);
// Struct Address vorbereiten
@@ -78,7 +78,7 @@ Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification
if (!m_db->insert(dbDataSenderAddr))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting SenderAddress-data into database"));
// Neue DB Id in lokale Struktur uebernehmen
senderAddress.id(dbDataSenderAddr.id);
senderAddress.id = dbDataSenderAddr.id;
trans.commit();
}
@@ -86,7 +86,7 @@ Core::FunctionReplyObject ObjectNotification::createObject(const NomNotification
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataNotificationObject.id());
return Core::FunctionReplyObject(m_dataNotificationObject.id);
} // end of createObject()
//-----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ QString ObjectNotification::contentArgsToJson()
int i = 1;
QJsonArray jsonArray;
for (const std::string& arg : qAsConst(m_dataNotificationObject.contentArgs()))
for (const std::string& arg : qAsConst(m_dataNotificationObject.contentArgs))
{
DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
<< ", arg=" << arg;
@@ -168,29 +168,29 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
Database::NomAddress dbDataAddr;
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds))
{
if (data.operatorId() > 0 && recipientAddr.addressType() == AddressType_def::Operator && recipientAddr.addressId() != data.operatorId())
if (data.operatorId > 0 && recipientAddr.addressType == AddressType::Operator && recipientAddr.addressId != data.operatorId)
continue;
if (data.workstationId() > 0 && recipientAddr.addressType() == AddressType_def::Workstation && recipientAddr.addressId() != data.workstationId())
if (data.workstationId > 0 && recipientAddr.addressType == AddressType::Workstation && recipientAddr.addressId != data.workstationId)
continue;
dbDataAddr = toDbData(recipientAddr);
DEBUG_LOG(m_logger) << "Found Operator " << data.operatorId() << " with repicpentID " << dbDataAddr.id;
DEBUG_LOG(m_logger) << "Found Operator " << data.operatorId << " with repicpentID " << dbDataAddr.id;
dbDataAddr.notificationId = dbDataNotification.id;
break;
}
if (dbDataAddr.id <= 0)
return Core::FunctionReplyObject(data.addressId(), tr_lts("dds", "No Address found"));
return Core::FunctionReplyObject(data.addressId, tr_lts("dds", "No Address found"));
dbDataAddr.isRead = true;
DBTransaction trans(m_db->database());
// NomNotification shall be marked as processed
if (data.processed())
if (data.processed)
{
// but hasn't been so yet
if (dbDataNotification.processed <= 0)
@@ -216,25 +216,25 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
trans.commit();
INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id();
INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id;
const std::vector<Address> recipients = m_dataNotificationObject.recipientIds();
const Address sender = m_dataNotificationObject.sender();
const std::vector<Address> recipients = m_dataNotificationObject.recipientIds;
const Address sender = m_dataNotificationObject.sender;
m_dataNotificationObject = toDdsData(dbDataNotification);
m_dataNotificationObject.sender(sender);
m_dataNotificationObject.sender = sender;
for (const Address &addr : qAsConst(recipients))
{
if (addr.id() == dbDataAddr.id)
m_dataNotificationObject.recipientIds().push_back(toDdsData(dbDataAddr));
if (addr.id == dbDataAddr.id)
m_dataNotificationObject.recipientIds.push_back(toDdsData(dbDataAddr));
else
m_dataNotificationObject.recipientIds().push_back(addr);
m_dataNotificationObject.recipientIds.push_back(addr);
}
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataNotificationObject.id());
return Core::FunctionReplyObject(m_dataNotificationObject.id);
} // end of updateObject()
//-----------------------------------------------------------------------------
@@ -247,14 +247,14 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
Database::NomAddress dbDataAddr;
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds))
{
DEBUG_LOG(m_logger) << "recipientAddr="
<< ", id: " << recipientAddr.id() << ", addressId: " << recipientAddr.addressId() << ", isDeleted: " << recipientAddr.isDeleted();
if (data.operatorId() > 0 && recipientAddr.addressType() == AddressType_def::Operator && recipientAddr.addressId() != data.operatorId())
<< ", id: " << recipientAddr.id << ", addressId: " << recipientAddr.addressId << ", isDeleted: " << recipientAddr.isDeleted;
if (data.operatorId > 0 && recipientAddr.addressType == AddressType::Operator && recipientAddr.addressId != data.operatorId)
continue;
if (data.workstationId() > 0 && recipientAddr.addressType() == AddressType_def::Workstation && recipientAddr.addressId() != data.workstationId())
if (data.workstationId > 0 && recipientAddr.addressType == AddressType::Workstation && recipientAddr.addressId != data.workstationId)
continue;
dbDataAddr = toDbData(recipientAddr);
@@ -264,7 +264,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
}
if (dbDataAddr.id <= 0)
return Core::FunctionReplyObject(data.addressId(), tr_lts("dds", "No Address found"));
return Core::FunctionReplyObject(data.addressId, tr_lts("dds", "No Address found"));
dbDataAddr.isDeleted = true;
@@ -275,60 +275,60 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
trans.commit();
INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id();
INFO_LOG(m_logger) << "Data changed for NotificationId: " << m_dataNotificationObject.id;
std::vector<Address> recipients = m_dataNotificationObject.recipientIds();
Address sender = m_dataNotificationObject.sender();
std::vector<Address> recipients = m_dataNotificationObject.recipientIds;
Address sender = m_dataNotificationObject.sender;
m_dataNotificationObject = toDdsData(dbDataNotification);
m_dataNotificationObject.sender(sender);
m_dataNotificationObject.sender = sender;
for (const Address &addr : qAsConst(recipients))
{
DEBUG_LOG(m_logger) << "addr="
<< ", id: " << addr.id() << ", addressId: " << addr.addressId() << ", isDeleted: " << addr.isDeleted();
<< ", id: " << addr.id << ", addressId: " << addr.addressId << ", isDeleted: " << addr.isDeleted;
if (addr.id() == dbDataAddr.id)
m_dataNotificationObject.recipientIds().push_back(toDdsData(dbDataAddr));
if (addr.id == dbDataAddr.id)
m_dataNotificationObject.recipientIds.push_back(toDdsData(dbDataAddr));
else
m_dataNotificationObject.recipientIds().push_back(addr);
m_dataNotificationObject.recipientIds.push_back(addr);
}
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_dataNotificationObject.id());
return Core::FunctionReplyObject(m_dataNotificationObject.id);
} // end of updateObject()
//-----------------------------------------------------------------------------
Core::FunctionReplyObject ObjectNotification::deleteObject(const DeleteMessage &data, int notificationId)
{
DEBUG_LOG(m_logger) << "ObjectNotification::deleteObject"
<< ", notificationId: " << notificationId << ", addressId: " << data.addressId() << ", operatorId: " << data.operatorId()
<< ", workstationId: " << data.workstationId();
<< ", notificationId: " << notificationId << ", addressId: " << data.addressId << ", operatorId: " << data.operatorId
<< ", workstationId: " << data.workstationId;
deleteMessage(data, notificationId);
return Core::FunctionReplyObject(m_dataNotificationObject.id());
return Core::FunctionReplyObject(m_dataNotificationObject.id);
}
Core::FunctionReplyObject ObjectNotification::removeObject()
{
if (!m_db->removeNomNotification(m_dataNotificationObject.id()))
return Core::FunctionReplyObject(m_dataNotificationObject.id(), tr_lts("dds", "NomNotification with id %1 can not be removed from DB"))
.arg(m_dataNotificationObject.id());
if (!m_db->removeNomNotification(m_dataNotificationObject.id))
return Core::FunctionReplyObject(m_dataNotificationObject.id, tr_lts("dds", "NomNotification with id %1 can not be removed from DB"))
.arg(m_dataNotificationObject.id);
if (!m_ddsHandler->dts()->removeNomNotificationByKey(m_dataNotificationObject.id()))
return Core::FunctionReplyObject(m_dataNotificationObject.id(), tr_lts("dds", "NomNotification with id %1 can not be removed from DDS"))
.arg(m_dataNotificationObject.id());
if (!m_ddsHandler->dts()->removeNomNotificationByKey(m_dataNotificationObject.id))
return Core::FunctionReplyObject(m_dataNotificationObject.id, tr_lts("dds", "NomNotification with id %1 can not be removed from DDS"))
.arg(m_dataNotificationObject.id);
return Core::FunctionReplyObject(m_dataNotificationObject.id());
return Core::FunctionReplyObject(m_dataNotificationObject.id);
} // end of removeObject()
//-----------------------------------------------------------------------------
bool ObjectNotification::isValid() const { return m_dataNotificationObject.id() > 0; } // end of isValid()
bool ObjectNotification::isValid() const { return m_dataNotificationObject.id > 0; } // end of isValid()
//-----------------------------------------------------------------------------
void ObjectNotification::onPublishData()
{
INFO_LOG(m_logger) << "Publish NomNotification-data to dds notificationId:" << m_dataNotificationObject.id();
INFO_LOG(m_logger) << "Publish NomNotification-data to dds notificationId:" << m_dataNotificationObject.id;
if (!m_ddsHandler->dts()->publish(m_dataNotificationObject))
WARNING_LOG(m_logger) << "Error publishing NomNotification-data to dds";
@@ -345,20 +345,20 @@ Database::NomNotification ObjectNotification::toDbData(const NomNotification &dd
{
Database::NomNotification dbData;
dbData.id = ddsData.id();
dbData.exerciseId = ddsData.exerciseId();
dbData.content = QString::fromStdString(ddsData.content());
dbData.id = ddsData.id;
dbData.exerciseId = ddsData.exerciseId;
dbData.content = QString::fromStdString(ddsData.content);
QString properties = contentArgsToJson();
dbData.properties = properties;
dbData.title = QString::fromStdString(ddsData.title());
dbData.messageType = ddsData.messageType().underlying();
dbData.notificationType = ddsData.notificationType().underlying();
dbData.processTime = ddsData.processTime();
dbData.processed = ddsData.processed();
dbData.processedPriority = ddsData.processedPriority();
dbData.expiryTime = ddsData.expiryTime();
dbData.priorityId = ddsData.priority();
dbData.timeStamp = ddsData.timeStamp();
dbData.title = QString::fromStdString(ddsData.title);
dbData.messageType = ddsData.messageType;
dbData.notificationType = ddsData.notificationType;
dbData.processTime = ddsData.processTime;
dbData.processed = ddsData.processed;
dbData.processedPriority = ddsData.processedPriority;
dbData.expiryTime = ddsData.expiryTime;
dbData.priorityId = ddsData.priority;
dbData.timeStamp = ddsData.timeStamp;
return dbData;
} // end of toDbData()
@@ -369,20 +369,20 @@ NomNotification ObjectNotification::toDdsData(const Database::NomNotification &d
{
NomNotification ddsData;
ddsData.id(dbData.id);
ddsData.content(dbData.content.toStdString());
ddsData.id = dbData.id;
ddsData.content = dbData.content.toStdString();
std::vector< std::string > contentArgs = jsonToContentArgs(dbData.properties);
ddsData.contentArgs(contentArgs);
ddsData.title(dbData.title.toStdString());
ddsData.messageType(static_cast<NotificationManagement::MessageType::inner_enum>(dbData.messageType));
ddsData.notificationType(static_cast<NotificationManagement::NotificationType::inner_enum>(dbData.notificationType));
ddsData.timeStamp(dbData.timeStamp);
ddsData.priority(dbData.priorityId);
ddsData.exerciseId(dbData.exerciseId);
ddsData.expiryTime(dbData.expiryTime);
ddsData.processTime(dbData.processTime);
ddsData.processed(dbData.processed);
ddsData.processedPriority(dbData.processedPriority.underlying());
ddsData.contentArgs = contentArgs;
ddsData.title = dbData.title.toStdString();
ddsData.messageType = static_cast<NotificationManagement::MessageType>(dbData.messageType);
ddsData.notificationType = static_cast<NotificationManagement::NotificationType>(dbData.notificationType);
ddsData.timeStamp = dbData.timeStamp;
ddsData.priority = dbData.priorityId;
ddsData.exerciseId = dbData.exerciseId;
ddsData.expiryTime = dbData.expiryTime;
ddsData.processTime = dbData.processTime;
ddsData.processed = dbData.processed;
ddsData.processedPriority = dbData.processedPriority;
return ddsData;
} // end of toDdsData()
@@ -393,14 +393,14 @@ Database::NomAddress ObjectNotification::toDbData(const Address &ddsData)
{
Database::NomAddress dbData;
dbData.id = ddsData.id();
dbData.addressId = ddsData.addressId();
dbData.addressSubId = ddsData.addressSubId();
dbData.addressSubSubId = ddsData.addressSubSubId();
dbData.addressTypeId = ddsData.addressType().underlying();
dbData.isRead = ddsData.isRead();
dbData.isDeleted = ddsData.isDeleted();
dbData.name = QString::fromStdString(ddsData.name());
dbData.id = ddsData.id;
dbData.addressId = ddsData.addressId;
dbData.addressSubId = ddsData.addressSubId;
dbData.addressSubSubId = ddsData.addressSubSubId;
dbData.addressTypeId = ddsData.addressType;
dbData.isRead = ddsData.isRead;
dbData.isDeleted = ddsData.isDeleted;
dbData.name = QString::fromStdString(ddsData.name);
return dbData;
} // end of toDbData()
@@ -411,14 +411,14 @@ Address ObjectNotification::toDdsData(const Database::NomAddress &dbData)
{
Address ddsData;
ddsData.id(dbData.id);
ddsData.addressType(dbData.addressTypeId);
ddsData.name(dbData.name.toStdString());
ddsData.addressId(dbData.addressId);
ddsData.addressSubId(dbData.addressSubId);
ddsData.addressSubSubId(dbData.addressSubSubId);
ddsData.isRead(dbData.isRead);
ddsData.isDeleted(dbData.isDeleted);
ddsData.id = dbData.id;
ddsData.addressType = dbData.addressTypeId;
ddsData.name = dbData.name.toStdString();
ddsData.addressId = dbData.addressId;
ddsData.addressSubId = dbData.addressSubId;
ddsData.addressSubSubId = dbData.addressSubSubId;
ddsData.isRead = dbData.isRead;
ddsData.isDeleted = dbData.isDeleted;
return ddsData;
} // end of toDdsData()