diff --git a/actions/getsensorData.js b/actions/getsensorData.js index aa64cca..2f7223d 100644 --- a/actions/getsensorData.js +++ b/actions/getsensorData.js @@ -137,8 +137,10 @@ export async function getSensorData(params) { // export const getActData = async (opts) => { export async function getActData(opts) { let retI = await influx.fetchActData(opts) + retI.mongo = false let retM = await mongo.fetchActData(opts) - return retI + retM.mongo = true + return retM } diff --git a/databases/mongo.js b/databases/mongo.js index 309c297..3bb7566 100644 --- a/databases/mongo.js +++ b/databases/mongo.js @@ -151,10 +151,11 @@ export const fetchActData = async (opts) => { start = DateTime.fromISO(start).toJSDate() end = DateTime.fromISO(end).toJSDate() let query = {sensorid: opts.sensorid, datetime: {$gte: start, $lt: end}} + let options = { projection: {_id: 0, values: 1, datetime: 1}, sort: {datetime: 1}} let client = await connectMongo() try { ret.values = await client.db(MONGOBASE).collection('sensors') - .find(query).toArray() + .find(query, options).toArray() } catch(e) { ret.err = e