fix: correct notification ID handling and validation

1. Fixed BubbleModel to use entity id instead of bubble id for data
retrieval
2. Updated BubblePanel to check for InvalidId (0) instead of id > 0 when
closing bubbles
3. Modified DataAccessorProxy to return empty entity instead of
cascading fetch when primary source fails
4. Changed MemoryAccessor to generate unique negative IDs for in-memory
entities to avoid conflicts
5. Updated NotifyEntity to use InvalidId constant (0) instead of -1 for
invalid state
6. Added InvalidId constant definition in NotifyEntity header
7. Fixed NotificationManager to properly handle replace operations and
return false when replace fails
8. Ensured consistent ID validation across all components using
InvalidId constant

Log: Fixed notification display issues where incorrect IDs caused
mismatched notifications

Influence:
1. Test notification display in bubble panel with various notification
types
2. Verify bubble closing functionality works correctly
3. Test notification replacement scenarios
4. Check memory-only notification handling
5. Validate notification persistence and retrieval from database
6. Test edge cases with invalid notification IDs
7. Verify notification matching and display consistency

fix: 修正通知ID处理和验证逻辑

1. 修复BubbleModel使用实体ID而非气泡ID进行数据检索
2. 更新BubblePanel在关闭气泡时检查InvalidId(0)而非id>0
3. 修改DataAccessorProxy在主数据源失败时返回空实体而非级联查询
4. 更改MemoryAccessor为内存实体生成唯一的负ID以避免冲突
5. 更新NotifyEntity使用InvalidId常量(0)而非-1表示无效状态
6. 在NotifyEntity头文件中添加InvalidId常量定义
7. 修复NotificationManager正确处理替换操作并在替换失败时返回false
8. 确保所有组件使用InvalidId常量进行一致的ID验证

Log: 修复通知显示问题，错误的ID导致通知匹配混乱

Influence:
1. 测试气泡面板中各种通知类型的显示
2. 验证气泡关闭功能正常工作
3. 测试通知替换场景
4. 检查仅内存通知的处理
5. 验证通知持久化和从数据库检索
6. 测试无效通知ID的边缘情况
7. 验证通知匹配和显示一致性

PMS: BUG-349053

Author: 18202781743

panels/notification/bubble/bubblemodel.cpp

@@ -169,7 +169,7 @@ QVariant BubbleModel::data(const QModelIndex &index, int role) const
     case BubbleModel::AppName:
         return m_bubbles[row]->appName();
     case BubbleModel::Id:
-        return m_bubbles[row]->bubbleId();
+        return m_bubbles[row]->id();
     case BubbleModel::Body:
         return m_bubbles[row]->body();
     case BubbleModel::Summary:

panels/notification/bubble/bubblepanel.cpp

@@ -138,7 +138,7 @@ void BubblePanel::addBubble(qint64 id)
 
 void BubblePanel::closeBubble(qint64 id)
 {
-    if (id > 0) {
+    if (id != NotifyEntity::InvalidId) {
         m_bubbles->removeById(id);
     } else {
         qWarning(notifyLog) << "Failed to close bubble: invalid bubble id for entity id:" << id;

panels/notification/common/dataaccessorproxy.cpp

@@ -112,8 +112,7 @@ NotifyEntity DataAccessorProxy::fetchLastEntity(uint notifyId)
     auto entity = m_impl->fetchLastEntity(notifyId);
     if (entity.isValid())
         return entity;
-
-    return m_source->fetchLastEntity(notifyId);
+    return {};
 }
 
 QList<NotifyEntity> DataAccessorProxy::fetchEntities(const QString &appName, int processedType, int maxCount)

panels/notification/common/memoryaccessor.cpp

@@ -15,9 +15,10 @@ MemoryAccessor::~MemoryAccessor()
 
 qint64 MemoryAccessor::addEntity(const NotifyEntity &entity)
 {
+    static qint64 g_Id = NotifyEntity::InvalidId; // use negative id for in-memory entities
     QMutexLocker locker(&m_mutex);
     m_entities << entity;
-    return entity.bubbleId();
+    return --g_Id;
 }
 
 qint64 MemoryAccessor::replaceEntity(qint64 id, const NotifyEntity &entity)

panels/notification/common/notifyentity.cpp

@@ -37,7 +37,7 @@ class NotifyData : public QSharedData
     uint replacesId = NoReplaceId;
     int expireTimeout = 0;
 
-    qint64 id = -1;
+    qint64 id = NotifyEntity::InvalidId;
     qint64 cTime = 0;
     int processedType = NotifyEntity::NotProcessed;
 };
@@ -118,7 +118,7 @@ bool NotifyEntity::operator!=(const NotifyEntity &other) const
 
 bool NotifyEntity::isValid() const
 {
-    return d && d->id > 0 && d->cTime > 0;
+    return d && d->id != NotifyEntity::InvalidId && d->cTime > 0;
 }
 
 qint64 NotifyEntity::id() const

panels/notification/common/notifyentity.h

@@ -33,6 +33,8 @@ class NotifyEntity
         Timeout = 5,
     };
 
+    static constexpr qint64 InvalidId = 0;
+
     NotifyEntity();
     explicit NotifyEntity(qint64 id, const QString &appName);
     explicit NotifyEntity(const QString &appName, uint replacesId, const QString &appIcon, const QString &summary,

panels/notification/server/notificationmanager.cpp

@@ -378,7 +378,7 @@ bool NotificationManager::isDoNotDisturb() const
 
 bool NotificationManager::recordNotification(NotifyEntity &entity)
 {
-    qint64 id = -1;
+    qint64 id = NotifyEntity::InvalidId;
     if (entity.isReplace()) {
         auto lastEntity = m_persistence->fetchLastEntity(entity.bubbleId());
         if (lastEntity.isValid()) {
@@ -393,13 +393,14 @@ bool NotificationManager::recordNotification(NotifyEntity &entity)
             }
         } else {
             qWarning() << "Not exist notification to replace for the replaceId" << entity.replacesId();
+            return false;
         }
     }
-    if (id == -1) {
+    if (id == NotifyEntity::InvalidId) {
         id = m_persistence->addEntity(entity);
     }
 
-    if (id == -1) {
+    if (id == NotifyEntity::InvalidId) {
         qWarning(notifyLog) << "Failed on saving DB, bubbleId:" << entity.bubbleId() << ", appName" << entity.appName();
         return false;
     }