From 945323a7da191ae989759b7a5347305b89cc4bb6 Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Mon, 27 Nov 2017 16:13:15 -0800
Subject: [PATCH] Avoid extra declare cycle when refreshing vparams

---
 lib/session.coffee | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/lib/session.coffee b/lib/session.coffee
index 282cf8d..b469f71 100644
--- a/lib/session.coffee
+++ b/lib/session.coffee
@@ -679,20 +679,30 @@ rpcRequest = (sessionContext, _declarations, callback) ->
     allVirtualParameters = virtualParametersCache.get(sessionContext)
 
     vpd = vpd.filter((declaration) ->
-      if declaration[0].length == 1
-        if Object.keys(allVirtualParameters).length
-          toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, {object: [timestamp, 1], writable: [timestamp, 0]}, toClear)
-        else
-          toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, null, toClear)
-      else if declaration[0].length == 2
-        if declaration[0][1] == '*'
-          for k, v of allVirtualParameters
-            toClear = device.set(sessionContext.deviceData, ['VirtualParameters', k], timestamp, {object: [timestamp, 0]}, toClear)
-          toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, null, toClear)
-        else if not (declaration[0][1] of allVirtualParameters)
-          toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, null, toClear)
-        else
-          return true
+      if Object.keys(allVirtualParameters).length
+        if declaration[0].length == 1
+          # Avoid setting on every inform as "exist" timestamp is not saved in DB
+          if not sessionContext.deviceData.attributes.has(declaration[0])
+            toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, {object: [timestamp, 1], writable: [timestamp, 0]}, toClear)
+          return false
+        else if declaration[0].length == 2
+          if declaration[0][1] == '*'
+            for k, v of allVirtualParameters
+              toClear = device.set(sessionContext.deviceData, ['VirtualParameters', k], timestamp, {object: [timestamp, 0]}, toClear)
+            toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, null, toClear)
+            return false
+          else if declaration[0][1] of allVirtualParameters
+            # Avoid setting on every inform as "exist" timestamp is not saved in DB
+            if not sessionContext.deviceData.attributes.has(declaration[0])
+              toClear = device.set(sessionContext.deviceData, declaration[0], timestamp, {object: [timestamp, 0]}, toClear)
+            return true
+
+      for p in sessionContext.deviceData.paths.find(declaration[0], false, true)
+        if sessionContext.deviceData.attributes.has(p)
+          toClear ?= []
+          toClear.push([declaration[0], timestamp])
+          break
+
       return false
     )