Skip to content

Date denormalization option for users with apps that expect zoned data #4826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sulkaharo merged 2 commits into from
Jul 29, 2019
Merged

Date denormalization option for users with apps that expect zoned data #4826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ea483
* Allow users to set `DE_NORMALIZE_DATES=false` to have the REST API …
sulkaharo Jul 29, 2019
7518f43
Merge branch 'dev' into date_denormalize_option
sulkaharo Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions lib/api/devicestatus/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
'use strict';

var consts = require('../../constants');
const consts = require('../../constants');
const moment = require('moment');

function configure (app, wares, ctx) {
var express = require('express'),
api = express.Router( );
function configure (app, wares, ctx, env) {
var express = require('express')
, api = express.Router();

// invoke common middleware
api.use(wares.sendJSONStatus);
// text body types get handled as raw buffer stream
api.use(wares.bodyParser.raw( ));
api.use(wares.bodyParser.raw());
// json body types get handled as parsed json
api.use(wares.bodyParser.json( ));
api.use(wares.bodyParser.json());
// also support url-encoded content-type
api.use(wares.bodyParser.urlencoded({ extended: true }));

Expand All @@ -23,7 +24,21 @@ function configure (app, wares, ctx) {
if (!q.count) {
q.count = 10;
}
ctx.devicestatus.list(q, function (err, results) {

ctx.devicestatus.list(q, function(err, results) {

// Support date de-normalization for older clients
if (env.settings.deNormalizeDates) {
results.forEach(function(e) {
// eslint-disable-next-line no-prototype-builtins
if (e.created_at && e.hasOwnProperty('utcOffset')) {
const d = moment(e.created_at).utcOffset(e.utcOffset);
e.created_at = d.toISOString(true);
delete e.utcOffset;
}
});
}

return res.json(results);
});
});
Expand All @@ -32,7 +47,7 @@ function configure (app, wares, ctx) {

function doPost (req, res) {
var obj = req.body;
ctx.devicestatus.create(obj, function (err, created) {
ctx.devicestatus.create(obj, function(err, created) {
if (err) {
res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err);
} else {
Expand All @@ -48,7 +63,7 @@ function configure (app, wares, ctx) {
* Delete devicestatus. The query logic works the same way as find/list. This
* endpoint uses same search logic to remove records from the database.
*/
function delete_records(req, res, next) {
function delete_records (req, res, next) {
var query = req.query;
if (!query.count) {
query.count = 10
Expand Down Expand Up @@ -91,12 +106,11 @@ function configure (app, wares, ctx) {
api.delete('/devicestatus/', ctx.authorization.isPermitted('api:devicestatus:delete'), delete_records);
}

if (app.enabled('api') || true /*TODO: auth disabled for quick UI testing...*/) {
if (app.enabled('api') || true /*TODO: auth disabled for quick UI testing...*/ ) {
config_authed(app, api, wares, ctx);
}

return api;
}

module.exports = configure;

Loading