Jan/node-red-contrib-firebase-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed utterly embarassing bugs in rtdb-query and firestore-query where query properties were never processed

Browse Source
This commit is contained in:
Peter Svensson
2019-07-22 09:08:37 +02:00
parent 3ca32c00ae
commit b070a52ee0
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firestore/firestore-query.js
View File

@ -33,18 +33,18 @@ module.exports = function(RED) {
let dir = msg.payload.orderDirection ? msg.payload.orderDirection : 'desc' let dir = msg.payload.orderDirection ? msg.payload.orderDirection : 'desc'
if(msg.payload.orderBy){ if(typeof msg.payload.orderBy !== 'undefined'){
console.log('orderBy dir = '+dir) console.log('orderBy dir = '+dir)
ref = ref.orderBy(msg.payload.orderBy, dir) ref = ref.orderBy(msg.payload.orderBy, dir)
} }
if(msg.payload.limit){ if(typeof msg.payload.limit !== 'undefined'){
ref = ref.limit(msg.payload.limit) ref = ref.limit(msg.payload.limit)
} }
if(msg.payload.startAt){ if(typeof msg.payload.startAt !== 'undefined'){
console.log('startAt '+msg.payload.startAt) console.log('startAt '+msg.payload.startAt)
ref = ref.startAt(msg.payload.startAt) ref = ref.startAt(msg.payload.startAt)
} }
if(msg.payload.endAt){ if(typeof msg.payload.endAt !== 'undefined'){
console.log('endAt '+msg.payload.endAt) console.log('endAt '+msg.payload.endAt)
ref = ref.endAt(msg.payload.endAt) ref = ref.endAt(msg.payload.endAt)
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "node-red-contrib-firebase-admin", "name": "node-red-contrib-firebase-admin",
"version": "1.1.15", "version": "1.1.16",
"description": "A node-red module that wraps the server-side admin SDK of firebase, firestore, et.c.", "description": "A node-red module that wraps the server-side admin SDK of firebase, firestore, et.c.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

26
rtdb/rtdb-query.js
View File

@ -34,13 +34,13 @@ module.exports = function(RED) {
// Decorate with queries // Decorate with queries
if(msg.payload.queries && msg.payload.queries.length > 0){ if(msg.payload.queries && msg.payload.queries.length > 0){
console.log('found queries') console.log('--------------------- found queries')
let ordered = false let ordered = false
msg.payload.queries.forEach((query)=>{ msg.payload.queries.forEach((query)=>{
console.dir(query) console.dir(query)
if(query.orderBy){ if(typeof query.orderBy !== 'undefined'){
ordered = true ordered = true
console.log('setting explicit orderBy') console.log('------- setting explicit orderBy')
if(query.orderBy === 'value'){ if(query.orderBy === 'value'){
ref = ref.orderByValue() ref = ref.orderByValue()
} else if(query.orderBy === 'key'){ } else if(query.orderBy === 'key'){
@ -49,20 +49,20 @@ module.exports = function(RED) {
ref = ref.orderByChild(query.value) ref = ref.orderByChild(query.value)
} }
} }
if(query.startAt){ if(typeof query.startAt !== 'undefined'){
console.log('startAt '+query.startAt) console.log('------- startAt '+query.startAt)
ref = ref.startAt(query.startAt) ref = ref.startAt(query.startAt)
} }
if(query.endAt){ if(typeof query.endAt !== 'undefined'){
console.log('endAt '+query.endAt) console.log('------- endAt '+query.endAt)
ref = ref.endAt(query.endAt) ref = ref.endAt(query.endAt)
} }
if(query.equalTo){ if(typeof query.equalTo !== 'undefined'){
console.log('equalTo '+query.equalTo) console.log('------- equalTo '+query.equalTo)
ref = ref.equalTo(query.equalTo) ref = ref.equalTo(query.equalTo)
} }
if(query.limitTo){ if(typeof query.limitTo !== 'undefined'){
console.log('limitTo '+query.limitTo+' -> '+query.value) console.log('------- limitTo '+query.limitTo+' -> '+query.value)
if(query.limitTo === 'first'){ if(query.limitTo === 'first'){
ref = ref.limitToFirst(query.value) ref = ref.limitToFirst(query.value)
} else if(query.limitTo === 'last'){ } else if(query.limitTo === 'last'){
@ -76,8 +76,8 @@ module.exports = function(RED) {
} }
} }
console.log('finished rtdb query is') //console.log('finished rtdb query is')
console.dir(ref.queryParams_) //console.dir(ref.queryParams_)
ref.on(eventtype, cb) ref.on(eventtype, cb)
oldpath = path oldpath = path