Ref T292, Ref T285 fixed CBackgroundDataUpdater::syncDbEntity which was called always with model entity

This commit is contained in:
Klaus Basan
2018-07-27 01:18:37 +02:00
parent c253520f4a
commit 0c4a2209f2

View File

@@ -155,16 +155,20 @@ namespace BlackCore
if (!this->doWorkCheck()) { return; } if (!this->doWorkCheck()) { return; }
const QDateTime latestCacheTs = sApp->getWebDataServices()->getCacheTimestamp(entity); const QDateTime latestCacheTs = sApp->getWebDataServices()->getCacheTimestamp(entity);
if (!latestCacheTs.isValid()) { return; } if (!latestCacheTs.isValid()) { return; }
const QDateTime latestDbTs = sApp->getWebDataServices()->getLatestDbEntityTimestamp(entity); const QDateTime latestDbTs = sApp->getWebDataServices()->getLatestDbEntityTimestamp(entity);
const QString entityStr = CEntityFlags::flagToString(entity);
const QString latestCacheTsStr = latestCacheTs.toString(Qt::ISODate);
if (!latestDbTs.isValid()) { return; } if (!latestDbTs.isValid()) { return; }
if (latestDbTs <= latestCacheTs) if (latestDbTs <= latestCacheTs)
{ {
this->addHistory(CLogMessage(this).info("No auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << CEntityFlags::flagToString(entity) << latestDbTs.toString(Qt::ISODate) << latestCacheTs.toString(Qt::ISODate)); this->addHistory(CLogMessage(this).info("No auto sync with DB, entity '%1', DB ts: %2 cache ts: %3") << entityStr << latestDbTs.toString(Qt::ISODate) << latestCacheTsStr);
return; return;
} }
this->addHistory(CLogMessage(this).info("Triggering read of '%1' since '%2'") << CEntityFlags::flagToString(entity) << latestCacheTs.toString(Qt::ISODate)); this->addHistory(CLogMessage(this).info("Triggering read of '%1' since '%2'") << entityStr << latestCacheTsStr);
sApp->getWebDataServices()->triggerLoadingDirectlyFromDb(CEntityFlags::ModelEntity, latestCacheTs); sApp->getWebDataServices()->triggerLoadingDirectlyFromDb(entity, latestCacheTs);
} }
bool CBackgroundDataUpdater::doWorkCheck() const bool CBackgroundDataUpdater::doWorkCheck() const