Merge pull request #87 from joyja/improvedDBEgress

fixed egress publish

src/relations.js

@@ -501,22 +501,23 @@ MqttSource.prototype.log = async function (scanClassId) {
       return {
         id: tag.id,
         value: tag.prevValue,
-        timestamp: tag.prevChangeOn,
+        timestamp: tag.lastChangeOn,
       }
     })
   // The following is to collect realtime history of events to be published without isHistorical
   if (tags.length > 0) {
     this.rtHistory = [
       ...this.rtHistory,
+      ...preDeadbandExitPoints,
       ...tags.map((tag) => {
         return {
           id: tag.id,
           value: tag.value,
           timestamp: getUnixTime(new Date()),
         }
       }),
-      ...preDeadbandExitPoints,
     ]
+    console.log(this.rtHistory)
   }
   // The following is to collect history in the event of a primaryHost going offline
   if (tags.length > 0) {

src/tag.js

@@ -101,10 +101,10 @@ class Tag extends Model {
   async setValue(value, write = true) {
     this.checkInit()
     const lastValue = this.value
-    const lastChangeOn = this.lastChangeOn
+    this.lastChangeOn = this.timestamp
     if (!this.prevChangeWithinDeadband) {
       this.prevValue = lastValue
-      this.prevChangeOn = lastChangeOn
+      this.prevChangeOn = this.lastChangeOn
     }
     if (this.source && write) {
       this.source.write(value)
@@ -113,7 +113,7 @@ class Tag extends Model {
       this._value = result
       this.pubsub.publish('tagUpdate', { tagUpdate: this })
     })
-    this.lastChangeOn = getUnixTime(new Date())
+    this.timestamp = getUnixTime(new Date())
     this.prevChangeWithinDeadband =
       this.datatype === 'BOOLEAN'
         ? this.value === this.prevValue