rodrigo/genieacs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save _object field when _value is not available

Browse Source 
When saving device, some parameters may not have _value field. In
such cases, save _object field (false) to avoid type ambiguity.
This commit is contained in:
Zaid Abdulla committed 2016-09-06 01:55:24 -07:00
1 parent 82596ad1fe
commit 8e450f6ad0
1 file changed
+22 -8
Download Patch File Download Diff File Expand all files Collapse all files
lib/db.coffee
+22 -8
View File
@@ -358,13 +358,13 @@ fetchDevice = (id, timestamp, patterns, callback) ->
v.exist = 1 v.exist = 1
if obj['_writable']? if obj['_writable']?
t.writable = timestamp t.writable = timestamp or 1
v.writable = if obj['_writable'] then 1 else 0 v.writable = if obj['_writable'] then 1 else 0
t.exist = Math.max(t.exist || 0, t.writable) t.exist = Math.max(t.exist || 0, t.writable)
v.exist = 1 v.exist = 1
if obj['_object']? if obj['_object']?
t.object = obj['_timestamp'] ? timestamp t.object = obj['_timestamp'] or timestamp or 1
v.object = if obj['_object'] then 1 else 0 v.object = if obj['_object'] then 1 else 0
t.exist = Math.max(t.exist || 0, t.object) t.exist = Math.max(t.exist || 0, t.object)
v.exist = 1 v.exist = 1
@@ -468,10 +468,24 @@ saveDevice = (deviceId, deviceData, isNew, callback) ->
iter = deviceData.values.object.diff() iter = deviceData.values.object.diff()
while not (diff = iter.next()).done while not (diff = iter.next()).done
continue if diff.value[0][0] in ['Events', 'DeviceID', 'Tags'] continue if diff.value[0][0] in ['Events', 'DeviceID', 'Tags']
if not diff.value[2] and diff.value[1] if diff.value[1] != diff.value[2]
update['$unset'][diff.value[0].concat('_object').join('.')] = 1 if diff.value[2]
else if diff.value[2] and diff.value[2] != diff.value[1] update['$set'][diff.value[0].concat('_object').join('.')] = true
update['$set'][diff.value[0].concat('_object').join('.')] = true else if not diff.value[2]?
update['$unset'][diff.value[0].concat('_object').join('.')] = 1
else
if deviceData.values.value.getDiff(diff.value[0])?[2]?
if diff.value[1]?
update['$unset'][diff.value[0].concat('_object').join('.')] = 1
else
update['$set'][diff.value[0].concat('_object').join('.')] = false
else if diff.value[2]?
vdiff = deviceData.values.value.getDiff(diff.value[0])
if vdiff[1] != vdiff[2]
if not vdiff[2]?
update['$set'][diff.value[0].concat('_object').join('.')] = false
else if not vdiff[1]?
update['$unset'][diff.value[0].concat('_object').join('.')] = 1
# Set value # Set value
iter = deviceData.values.value.diff() iter = deviceData.values.value.diff()
@@ -518,8 +532,8 @@ saveDevice = (deviceId, deviceData, isNew, callback) ->
update['$set'][diff.value[0].concat('_type').join('.')] = diff.value[2][1] update['$set'][diff.value[0].concat('_type').join('.')] = diff.value[2][1]
else if diff.value[1]? else if diff.value[1]?
update['$unset'][diff.value[0].concat('_value').join('.')] = 1 update['$unset'][diff.value[0].concat('_value').join('.')] = 1
update['$unset'][diff.value[0].concat('_value').join('.')] = 1 update['$unset'][diff.value[0].concat('_value').join('.')] = 1
# Remove empty keys # Remove empty keys
for k of update for k of update