-
+
-
-
+
);
}
diff --git a/src/client/app/containers/AdminContainer.js b/src/client/app/containers/AdminContainer.js
new file mode 100644
index 000000000..12397a714
--- /dev/null
+++ b/src/client/app/containers/AdminContainer.js
@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { connect } from 'react-redux';
+import _ from 'lodash';
+import AdminComponent from '../components/AdminComponent';
+import { updateDisplayTitle, updateDefaultChartToRender, toggleDefaultBarStacking, submitPreferencesIfNeeded, updateSelectedMeter } from '../actions/admin';
+
+function mapStateToProps(state) {
+ return {
+ displayTitle: state.admin.displayTitle,
+ defaultChartToRender: state.admin.defaultChartToRender,
+ defaultBarStacking: state.admin.defaultBarStacking,
+ disableSubmitPreferences: state.admin.submitted,
+ meters: _.sortBy(_.values(state.meters.byMeterID).map(meter => ({ value: meter.id, label: meter.name.trim() })), 'name'),
+ selectedImportMeter: state.admin.selectedMeter
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ return {
+ updateSelectedImportMeter: meterID => dispatch(updateSelectedMeter(meterID)),
+ updateDisplayTitle: displayTitle => dispatch(updateDisplayTitle(displayTitle)),
+ updateDefaultGraphType: defaultChartToRender => dispatch(updateDefaultChartToRender(defaultChartToRender)),
+ toggleDefaultBarStacking: () => dispatch(toggleDefaultBarStacking()),
+ submitPreferences: () => dispatch(submitPreferencesIfNeeded())
+ };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(AdminComponent);
diff --git a/src/client/app/containers/ChartDataSelectContainer.js b/src/client/app/containers/ChartDataSelectContainer.js
index 62e3de211..cd4465a0c 100644
--- a/src/client/app/containers/ChartDataSelectContainer.js
+++ b/src/client/app/containers/ChartDataSelectContainer.js
@@ -21,13 +21,13 @@ function mapStateToProps(state) {
// Map information about the currently selected meters into a format the component can display.
const selectedGroups = state.graph.selectedGroups.map(groupID => (
{
- label: state.groups.byGroupID[groupID].name,
+ label: state.groups.byGroupID[groupID] ? state.groups.byGroupID[groupID].name : '',
value: groupID
}
));
const selectedMeters = state.graph.selectedMeters.map(meterID => (
{
- label: state.meters.byMeterID[meterID].name,
+ label: state.meters.byMeterID[meterID] ? state.meters.byMeterID[meterID].name : '',
value: meterID
}
));
diff --git a/src/client/app/containers/CompareChartContainer.js b/src/client/app/containers/CompareChartContainer.js
index 1a777273b..dcd563dd9 100644
--- a/src/client/app/containers/CompareChartContainer.js
+++ b/src/client/app/containers/CompareChartContainer.js
@@ -8,38 +8,51 @@ import { Bar } from 'react-chartjs-2';
import moment from 'moment';
import { connect } from 'react-redux';
import datalabels from 'chartjs-plugin-datalabels'; // eslint-disable-line no-unused-vars
+import TimeInterval from '../../../common/TimeInterval';
-/**
- * @param {State} state
- * @param ownProps
- */
function mapStateToProps(state, ownProps) {
const timeInterval = state.graph.compareTimeInterval;
const barDuration = state.graph.compareDuration;
+ const timeIntervalDurationInDays = TimeInterval.fromString(timeInterval).duration('days');
const data = { datasets: [] };
const labels = [];
// Power used so far this week
- let currentWeek = 0;
+ let current = 0;
// Last week total usage
- let lastWeek = 0;
+ let prev = 0;
// Power used up to this point last week
- let currentLastWeek = 0;
- const soFar = moment().diff(moment().startOf('week'), 'days');
+ let currentPrev = 0;
+ // How long it's been since start of measure period
+ let soFar;
+
+ let prevLabel;
+ let currLabel;
+ if (timeIntervalDurationInDays < 7) {
+ prevLabel = 'Yesterday';
+ currLabel = 'Today';
+ } else if (timeIntervalDurationInDays >= 7 && timeIntervalDurationInDays < 14) {
+ prevLabel = 'Last week';
+ currLabel = 'This week';
+ } else {
+ prevLabel = 'Last month';
+ currLabel = 'This month';
+ }
+ const currLabelLowercase = currLabel.toLowerCase();
// Compose the text to display to the user.
let delta;
if (ownProps.isGroup) {
delta = change => {
if (isNaN(change)) return '';
- if (change < 0) return `${state.groups.byGroupID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', '').slice(1))}% less energy this week.`;
- return `${state.groups.byGroupID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', ''))}% more energy this week.`;
+ if (change < 0) return `${state.groups.byGroupID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', '').slice(1))}% less energy ${currLabelLowercase}`;
+ return `${state.groups.byGroupID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', ''))}% more energy ${currLabelLowercase}`;
};
- } else {
+ } else {
delta = change => {
if (isNaN(change)) return '';
- if (change < 0) return `${state.meters.byMeterID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', '').slice(1))}% less energy this week.`;
- return `${state.meters.byMeterID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', ''))}% more energy this week.`;
+ if (change < 0) return `${state.meters.byMeterID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', '').slice(1))}% less energy ${currLabelLowercase}`;
+ return `${state.meters.byMeterID[ownProps.id].name} has used ${parseInt(change.toFixed(2).replace('.', ''))}% more energy ${currLabelLowercase}`;
};
}
@@ -58,58 +71,66 @@ function mapStateToProps(state, ownProps) {
readingsData = state.readings.bar.byMeterID[ownProps.id][timeInterval][barDuration];
}
if (readingsData !== undefined && !readingsData.isFetching) {
- // Sunday needs special logic
- if (soFar !== 0) {
- // Calculate currentWeek
- for (let i = 1; i <= soFar; i++) {
- currentWeek += readingsData.readings[readingsData.readings.length - i][1];
- }
- // Calculate lastWeek
- for (let i = 0; i < 7; i++) {
- lastWeek += readingsData.readings[readingsData.readings.length - (8 + i) - soFar][1];
- }
+ if (readingsData.readings.length < 7) {
+ soFar = moment().hour();
+ } else if (readingsData.readings.length <= 14) {
+ soFar = moment().diff(moment().startOf('week'), 'days');
+ } else {
+ // 21 to differentiate from week case, week case never larger than 14
+ soFar = moment().diff(moment().startOf('week').subtract(21, 'days'), 'days');
+ }
- // Calculate currentLastWeek
- for (let i = 1; i <= soFar; i++) {
- currentLastWeek += readingsData.readings[readingsData.readings.length - i - 7][1];
- }
+ // Calculates current interval
+ for (let i = readingsData.readings.length - soFar; i < readingsData.readings.length; i++) {
+ current += readingsData.readings[i][1];
+ }
+ // Calculate prev interval
+ for (let i = 0; i < readingsData.readings.length - soFar; i++) {
+ prev += readingsData.readings[i][1];
+ }
+ // Calculates current for previous time interval
+ // Have to special case Sunday for week and month
+ if (soFar === 0) {
+ currentPrev = Math.round((readingsData.readings[0][1] / 24) * moment().hour());
} else {
- currentWeek = readingsData.readings[readingsData.readings.length - 1][1];
- // Data is acquired in days so when less than a day has passed we need to estimate
- currentLastWeek = Math.round((readingsData.readings[readingsData.readings.length - 8][1] / 24) * moment().hour());
- for (let i = 0; i < 7; i++) {
- lastWeek += readingsData.readings[readingsData.readings.length - 7][1];
+ for (let i = 0; i < soFar; i++) {
+ currentPrev += readingsData.readings[i][1];
}
}
- labels.push('Last week');
- labels.push('This week');
- const color1 = 'rgba(173, 216, 230, 1)';
- const color2 = 'rgba(218, 165, 32, 1)';
- const color3 = 'rgba(173, 216, 230, 0.45)';
- data.datasets.push(
- {
- data: [lastWeek, Math.round((currentWeek / currentLastWeek) * lastWeek)],
- backgroundColor: [color1, color3],
- hoverBackgroundColor: [color1, color3],
- datalabels: {
- anchor: 'end',
- align: 'start',
- }
- }, {
- data: [currentLastWeek, currentWeek],
- backgroundColor: color2,
- hoverBackgroundColor: color2,
- datalabels: {
- anchor: 'end',
- align: 'start',
- }
- }
- );
- // sorts the data so that one doesn't cover up the other
- data.datasets.sort((a, b) => a.data[0] - b.data[0]);
}
+
+ labels.push(prevLabel);
+ labels.push(currLabel);
+ const readingsAfterCurrentTimeColor = 'rgba(173, 216, 230, 1)';
+ const readingsBeforeCurrentTimeColor = 'rgba(218, 165, 32, 1)';
+ const projectedDataColor = 'rgba(173, 216, 230, 0.45)';
+ data.datasets.push(
+ {
+ data: [prev, Math.round((current / currentPrev) * prev)],
+ datalabels: {
+ anchor: 'end',
+ align: 'start',
+ }
+ }, {
+ data: [currentPrev, current],
+ datalabels: {
+ anchor: 'end',
+ align: 'start',
+ }
+ }
+ );
+ // sorts the data so that one doesn't cover up the other
+ data.datasets.sort((a, b) => a.data[0] - b.data[0]);
+
+ // apply info to datasets after sort
+ data.datasets[0].backgroundColor = [readingsBeforeCurrentTimeColor, readingsBeforeCurrentTimeColor];
+ data.datasets[0].hoverBackgroundColor = [readingsBeforeCurrentTimeColor, readingsBeforeCurrentTimeColor];
+ data.datasets[1].backgroundColor = [readingsAfterCurrentTimeColor, projectedDataColor];
+ data.datasets[1].hoverBackgroundColor = [readingsAfterCurrentTimeColor, projectedDataColor];
data.labels = labels;
+ const change = (-1 + (((current / currentPrev) * prev) / prev));
+
const options = {
animation: {
duration: 0
@@ -145,8 +166,8 @@ function mapStateToProps(state, ownProps) {
},
title: {
display: true,
- text: delta((-1 + (((currentWeek / currentLastWeek) * lastWeek) / lastWeek))),
- fontColor: colorize((-1 + (((currentWeek / currentLastWeek) * lastWeek) / lastWeek)))
+ text: delta(change),
+ fontColor: colorize(change)
},
plugins: {
datalabels: {
@@ -168,4 +189,5 @@ function mapStateToProps(state, ownProps) {
};
}
+
export default connect(mapStateToProps)(Bar);
diff --git a/src/client/app/containers/HeaderContainer.js b/src/client/app/containers/HeaderContainer.js
index ec667b56d..2e99fe021 100644
--- a/src/client/app/containers/HeaderContainer.js
+++ b/src/client/app/containers/HeaderContainer.js
@@ -5,10 +5,9 @@
import { connect } from 'react-redux';
import HeaderComponent from '../components/HeaderComponent';
-function mapStateToProps(state, ownProps) {
+function mapStateToProps(state) {
return {
- renderLoginButton: ownProps.renderLoginButton,
- renderOptionsButton: ownProps.renderOptionsButton,
+ title: state.admin.displayTitle
};
}
diff --git a/src/client/app/containers/InitializationContainer.js b/src/client/app/containers/InitializationContainer.js
new file mode 100644
index 000000000..b8a3bddc0
--- /dev/null
+++ b/src/client/app/containers/InitializationContainer.js
@@ -0,0 +1,27 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { connect } from 'react-redux';
+import InitializationComponent from '../components/InitializationComponent';
+import { clearNotifications } from '../actions/notifications';
+import { fetchMetersDetailsIfNeeded } from '../actions/meters';
+import { fetchPreferencesIfNeeded } from '../actions/admin';
+
+function mapStateToProps(state) {
+ return {
+ notification: state.notifications.notification
+ };
+}
+
+function mapDispatchToProps(dispatch) {
+ return {
+ clearNotifications: () => dispatch(clearNotifications()),
+ fetchMetersDetailsIfNeeded: () => dispatch(fetchMetersDetailsIfNeeded()),
+ fetchPreferencesIfNeeded: () => dispatch(fetchPreferencesIfNeeded())
+ };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(InitializationComponent);
diff --git a/src/client/app/containers/LoginContainer.js b/src/client/app/containers/LoginContainer.js
deleted file mode 100644
index 42ffd86cf..000000000
--- a/src/client/app/containers/LoginContainer.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import { connect } from 'react-redux';
-import LoginComponent from '../components/LoginComponent';
-import { showNotification } from '../actions/notifications';
-
-function mapDispatchToProps(dispatch) {
- return {
- showNotification: notification => dispatch(showNotification(notification))
- };
-}
-
-export default connect(null, mapDispatchToProps)(LoginComponent);
diff --git a/src/client/app/containers/MeterDropdownContainer.js b/src/client/app/containers/MeterDropdownContainer.js
new file mode 100644
index 000000000..aa97f6ebd
--- /dev/null
+++ b/src/client/app/containers/MeterDropdownContainer.js
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import _ from 'lodash';
+import { connect } from 'react-redux';
+import { updateSelectedMeter } from '../actions/admin';
+import MeterDropdownComponent from '../components/MeterDropDownComponent';
+
+/**
+ * @param {State} state
+ */
+function mapStateToProps(state) {
+ return {
+ meters: _.sortBy(_.values(state.meters.byMeterID).map(meter => ({ id: meter.id, name: meter.name.trim() })), 'name')
+ };
+}
+function mapDispatchToProps(dispatch) {
+ return {
+ updateSelectedMeter: meterID => dispatch(updateSelectedMeter(meterID))
+ };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(MeterDropdownComponent);
diff --git a/src/client/app/containers/RouteContainer.js b/src/client/app/containers/RouteContainer.js
index e6e467010..95b98692f 100644
--- a/src/client/app/containers/RouteContainer.js
+++ b/src/client/app/containers/RouteContainer.js
@@ -1,25 +1,20 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { connect } from 'react-redux';
import RouteComponent from '../components/RouteComponent';
-import { clearNotifications } from '../actions/notifications';
import { changeOptionsFromLink } from '../actions/graph';
-
function mapStateToProps(state) {
return {
- notification: state.notifications.notification,
barStacking: state.graph.barStacking
};
}
+
function mapDispatchToProps(dispatch) {
return {
- clearNotifications: () => dispatch(clearNotifications()),
changeOptionsFromLink: options => dispatch(changeOptionsFromLink(options))
};
}
diff --git a/src/client/app/containers/UIOptionsContainer.js b/src/client/app/containers/UIOptionsContainer.js
index 1bcc07fe5..608cf7f9a 100644
--- a/src/client/app/containers/UIOptionsContainer.js
+++ b/src/client/app/containers/UIOptionsContainer.js
@@ -5,8 +5,12 @@
import _ from 'lodash';
import { connect } from 'react-redux';
import UIOptionsComponent from '../components/UIOptionsComponent';
-import { changeSelectedMeters, changeBarDuration, changeBarStacking } from '../actions/graph';
-import { fetchMetersDetailsIfNeeded } from '../actions/meters';
+import {
+ changeSelectedMeters,
+ changeBarDuration,
+ changeBarStacking,
+ changeChartToRender,
+ changeCompareTimeInterval } from '../actions/graph';
/**
* @param {State} state
@@ -18,21 +22,23 @@ function mapStateToProps(state) {
meters: sortedMeters,
selectedMeters: state.graph.selectedMeters.map(meterID => (
{
- label: state.meters.byMeterID[meterID].name,
+ label: state.meters.byMeterID[meterID] ? state.meters.byMeterID[meterID].name : '',
value: meterID
}
)),
chartToRender: state.graph.chartToRender,
barDuration: state.graph.barDuration,
- barStacking: state.graph.barStacking
+ barStacking: state.graph.barStacking,
+ compareInterval: state.graph.compareTimeInterval
};
}
function mapDispatchToProps(dispatch) {
return {
- fetchMetersDetailsIfNeeded: () => dispatch(fetchMetersDetailsIfNeeded()),
selectMeters: newSelectedMeterIDs => dispatch(changeSelectedMeters(newSelectedMeterIDs)),
changeDuration: barDuration => dispatch(changeBarDuration(barDuration)),
+ changeChartType: chartType => dispatch(changeChartToRender(chartType)),
+ changeCompareInterval: (compareInterval, compareDuration) => dispatch(changeCompareTimeInterval(compareInterval, compareDuration)),
changeBarStacking: () => dispatch(changeBarStacking())
};
}
diff --git a/src/client/app/containers/groups/GroupSidebarContainer.jsx b/src/client/app/containers/groups/GroupSidebarContainer.js
similarity index 100%
rename from src/client/app/containers/groups/GroupSidebarContainer.jsx
rename to src/client/app/containers/groups/GroupSidebarContainer.js
diff --git a/src/client/app/index.jsx b/src/client/app/index.jsx
index fed0523e2..8a27c4a0f 100644
--- a/src/client/app/index.jsx
+++ b/src/client/app/index.jsx
@@ -7,8 +7,10 @@ import thunkMiddleware from 'redux-thunk';
import { render } from 'react-dom';
import { createStore, applyMiddleware, compose } from 'redux';
import { Provider } from 'react-redux';
+import 'bootstrap/dist/css/bootstrap.css';
import RouteContainer from './containers/RouteContainer';
import reducers from './reducers';
+import './styles/index.css';
// This sets up the redux-devtools extension (if it's installed in the browser).
// https://github.com/zalmoxisus/redux-devtools-extension
@@ -27,3 +29,5 @@ render(
,
document.getElementById('root')
);
+
+export default store;
diff --git a/src/client/app/reducers/admin.js b/src/client/app/reducers/admin.js
new file mode 100644
index 000000000..fe65eb98a
--- /dev/null
+++ b/src/client/app/reducers/admin.js
@@ -0,0 +1,68 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import * as adminActions from '../actions/admin';
+import { chartTypes } from './graph';
+
+const defaultState = {
+ selectedMeter: null,
+ displayTitle: '',
+ defaultChartToRender: chartTypes.line,
+ defaultBarStacking: false,
+ isFetching: false,
+ submitted: true
+};
+
+export default function admin(state = defaultState, action) {
+ switch (action.type) {
+ case adminActions.UPDATE_IMPORT_METER:
+ return {
+ ...state,
+ selectedMeter: action.meterID
+ };
+ case adminActions.UPDATE_DISPLAY_TITLE:
+ return {
+ ...state,
+ displayTitle: action.displayTitle,
+ submitted: false
+ };
+ case adminActions.UPDATE_DEFAULT_CHART_TO_RENDER:
+ return {
+ ...state,
+ defaultChartToRender: action.defaultChartToRender,
+ submitted: false,
+ };
+ case adminActions.TOGGLE_DEFAULT_BAR_STACKING:
+ return {
+ ...state,
+ defaultBarStacking: !state.defaultBarStacking,
+ submitted: false
+ };
+ case adminActions.REQUEST_PREFERENCES:
+ return {
+ ...state,
+ isFetching: true
+ };
+ case adminActions.RECEIVE_PREFERENCES:
+ return {
+ ...state,
+ isFetching: false,
+ displayTitle: action.data.displayTitle,
+ defaultChartToRender: action.data.defaultChartToRender,
+ defaultBarStacking: action.data.defaultBarStacking
+ };
+ case adminActions.MARK_PREFERENCES_SUBMITTED:
+ return {
+ ...state,
+ submitted: true
+ };
+ case adminActions.MARK_PREFERENCES_NOT_SUBMITTED:
+ return {
+ ...state,
+ submitted: false
+ };
+ default:
+ return state;
+ }
+}
diff --git a/src/client/app/reducers/graph.js b/src/client/app/reducers/graph.js
index 965409a74..ce9c364e6 100644
--- a/src/client/app/reducers/graph.js
+++ b/src/client/app/reducers/graph.js
@@ -21,11 +21,12 @@ const defaultState = {
selectedMeters: [],
selectedGroups: [],
timeInterval: TimeInterval.unbounded(),
- barDuration: moment.duration(1, 'month'),
- compareTimeInterval: moment().diff(moment().startOf('week'), 'days'),
+ barDuration: moment.duration(28, 'days'),
+ compareTimeInterval: new TimeInterval(moment().startOf('week').subtract(7, 'days'), moment()).toString(),
compareDuration: moment.duration(1, 'days'),
chartToRender: chartTypes.line,
- barStacking: false
+ barStacking: false,
+ hotlinked: false
};
/**
@@ -35,6 +36,11 @@ const defaultState = {
*/
export default function graph(state = defaultState, action) {
switch (action.type) {
+ case graphActions.TOGGLE_HOTLINKED:
+ return {
+ ...state,
+ hotlinked: !state.hotlinked
+ };
case graphActions.UPDATE_SELECTED_METERS:
return {
...state,
@@ -50,6 +56,16 @@ export default function graph(state = defaultState, action) {
...state,
barDuration: action.barDuration
};
+ case graphActions.UPDATE_COMPARE_INTERVAL:
+ return {
+ ...state,
+ compareTimeInterval: action.compareTimeInterval
+ };
+ case graphActions.UPDATE_COMPARE_DURATION:
+ return {
+ ...state,
+ compareDuration: action.compareDuration
+ };
case graphActions.CHANGE_GRAPH_ZOOM:
return {
...state,
diff --git a/src/client/app/reducers/index.js b/src/client/app/reducers/index.js
index 316391e71..1bfe246af 100644
--- a/src/client/app/reducers/index.js
+++ b/src/client/app/reducers/index.js
@@ -11,6 +11,7 @@ import barReadings from './barReadings';
import graph from './graph';
import groups from './groups';
import notifications from './notifications';
+import admin from './admin';
/**
* @typedef {Object} State
@@ -20,11 +21,21 @@ import notifications from './notifications';
* @property {State~Graph} graph
* @property {State~Groups} groups
* @property {State~Notifications} notifications
+ * @property {State-Admin} admin
*/
/**
* @param {State} state
- * @param action
* @return {State}
*/
-export default combineReducers({ meters, readings: combineReducers({ line: lineReadings, bar: barReadings }), graph, groups, notifications });
+export default combineReducers({
+ meters,
+ readings: combineReducers({
+ line: lineReadings,
+ bar: barReadings
+ }),
+ graph,
+ groups,
+ notifications,
+ admin
+});
diff --git a/src/client/app/utils/getToken.js b/src/client/app/styles/index.css
similarity index 72%
rename from src/client/app/utils/getToken.js
rename to src/client/app/styles/index.css
index 0d8221ba3..1ef078810 100644
--- a/src/client/app/utils/getToken.js
+++ b/src/client/app/styles/index.css
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-export default function getToken() {
- return localStorage.getItem('token');
+html {
+ position: relative;
+ min-height: 100%;
}
diff --git a/src/client/app/services/exportData.js b/src/client/app/utils/exportData.js
similarity index 94%
rename from src/client/app/services/exportData.js
rename to src/client/app/utils/exportData.js
index a5cb3d322..dd942e087 100644
--- a/src/client/app/services/exportData.js
+++ b/src/client/app/utils/exportData.js
@@ -19,7 +19,7 @@ function convertToCSV(items) {
data.forEach(reading => {
const info = reading.y;
const startTimeStamp = moment(reading.x).format('dddd MMM DD YYYY hh:mm a');
- csvOutput += `${label},${info} kW, ${startTimeStamp}\n`; // this assumes that meter readings are in kW
+ csvOutput += `"${label}",${info} kW, ${startTimeStamp}\n`; // this assumes that meter readings are in kW
});
});
return csvOutput;
diff --git a/src/client/app/utils/notifications.js b/src/client/app/utils/notifications.js
new file mode 100644
index 000000000..55e845413
--- /dev/null
+++ b/src/client/app/utils/notifications.js
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import store from '../index';
+import { showNotification as showNotificationAction } from '../actions/notifications';
+
+export function showSuccessNotification(message, position = 'tr', autoDismiss = 3) {
+ store.dispatch(showNotificationAction({
+ message,
+ level: 'success',
+ position,
+ autoDismiss
+ }));
+}
+
+export function showErrorNotification(message, position = 'tr', autoDismiss = 3) {
+ store.dispatch(showNotificationAction({
+ message,
+ level: 'error',
+ position,
+ autoDismiss
+ }));
+}
diff --git a/src/client/app/utils/token.js b/src/client/app/utils/token.js
new file mode 100644
index 000000000..fd2a8756b
--- /dev/null
+++ b/src/client/app/utils/token.js
@@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Returns the tokens from local storage, throws an error if the token does not exist
+ * @returns {string}
+ */
+export function getToken() {
+ const token = localStorage.getItem('token');
+ if (token === null) {
+ throw Error('No token found');
+ }
+ return token;
+}
+
+/**
+ * Check if there is a token in local storage
+ * @returns {boolean}
+ */
+export function hasToken() {
+ try {
+ getToken();
+ } catch (e) {
+ return false;
+ }
+ return true;
+}
diff --git a/src/client/index.html b/src/client/index.html
index a23166862..d152e4be0 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -7,7 +7,7 @@
Open Energy Dashboard
-
+
diff --git a/src/common/TimeInterval.js b/src/common/TimeInterval.js
index 0df4c4200..d9c3827f1 100644
--- a/src/common/TimeInterval.js
+++ b/src/common/TimeInterval.js
@@ -25,6 +25,18 @@ class TimeInterval {
return (other instanceof TimeInterval) && this.toString() === other.toString();
}
+ /**
+ * Returns the duration of the time interval
+ * @param specifier - Optional parameter, defaults to milliseconds
+ * @returns {number}
+ */
+ duration(specifier) {
+ if (specifier) {
+ return this.endTimestamp.diff(this.startTimestamp, specifier);
+ }
+ return this.endTimestamp.diff(this.startTimestamp);
+ }
+
/**
* Returns TimeInterval.toString() so that using a time interval as an object key will
* have reasonable behaviour.
diff --git a/src/scripts/init.sh b/src/scripts/init.sh
index 7a0c4848e..872b48540 100755
--- a/src/scripts/init.sh
+++ b/src/scripts/init.sh
@@ -22,6 +22,8 @@ if [ ! -e "$1" ] && [ "$1" != "NONE" ]; then
exit 1
fi
+IPS_FILE=$1
+
while [ "$2" != "" ]; do
case "$2" in
-b) BUILD=yes;;
@@ -77,8 +79,8 @@ echo "Schema created or already exists."
# Pull the meters into the DB and get data
if [ $1 != "NONE" ]; then
set -e
- echo "Trying to add meters."
- npm run addMamacMeters $1 2> /dev/null
+ echo "Trying to add meters from '$IPS_FILE'."
+ npm run addMamacMeters $IPS_FILE 2> /dev/null
echo "Trying to update meters."
npm run updateMamacMeters 2> /dev/null
fi
diff --git a/src/server/app.js b/src/server/app.js
index 89e2c7fb5..1138933af 100644
--- a/src/server/app.js
+++ b/src/server/app.js
@@ -9,8 +9,10 @@ const logger = require('morgan');
const cookieParser = require('cookie-parser');
const bodyParser = require('body-parser');
const users = require('./routes/users');
+const fileProcessing = require('./routes/fileProcessing');
const readings = require('./routes/readings');
const meters = require('./routes/meters');
+const preferences = require('./routes/preferences');
const login = require('./routes/login');
const verification = require('./routes/verification');
const groups = require('./routes/groups');
@@ -28,9 +30,11 @@ app.use(express.static(path.join(__dirname, '..', 'client')));
app.use('/api/users', users);
app.use('/api/meters', meters);
app.use('/api/readings', readings);
+app.use('/api/preferences', preferences);
app.use('/api/login', login);
app.use('/api/groups', groups);
app.use('/api/verification', verification);
+app.use('/api/fileProcessing', fileProcessing);
app.use('/api/version', version);
app.get('\\/|login|admin|groups|graph', (req, res) => {
diff --git a/src/server/config.js b/src/server/config.js
index ea576acc7..04f725bdb 100644
--- a/src/server/config.js
+++ b/src/server/config.js
@@ -12,7 +12,8 @@ try {
fs.accessSync(envPath);
dotenv.config({ path: envPath });
} catch (err) {
- console.log("Couldn't load a .env file");
+ // TODO: Check if valid env variables are actually loaded despite the lack of a file, only log if they are not
+ // console.log("Couldn't load a .env file");
}
@@ -29,6 +30,6 @@ config.database = {
config.secretToken = process.env.OED_TOKEN_SECRET;
config.serverPort = process.env.OED_SERVER_PORT;
-config.logFile = process.env.OED_LOG_FILE || 'log2.txt';
+config.logFile = process.env.OED_LOG_FILE || 'log.txt';
module.exports = config;
diff --git a/src/server/log.js b/src/server/log.js
index 90c65e981..d0c7ee866 100644
--- a/src/server/log.js
+++ b/src/server/log.js
@@ -4,24 +4,131 @@
const fs = require('fs');
const logFile = require('./config').logFile;
+
/**
- *
- * @param {String} message Message to log
- * @param {String} level Level of message: 'standard' or 'error'
- * @param {Boolean} logToFile Log to a file in addition to std out/error
+ * Represents the importance of a message to be logged
*/
-module.exports = (message, level = 'standard', logToFile = true) => {
- const messageToLog = `[${level}@${new Date(Date.now()).toISOString()}] ${message}\n`;
- if (level === 'error') {
- console.error(messageToLog); // eslint-disable-line no-console
- } else {
- console.log(messageToLog); // eslint-disable-line no-console
+class LogLevel {
+ /**
+ * Create a new LogLevel
+ * @param name the name of this LogLevel
+ * @param priority the priority of this LogLevel. Lower numbers are more important.
+ */
+ constructor(name, priority) {
+ this.name = name;
+ this.priority = priority;
}
- if (logToFile) {
- fs.appendFile(logFile, messageToLog, err => {
- if (err) {
- console.error(`Failed to write to log file: ${err}`); // eslint-disable-line no-console
+}
+
+LogLevel.DEBUG = new LogLevel('DEBUG', 40);
+LogLevel.INFO = new LogLevel('INFO', 30);
+LogLevel.WARN = new LogLevel('WARN', 20);
+LogLevel.ERROR = new LogLevel('ERROR', 10);
+LogLevel.SILENT = new LogLevel('SILENT', Number.NEGATIVE_INFINITY);
+
+
+class Logger {
+
+ constructor(logFilePath) {
+ this.level = LogLevel.INFO;
+ this.logToFile = true;
+ this.logToConsole = true;
+ this.logFile = logFilePath;
+ }
+
+ /**
+ * Log using a custom LogLevel.
+ *
+ * A convenience method such as info() or error() is likely to be more convenient than this.
+ * @param {LogLevel} level the level to log at
+ * @param {String} message the message to log
+ * @param {Error?} error An optional error object to provide a stacktrace
+ */
+ log(level, message, error = null) {
+ // Only log if given a high enough priority level.
+ if (level.priority > this.level.priority) {
+ return;
+ }
+ let messageToLog = `[${level.name}@${new Date(Date.now()).toISOString()}] ${message}\n`;
+
+ // Add a stacktrace to the message if one was provided
+ if (error !== null) {
+ if (error.stack) {
+ messageToLog += `Stacktrace: \n${error.stack}\n`;
+ } else {
+ // It's possible someone passed in an error that isn't actually an Error object
+ // because javascript lets you throw anything. In that case, the error won't have
+ // a stack.
+
+ // So we just try to convert whatever we got to a string and include it. It's better
+ // than nothing.
+ messageToLog += `An error was included, but it was not an Error object:\n${error}`;
+ }
+ }
+ if (this.logToConsole) {
+ if (level.priority >= LogLevel.WARN.priority) {
+ // eslint-disable-next-line no-console
+ console.error(messageToLog);
+ } else {
+ // eslint-disable-next-line no-console
+ console.log(messageToLog);
}
- });
+ }
+ if (this.logToFile) {
+ fs.appendFile(logFile, messageToLog, err => {
+ if (err) {
+ console.error(`Failed to write to log file: ${err}`); // eslint-disable-line no-console
+ }
+ });
+ }
}
-};
+
+ /**
+ * Log the given message at the DEBUG level
+ * @param {String} message the message to log
+ * @param {Error?} error An optional error object to include information about
+ */
+ debug(message, error = null) {
+ this.log(LogLevel.DEBUG, message, error);
+ }
+
+ /**
+ * Log the given message at the INFO level
+ * @param {String} message the message to log
+ * @param {Error?} error An optional error object to include information about
+ */
+ info(message, error = null) {
+ this.log(LogLevel.INFO, message, error);
+ }
+
+ /**
+ * Log the given message at the WARN level
+ * @param {String} message the message to log
+ * @param {Error?} error An optional error object to include information about
+ */
+ warn(message, error = null) {
+ this.log(LogLevel.WARN, message, error);
+ }
+
+ /**
+ * Log the given message at the ERROR level
+ * @param {String} message the message to log
+ * @param {Error?} error An optional error object to include information about
+ */
+ error(message, error) {
+ this.log(LogLevel.ERROR, message, error);
+ }
+
+}
+
+
+const defaultLogger = new Logger(logFile);
+
+defaultLogger.logToFile = true;
+defaultLogger.logToConsole = true;
+defaultLogger.level = LogLevel.DEBUG;
+
+/**
+ * @type {{log: Logger, LogLevel: LogLevel}}
+ */
+module.exports = { log: defaultLogger, LogLevel };
diff --git a/src/server/models/Preferences.js b/src/server/models/Preferences.js
new file mode 100644
index 000000000..b62a34fca
--- /dev/null
+++ b/src/server/models/Preferences.js
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const _ = require('lodash');
+const database = require('./database');
+
+const db = database.db;
+const sqlFile = database.sqlFile;
+
+class Preferences {
+ /**
+ * @param {String} displayTitle - Header title to display
+ * @param {String} defaultChartToRender - Chart to display as default
+ * @param {Boolean} defaultBarStacking - Option to set default toggle of bar stacking
+ */
+ constructor(displayTitle, defaultChartToRender, defaultBarStacking) {
+ this.displayTitle = displayTitle;
+ this.defaultChartToRender = defaultChartToRender;
+ this.defaultBarStacking = defaultBarStacking;
+ }
+
+ /**
+ * Returns a promise to create the preferences table
+ * @returns {Promise.<>}
+ */
+ static async createTable() {
+ await db.none(sqlFile('preferences/create_preferences_table.sql'));
+ await db.none(sqlFile('preferences/insert_default_row.sql'));
+ }
+
+ /**
+ * Returns a promise to create the graph_type type.
+ * This needs to be run before Preferences.createTable().
+ * @return {Promise
}
+ */
+ static createGraphTypesEnum() {
+ return db.none(sqlFile('preferences/create_graph_types_enum.sql'));
+ }
+
+ static mapRow(row) {
+ return new Preferences(row.display_title, row.default_chart_to_render, row.default_bar_stacking);
+ }
+
+ static async get() {
+ const row = await db.one(sqlFile('preferences/get_preferences.sql'));
+ return Preferences.mapRow(row);
+ }
+
+ static async update(newPreferences) {
+ const preferences = await Preferences.get();
+ _.merge(preferences, newPreferences);
+ await db.none(sqlFile('preferences/update_preferences.sql'),
+ {
+ displayTitle: preferences.displayTitle,
+ defaultChartToRender: preferences.defaultChartToRender,
+ defaultBarStacking: preferences.defaultBarStacking
+ });
+ }
+}
+
+module.exports = Preferences;
diff --git a/src/server/models/Reading.js b/src/server/models/Reading.js
index ff1991af8..bfe237d22 100644
--- a/src/server/models/Reading.js
+++ b/src/server/models/Reading.js
@@ -229,7 +229,7 @@ class Reading {
toString() {
- return `Reading [id: ${this.id}, reading: ${this.reading}, timestamp: ${this.timestamp}]`;
+ return `Reading [id: ${this.meterID}, reading: ${this.reading}, startTimestamp: ${this.startTimestamp}, endTimestamp: ${this.endTimestamp}]`;
}
}
diff --git a/src/server/models/database.js b/src/server/models/database.js
index a1157bf29..5dc643e1d 100644
--- a/src/server/models/database.js
+++ b/src/server/models/database.js
@@ -54,6 +54,7 @@ async function createSchema() {
const Reading = require('./Reading');
const User = require('./User');
const Group = require('./Group');
+ const Preferences = require('./Preferences');
/* eslint-enable global-require */
await Meter.createMeterTypesEnum();
await Meter.createTable();
@@ -63,6 +64,8 @@ async function createSchema() {
await Reading.createBarchartReadingsFunction();
await Reading.createCompressedGroupsBarchartReadingsFunction();
await User.createTable();
+ await Preferences.createGraphTypesEnum();
+ await Preferences.createTable();
await Group.createTables();
await db.none(sqlFile('reading/create_function_get_compressed_readings.sql'));
}
diff --git a/src/server/routes/authenticator.js b/src/server/routes/authenticator.js
index 4fbcb4160..cc0fa58a1 100644
--- a/src/server/routes/authenticator.js
+++ b/src/server/routes/authenticator.js
@@ -4,6 +4,7 @@
const jwt = require('jsonwebtoken');
const secretToken = require('../config').secretToken;
+const validate = require('jsonschema').validate;
/**
* Middleware function to force a route to require authentication
@@ -11,7 +12,12 @@ const secretToken = require('../config').secretToken;
*/
module.exports = (req, res, next) => {
const token = req.headers.token || req.body.token || req.query.token;
- if (token) {
+ const validParams = {
+ type: 'string',
+ };
+ if (!validate(token, validParams).valid) {
+ res.sendStatus(400);
+ } else if (token) {
jwt.verify(token, secretToken, (err, decoded) => {
if (err) {
res.status(401).json({ success: false, message: 'Failed to authenticate token.' });
diff --git a/src/server/routes/fileProcessing.js b/src/server/routes/fileProcessing.js
new file mode 100644
index 000000000..2c5ccf72b
--- /dev/null
+++ b/src/server/routes/fileProcessing.js
@@ -0,0 +1,64 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const express = require('express');
+const Reading = require('../models/Reading');
+const moment = require('moment');
+const streamBuffers = require('stream-buffers');
+const multer = require('multer');
+const streamToDB = require('../services/loadFromCsvStream');
+const authenticator = require('./authenticator');
+const validate = require('jsonschema').validate;
+
+const router = express.Router();
+
+// The upload here ensures that the file is saved to server RAM rather than disk
+const upload = multer({ storage: multer.memoryStorage() });
+
+router.use(authenticator);
+router.post('/:meter_id', upload.single('csvFile'), async (req, res) => {
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['meter_id'],
+ properties: {
+ meter_id: {
+ type: 'string',
+ pattern: '^\\d+$'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid || !req.file.buffer) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const id = parseInt(req.params.meter_id);
+ const myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
+ frequency: 10,
+ chunkSize: 2048
+ });
+ myReadableStreamBuffer.put(req.file.buffer);
+ // stop() indicates we are done putting the data in our readable stream.
+ myReadableStreamBuffer.stop();
+ try {
+ await streamToDB(myReadableStreamBuffer, row => {
+ const readRate = Number(row[0]);
+ const endTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm');
+ const startTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm').subtract(60, 'minutes');
+ return new Reading(id, readRate, startTimestamp, endTimestamp);
+ }, (readings, tx) => Reading.insertOrUpdateAll(readings, tx));
+ res.status(200).json({ success: true });
+ } catch (e) {
+ res.status(403).json({ success: false, message: 'Failed to upload data.' });
+ }
+ } catch (err) {
+ res.status(400).send({
+ success: false,
+ message: 'Incorrect file type.'
+ });
+ }
+ }
+});
+
+module.exports = router;
diff --git a/src/server/routes/groups.js b/src/server/routes/groups.js
index 063fe8f0a..75d933212 100644
--- a/src/server/routes/groups.js
+++ b/src/server/routes/groups.js
@@ -9,7 +9,7 @@ const validate = require('jsonschema').validate;
const Group = require('../models/Group');
const db = require('../models/database').db;
const authenticator = require('./authenticator');
-const log = require('../log');
+const { log } = require('../log');
const router = express.Router();
@@ -32,7 +32,7 @@ router.get('/', async (req, res) => {
const rows = await Group.getAll();
res.json(rows.map(formatToOnlyNameAndID));
} catch (err) {
- log(`Error while preforming GET all groups query: ${err}`, 'error');
+ log.error(`Error while preforming GET all groups query: ${err}`, err);
}
});
@@ -52,25 +52,55 @@ router.get('/children/:group_id', async (req, res) => {
]);
res.json({ meters, groups });
} catch (err) {
- log(`Error while preforming GET on all immediate children (meters and groups) of specific group: ${err}`, 'error');
+ log.error(`Error while preforming GET on all immediate children (meters and groups) of specific group: ${err}`, err);
}
});
router.get('/deep/groups/:group_id', async (req, res) => {
- try {
- const [deepGroups] = await Group.getDeepGroupsByGroupID(req.params.group_id);
- res.json({ deepGroups });
- } catch (err) {
- log(`Error while preforming GET on all deep child groups of specific group: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['group_id'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const [deepGroups] = await Group.getDeepGroupsByGroupID(req.params.group_id);
+ res.json({ deepGroups });
+ } catch (err) {
+ log.error(`Error while preforming GET on all deep child groups of specific group: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
router.get('/deep/meters/:group_id', async (req, res) => {
- try {
- const [deepMeters] = await Group.getDeepMetersByGroupID(req.params.group_id);
- res.json({ deepMeters });
- } catch (err) {
- log(`Error while preforming GET on all deep child meters of specific group: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['group_id'],
+ properties: {
+ meter_id: {
+ type: 'number'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const [deepMeters] = await Group.getDeepMetersByGroupID(req.params.group_id);
+ res.json({ deepMeters });
+ } catch (err) {
+ log.error(`Error while preforming GET on all deep child meters of specific group: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
@@ -117,7 +147,7 @@ router.post('/create', async (req, res) => {
});
res.sendStatus(200);
} catch (err) {
- log(`Error while inserting new group ${err}`, 'error');
+ log.error(`Error while inserting new group ${err}`, err);
res.sendStatus(500);
}
}
@@ -183,8 +213,12 @@ router.put('/edit', async (req, res) => {
});
res.sendStatus(200);
} catch (err) {
- log(`Error while editing existing group: ${err}`, 'error');
- res.sendStatus(500);
+ if (err.message && err.message === 'Cyclic group detected') {
+ res.status(400).send({ message: err.message });
+ } else {
+ log.error(`Error while editing existing group ${err}`, err);
+ res.sendStatus(500);
+ }
}
}
});
@@ -206,7 +240,7 @@ router.post('/delete', async (req, res) => {
await Group.delete(req.body.id);
res.sendStatus(200);
} catch (err) {
- log(`Error while deleting group ${err}`, 'error');
+ log.error(`Error while deleting group ${err}`, err);
res.sendStatus(500);
}
}
diff --git a/src/server/routes/login.js b/src/server/routes/login.js
index 36d1035e2..8a097f422 100644
--- a/src/server/routes/login.js
+++ b/src/server/routes/login.js
@@ -7,6 +7,7 @@ const bcrypt = require('bcryptjs');
const jwt = require('jsonwebtoken');
const User = require('../models/User');
const secretToken = require('../config').secretToken;
+const validate = require('jsonschema').validate;
const router = express.Router();
@@ -16,20 +17,41 @@ const router = express.Router();
* @param {String} Password
*/
router.post('/', async (req, res) => {
- try {
- const user = await User.getByEmail(req.body.email);
- const isValid = await bcrypt.compare(req.body.password, user.passwordHash);
- if (isValid) {
- const token = jwt.sign({ data: user.id }, secretToken, { expiresIn: 86400 });
- res.json({ token: token });
- } else {
- throw new Error('Unauthorized password');
+ const validParams = {
+ type: 'object',
+ maxProperties: 2,
+ required: ['email', 'password'],
+ properties: {
+ email: {
+ type: 'string',
+ minLength: 3,
+ maxLength: 254
+ },
+ password: {
+ type: 'string',
+ minLength: 3
+ }
}
- } catch (err) {
- if (err.message === 'Unauthorized password' || err.message === 'No data returned from the query.') {
- res.status(401).send({ text: 'Not authorized' });
- } else {
- res.status(500).send({ text: 'Internal Server Error' });
+ };
+
+ if (!validate(req.body, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const user = await User.getByEmail(req.body.email);
+ const isValid = await bcrypt.compare(req.body.password, user.passwordHash);
+ if (isValid) {
+ const token = jwt.sign({ data: user.id }, secretToken, { expiresIn: 86400 });
+ res.json({ token: token });
+ } else {
+ throw new Error('Unauthorized password');
+ }
+ } catch (err) {
+ if (err.message === 'Unauthorized password' || err.message === 'No data returned from the query.') {
+ res.status(401).send({ text: 'Not authorized' });
+ } else {
+ res.status(500).send({ text: 'Internal Server Error' });
+ }
}
}
});
diff --git a/src/server/routes/meters.js b/src/server/routes/meters.js
index dc6d46993..221e53b96 100644
--- a/src/server/routes/meters.js
+++ b/src/server/routes/meters.js
@@ -4,7 +4,8 @@
const express = require('express');
const Meter = require('../models/Meter');
-const log = require('../log');
+const { log } = require('../log');
+const validate = require('jsonschema').validate;
const router = express.Router();
@@ -25,7 +26,7 @@ router.get('/', async (req, res) => {
const rows = await Meter.getAll();
res.json(rows.map(formatMeterForResponse));
} catch (err) {
- log(`Error while performing GET all meters query: ${err}`, 'error');
+ log.error(`Error while performing GET all meters query: ${err}`, err);
}
});
@@ -34,11 +35,26 @@ router.get('/', async (req, res) => {
* @param {int} meter_id
*/
router.get('/:meter_id', async (req, res) => {
- try {
- const meter = await Meter.getByID(req.params.meter_id);
- res.json(formatMeterForResponse(meter));
- } catch (err) {
- log(`Error while performing GET specific meter by id query: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['meter_id'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const meter = await Meter.getByID(req.params.meter_id);
+ res.json(formatMeterForResponse(meter));
+ } catch (err) {
+ log.error(`Error while performing GET specific meter by id query: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
diff --git a/src/server/routes/preferences.js b/src/server/routes/preferences.js
new file mode 100644
index 000000000..45634db38
--- /dev/null
+++ b/src/server/routes/preferences.js
@@ -0,0 +1,66 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const express = require('express');
+const Preferences = require('../models/Preferences');
+const { log } = require('../log');
+const authentication = require('./authenticator');
+const validate = require('jsonschema').validate;
+
+const router = express.Router();
+
+/**
+ * Route for getting the preferences
+ */
+router.get('/', async (req, res) => {
+ try {
+ const rows = await Preferences.get();
+ res.json(rows);
+ } catch (err) {
+ log.error(`Error while performing GET all preferences query: ${err}`, err);
+ }
+});
+
+router.use(authentication);
+
+/**
+ * Route for updating the preferences
+ * @param user_id
+ */
+router.post('/', async (req, res) => {
+ const validParams = {
+ type: 'object',
+ maxProperties: 2,
+ required: ['token', 'preferences'],
+ properties: {
+ token: {
+ type: 'string',
+ },
+ preferences: {
+ displayTitle: {
+ type: 'string',
+ },
+ defaultChartToRender: {
+ type: 'string'
+ },
+ defaultBarTracking: {
+ type: 'boolean'
+ }
+ }
+ }
+ };
+ if (!validate(req.body, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const rows = await Preferences.update(req.body.preferences);
+ res.json(rows);
+ } catch (err) {
+ log.error(`Error while performing POST update preferences: ${err}`, err);
+ res.sendStatus(500);
+ }
+ }
+});
+
+module.exports = router;
diff --git a/src/server/routes/readings.js b/src/server/routes/readings.js
index 15eb3df86..8a7206c98 100644
--- a/src/server/routes/readings.js
+++ b/src/server/routes/readings.js
@@ -7,7 +7,8 @@ const _ = require('lodash');
const moment = require('moment');
const Reading = require('../models/Reading');
const TimeInterval = require('../../common/TimeInterval');
-const log = require('../log');
+const { log } = require('../log');
+const validate = require('jsonschema').validate;
const router = express.Router();
@@ -31,15 +32,40 @@ function formatBarReadings(rows) {
* @param {Date} [endDate]
*/
router.get('/line/meters/:meter_ids', async (req, res) => {
- // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
- const meterIDs = req.params.meter_ids.split(',').map(s => parseInt(s));
- const timeInterval = TimeInterval.fromString(req.query.timeInterval);
- try {
- const rawCompressedReadings = await Reading.getCompressedReadings(meterIDs, timeInterval.startTimestamp, timeInterval.endTimestamp, 100);
- const formattedCompressedReadings = _.mapValues(rawCompressedReadings, formatLineReadings);
- res.json(formattedCompressedReadings);
- } catch (err) {
- log(`Error while performing GET readings for line with meters ${meterIDs} with time interval ${timeInterval}: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['meter_ids'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ const validQueries = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['timeInterval'],
+ properties: {
+ timeInterval: {
+ type: 'string'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid || !validate(validQueries, req.query).valid) {
+ res.sendStatus(400);
+ } else {
+ // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
+ const meterIDs = req.params.meter_ids.split(',').map(s => parseInt(s));
+ const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+ try {
+ const rawCompressedReadings = await Reading.getCompressedReadings(meterIDs, timeInterval.startTimestamp, timeInterval.endTimestamp, 100);
+ const formattedCompressedReadings = _.mapValues(rawCompressedReadings, formatLineReadings);
+ res.json(formattedCompressedReadings);
+ } catch (err) {
+ log.error(`Error while performing GET readings for line with meters ${meterIDs} with time interval ${timeInterval}: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
@@ -50,15 +76,40 @@ router.get('/line/meters/:meter_ids', async (req, res) => {
* @param {TimeInterval} [timeInterval]
*/
router.get('/line/groups/:group_ids', async (req, res) => {
- // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
- const groupIDs = req.params.group_ids.split(',').map(s => parseInt(s));
- const timeInterval = TimeInterval.fromString(req.query.timeInterval);
- try {
- const rawCompressedReadings = await Reading.getCompressedGroupReadings(groupIDs, timeInterval.startTimestamp, timeInterval.endTimestamp, 100);
- const formattedCompressedReadings = _.mapValues(rawCompressedReadings, formatLineReadings);
- res.json(formattedCompressedReadings);
- } catch (err) {
- log(`Error while performing GET readings for line with groups ${groupIDs} with time interval ${timeInterval}: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['group_ids'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ const validQueries = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['timeInterval'],
+ properties: {
+ timeInterval: {
+ type: 'string'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid || !validate(validQueries, req.query).valid) {
+ res.sendStatus(400);
+ } else {
+ // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
+ const groupIDs = req.params.group_ids.split(',').map(s => parseInt(s));
+ const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+ try {
+ const rawCompressedReadings = await Reading.getCompressedGroupReadings(groupIDs, timeInterval.startTimestamp, timeInterval.endTimestamp, 100);
+ const formattedCompressedReadings = _.mapValues(rawCompressedReadings, formatLineReadings);
+ res.json(formattedCompressedReadings);
+ } catch (err) {
+ log.error(`Error while performing GET readings for line with groups ${groupIDs} with time interval ${timeInterval}: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
@@ -70,16 +121,44 @@ router.get('/line/groups/:group_ids', async (req, res) => {
* @param {Date} [endDate]
*/
router.get('/bar/meters/:meter_ids', async (req, res) => {
- // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
- const meterIDs = req.params.meter_ids.split(',').map(s => parseInt(s));
- const timeInterval = TimeInterval.fromString(req.query.timeInterval);
- const barDuration = moment.duration(req.query.barDuration);
- try {
- const barchartReadings = await Reading.getBarchartReadings(meterIDs, barDuration, timeInterval.startTimestamp, timeInterval.endTimestamp);
- const formattedBarchartReadings = _.mapValues(barchartReadings, formatBarReadings);
- res.json(formattedBarchartReadings);
- } catch (err) {
- log(`Error while performing GET readings for bar with meters ${meterIDs} with time interval ${timeInterval}: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['meter_ids'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ const validQueries = {
+ type: 'object',
+ maxProperties: 2,
+ required: ['timeInterval', 'barDuration'],
+ properties: {
+ timeInterval: {
+ type: 'string'
+ },
+ barDuration: {
+ type: 'string'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid || !validate(validQueries, req.query).valid) {
+ res.sendStatus(400);
+ } else {
+ // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
+ const meterIDs = req.params.meter_ids.split(',').map(s => parseInt(s));
+ const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+ const barDuration = moment.duration(req.query.barDuration);
+ try {
+ const barchartReadings = await Reading.getBarchartReadings(meterIDs, barDuration, timeInterval.startTimestamp, timeInterval.endTimestamp);
+ const formattedBarchartReadings = _.mapValues(barchartReadings, formatBarReadings);
+ res.json(formattedBarchartReadings);
+ } catch (err) {
+ log.error(`Error while performing GET readings for bar with meters ${meterIDs} with time interval ${timeInterval}: ${err}`);
+ res.sendStatus(500);
+ }
}
});
@@ -91,17 +170,45 @@ router.get('/bar/meters/:meter_ids', async (req, res) => {
* @param {Date} [endDate]
*/
router.get('/bar/groups/:group_ids', async (req, res) => {
- // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
- const groupIDs = req.params.group_ids.split(',').map(s => parseInt(s));
- const timeInterval = TimeInterval.fromString(req.query.timeInterval);
- const barDuration = moment.duration(req.query.barDuration);
- try {
- const barchartReadings = await Reading.getGroupBarchartReadings(
- groupIDs, barDuration, timeInterval.startTimestamp, timeInterval.endTimestamp);
- const formattedBarchartReadings = _.mapValues(barchartReadings, formatBarReadings);
- res.json(formattedBarchartReadings);
- } catch (err) {
- log(`Error while performing GET readings for bar with groups ${groupIDs} with time interval ${timeInterval}: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['group_ids'],
+ properties: {
+ group_id: {
+ type: 'number'
+ }
+ }
+ };
+ const validQueries = {
+ type: 'object',
+ maxProperties: 2,
+ required: ['timeInterval', 'barDuration'],
+ properties: {
+ timeInterval: {
+ type: 'string'
+ },
+ barDuration: {
+ type: 'string'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid || !validate(validQueries, req.query).valid) {
+ res.sendStatus(400);
+ } else {
+ // We can't do .map(parseInt) here because map would give parseInt a radix value of the current array position.
+ const groupIDs = req.params.group_ids.split(',').map(s => parseInt(s));
+ const timeInterval = TimeInterval.fromString(req.query.timeInterval);
+ const barDuration = moment.duration(req.query.barDuration);
+ try {
+ const barchartReadings = await Reading.getGroupBarchartReadings(
+ groupIDs, barDuration, timeInterval.startTimestamp, timeInterval.endTimestamp);
+ const formattedBarchartReadings = _.mapValues(barchartReadings, formatBarReadings);
+ res.json(formattedBarchartReadings);
+ } catch (err) {
+ log.error(`Error while performing GET readings for bar with groups ${groupIDs} with time interval ${timeInterval}: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
diff --git a/src/server/routes/users.js b/src/server/routes/users.js
index 0e09b8f69..758ae73a6 100644
--- a/src/server/routes/users.js
+++ b/src/server/routes/users.js
@@ -4,7 +4,8 @@
const express = require('express');
const User = require('../models/User');
-const log = require('../log');
+const { log } = require('../log');
+const validate = require('jsonschema').validate;
const router = express.Router();
@@ -16,7 +17,7 @@ router.get('/', async (req, res) => {
const rows = await User.getAll();
res.json(rows);
} catch (err) {
- log(`Error while performing GET all users query: ${err}`, 'error');
+ log.error(`Error while performing GET all users query: ${err}`, err);
}
});
@@ -25,11 +26,26 @@ router.get('/', async (req, res) => {
* @param user_id
*/
router.get('/:user_id', async (req, res) => {
- try {
- const rows = await User.getByID(req.params.user_id);
- res.json(rows);
- } catch (err) {
- log(`Error while performing GET specific user by id query: ${err}`, 'error');
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['user_id'],
+ properties: {
+ group_id: {
+ type: 'id'
+ }
+ }
+ };
+ if (!validate(req.params, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ try {
+ const rows = await User.getByID(req.params.user_id);
+ res.json(rows);
+ } catch (err) {
+ log.error(`Error while performing GET specific user by id query: ${err}`, err);
+ res.sendStatus(500);
+ }
}
});
diff --git a/src/server/routes/verification.js b/src/server/routes/verification.js
index 638db6ed5..6ec7cfd59 100644
--- a/src/server/routes/verification.js
+++ b/src/server/routes/verification.js
@@ -5,6 +5,7 @@
const express = require('express');
const jwt = require('jsonwebtoken');
const secretToken = require('../config').secretToken;
+const validate = require('jsonschema').validate;
const router = express.Router();
@@ -13,8 +14,20 @@ const router = express.Router();
* @param token
*/
router.post('/', (req, res) => {
- const token = req.body.token;
- if (token) {
+ const validParams = {
+ type: 'object',
+ maxProperties: 1,
+ required: ['token'],
+ properties: {
+ token: {
+ type: 'string'
+ }
+ }
+ };
+ if (!validate(req.body, validParams).valid) {
+ res.sendStatus(400);
+ } else {
+ const token = req.body.token;
jwt.verify(token, secretToken, err => {
if (err) {
res.status(401).json({ success: false, message: 'Failed to authenticate token.' });
@@ -22,11 +35,6 @@ router.post('/', (req, res) => {
res.status(200).json({ success: true });
}
});
- } else {
- res.status(403).send({
- success: false,
- message: 'No token provided.'
- });
}
});
diff --git a/src/server/services/addMamacMeters.js b/src/server/services/addMamacMeters.js
index b8dd215d1..a4d8a61a6 100644
--- a/src/server/services/addMamacMeters.js
+++ b/src/server/services/addMamacMeters.js
@@ -12,7 +12,7 @@ const parseString = require('xml2js').parseString;
const Meter = require('../models/Meter');
const _ = require('lodash');
const stopDB = require('../models/database').stopDB;
-const log = require('../log');
+const { log } = require('../log');
const parseXMLPromisified = promisify(parseString);
@@ -59,14 +59,13 @@ async function insertMeters(ips) {
return await Promise.all(meters.map(m => m.insert()));
}
-
async function insertMetersWrapper(filename) {
try {
const ips = await parseCSV(filename);
await insertMeters(ips);
- log('Done inserting meters');
+ log.info('Done inserting meters');
} catch (err) {
- log(`Error inserting meters: ${err}`, 'error');
+ log.error(`Error inserting meters: ${err}`, err);
} finally {
stopDB();
}
@@ -75,10 +74,10 @@ async function insertMetersWrapper(filename) {
// The first two elements are 'node' and the name of the file. We only want arguments passed to it.
const args = process.argv.slice(2);
if (args.length !== 1) {
- log(`Expected one argument (path to csv file of meter ips), but got ${args.length} instead`, 'error');
+ log.error(`Expected one argument (path to csv file of meter ips), but got ${args.length} instead`, 'error');
} else {
const absolutePath = path.resolve(args[0]);
- log(`Importing meters from ${absolutePath}`);
+ log.info(`Importing meters from ${absolutePath}`);
insertMetersWrapper(absolutePath);
}
diff --git a/src/server/services/createDB.js b/src/server/services/createDB.js
index e0258f21a..97aa3ace1 100644
--- a/src/server/services/createDB.js
+++ b/src/server/services/createDB.js
@@ -3,14 +3,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const { createSchema, pgp } = require('../models/database');
-const log = require('../log');
+const { log } = require('../log');
(async function createSchemaWrapper() {
try {
await createSchema();
- log('Schema created');
+ log.info('Schema created');
} catch (err) {
- log(`Error creating schema: ${err}`, 'error');
+ log.error(`Error creating schema: ${err}`, err);
} finally {
pgp.end();
}
diff --git a/src/server/services/createUser.js b/src/server/services/createUser.js
index 7f227d44c..30944d882 100644
--- a/src/server/services/createUser.js
+++ b/src/server/services/createUser.js
@@ -7,7 +7,7 @@
const readline = require('readline');
const bcrypt = require('bcryptjs');
const User = require('../models/User');
-const log = require('../log');
+const { log } = require('../log');
const rl = readline.createInterface({
input: process.stdin,
@@ -39,7 +39,7 @@ function askPassword(email) {
}
function terminateReadline(message) {
- if (message) log(message);
+ if (message) log.info(message);
rl.close();
process.exit(0);
}
diff --git a/src/server/services/loadFromCsvStream.js b/src/server/services/loadFromCsvStream.js
index b64e092d5..3dd5dc798 100644
--- a/src/server/services/loadFromCsvStream.js
+++ b/src/server/services/loadFromCsvStream.js
@@ -19,11 +19,12 @@ const csv = require('csv');
* @param stream the raw stream to load from
* @param {function(Array.<*>, ...*): M} mapRowToModel A function that maps a CSV row (an array) to a model object
* @param {function(Array., ITask): Promise<>} bulkInsertModels A function that bulk inserts an array of models using the supplied transaction
- * @return {function(fs.ReadStream, ...*): Promise.<>} A promise to execute the load operation
* @template M
*/
function loadFromCsvStream(stream, mapRowToModel, bulkInsertModels) {
return db.tx(t => new Promise(resolve => {
+ let rejected = false;
+ const error = null;
const MIN_INSERT_BUFFER_SIZE = 1000;
let modelsToInsert = [];
const pendingInserts = [];
@@ -39,13 +40,23 @@ function loadFromCsvStream(stream, mapRowToModel, bulkInsertModels) {
// Defines how the parser behaves when it has new data (models to be inserted)
parser.on('readable', () => {
let row;
- // We can only get the next row once so we check that it isn't null at the same time that we assign it
+ // We can only get the next row once so we check that it isn't null at the same time that we assign it
while ((row = parser.read()) !== null) { // eslint-disable-line no-cond-assign
- modelsToInsert.push(mapRowToModel(row));
+ if (!rejected) {
+ modelsToInsert.push(mapRowToModel(row));
+ }
}
- if (modelsToInsert.length >= MIN_INSERT_BUFFER_SIZE) {
- insertQueuedModels();
+ if (!rejected) {
+ if (modelsToInsert.length >= MIN_INSERT_BUFFER_SIZE) {
+ insertQueuedModels();
+ }
+ }
+ });
+ parser.on('error', err => {
+ if (!rejected) {
+ resolve(t.batch(pendingInserts).then(() => Promise.reject(err)));
}
+ rejected = true;
});
// Defines what happens when the parser's input stream is finished (and thus the promise needs to be resolved)
parser.on('finish', () => {
@@ -55,10 +66,15 @@ function loadFromCsvStream(stream, mapRowToModel, bulkInsertModels) {
}
// Resolve the promise, telling pg-promise to run the batch query and complete (or rollback) the
// transaction.
- resolve(t.batch(pendingInserts));
+ resolve(t.batch(pendingInserts).then(arg => {
+ if (rejected) {
+ return Promise.reject(error);
+ } else {
+ return Promise.resolve(arg);
+ }
+ }));
});
stream.pipe(parser);
}));
}
-
module.exports = loadFromCsvStream;
diff --git a/src/server/services/updateMamacMeters.js b/src/server/services/updateMamacMeters.js
index 53535ae1f..6ee5cda08 100644
--- a/src/server/services/updateMamacMeters.js
+++ b/src/server/services/updateMamacMeters.js
@@ -8,16 +8,16 @@ const Meter = require('../models/Meter');
const readMamacData = require('./readMamacData');
const updateMeters = require('./updateMeters');
const stopDB = require('../models/database').stopDB;
-const log = require('../log');
+const { log } = require('../log');
async function updateMamacMeters() {
- log('Fetching new Mamac meter data');
+ log.info('Fetching new Mamac meter data');
try {
const allMeters = await Meter.getAll();
const metersToUpdate = allMeters.filter(m => m.enabled && m.type === Meter.type.MAMAC);
await updateMeters(readMamacData, metersToUpdate);
} catch (err) {
- log(`Error fetching Mamac meter data: ${err}`, 'error');
+ log.error(`Error fetching Mamac meter data: ${err}`, err);
} finally {
stopDB();
}
diff --git a/src/server/services/updateMeters.js b/src/server/services/updateMeters.js
index e59f45b09..7bfc55434 100644
--- a/src/server/services/updateMeters.js
+++ b/src/server/services/updateMeters.js
@@ -5,7 +5,7 @@
const _ = require('lodash');
const Reading = require('../models/Reading');
-const log = require('../log');
+const { log } = require('../log');
/**
* Uses the provided dataReader function to poll the provided meters for new readings,
@@ -16,7 +16,7 @@ const log = require('../log');
*/
async function updateAllMeters(dataReader, metersToUpdate) {
const time = new Date();
- log(`Getting meter data ${time.toISOString()}`);
+ log.info(`Getting meter data ${time.toISOString()}`);
try {
// Do all the network requests in parallel, then throw out any requests that fail after logging the errors.
const readingInsertBatches = _.filter(await Promise.all(
@@ -27,7 +27,7 @@ async function updateAllMeters(dataReader, metersToUpdate) {
if (err.options !== undefined && err.options.uri !== undefined) {
uri = err.options.uri;
}
- log(`ERROR ON REQUEST TO ${uri}, ${err.message}`, 'error');
+ log.error(`ERROR ON REQUEST TO ${uri}, ${err.message}`, err);
return null;
}))
), elem => elem !== null);
@@ -35,9 +35,9 @@ async function updateAllMeters(dataReader, metersToUpdate) {
// Flatten the batches (an array of arrays) into a single array.
const allReadingsToInsert = [].concat(...readingInsertBatches);
await Reading.insertOrUpdateAll(allReadingsToInsert);
- log('Update finished');
+ log.info('Update finished');
} catch (err) {
- log(`Error updating all meters: ${err}`, 'error');
+ log.error(`Error updating all meters: ${err}`, err);
}
}
diff --git a/src/server/sql/group/create_groups_tables.sql b/src/server/sql/group/create_groups_tables.sql
index cdd3dead6..d452e4661 100644
--- a/src/server/sql/group/create_groups_tables.sql
+++ b/src/server/sql/group/create_groups_tables.sql
@@ -136,3 +136,26 @@ CREATE VIEW groups_deep_meters AS
WHERE adm2.group_id = adm.group_id
) AS is_shadowed
FROM all_deep_meters adm;
+
+CREATE FUNCTION check_cyclic_groups()
+ RETURNS TRIGGER AS
+ $$
+ DECLARE
+ num_rows INTEGER;
+ BEGIN
+ SELECT COUNT(*) INTO num_rows
+ FROM groups_deep_children WHERE child_id = NEW.parent_id AND parent_id = NEW.child_id;
+
+ IF num_rows > 0 THEN
+ RAISE EXCEPTION 'Cyclic group detected';
+ END IF;
+ RETURN NEW;
+ END;
+ $$
+ LANGUAGE 'plpgsql';
+
+CREATE TRIGGER check_cyclic_groups_trigger
+ BEFORE INSERT OR UPDATE
+ ON groups_immediate_children
+ FOR EACH ROW
+ EXECUTE PROCEDURE check_cyclic_groups();
diff --git a/src/server/sql/preferences/create_graph_types_enum.sql b/src/server/sql/preferences/create_graph_types_enum.sql
new file mode 100644
index 000000000..682ac7765
--- /dev/null
+++ b/src/server/sql/preferences/create_graph_types_enum.sql
@@ -0,0 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+CREATE TYPE graph_type AS ENUM('line', 'bar', 'compare');
diff --git a/src/server/sql/preferences/create_preferences_table.sql b/src/server/sql/preferences/create_preferences_table.sql
new file mode 100644
index 000000000..4c2131d38
--- /dev/null
+++ b/src/server/sql/preferences/create_preferences_table.sql
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- create preferences table
+CREATE TABLE IF NOT EXISTS preferences (
+ id SERIAL PRIMARY KEY,
+ display_title VARCHAR(50) NOT NULL,
+ default_chart_to_render graph_type NOT NULL,
+ default_bar_stacking BOOLEAN NOT NULL
+);
diff --git a/src/server/sql/preferences/get_preferences.sql b/src/server/sql/preferences/get_preferences.sql
new file mode 100644
index 000000000..4ed175809
--- /dev/null
+++ b/src/server/sql/preferences/get_preferences.sql
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+SELECT display_title, default_chart_to_render, default_bar_stacking
+FROM preferences;
diff --git a/src/server/sql/preferences/insert_default_row.sql b/src/server/sql/preferences/insert_default_row.sql
new file mode 100644
index 000000000..cd1929fa1
--- /dev/null
+++ b/src/server/sql/preferences/insert_default_row.sql
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+INSERT INTO preferences (display_title, default_chart_to_render, default_bar_stacking)
+VALUES ('', 'line', FALSE);
diff --git a/src/server/sql/preferences/update_preferences.sql b/src/server/sql/preferences/update_preferences.sql
new file mode 100644
index 000000000..d85fe1c62
--- /dev/null
+++ b/src/server/sql/preferences/update_preferences.sql
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+UPDATE preferences
+SET
+ display_title = ${displayTitle},
+ default_chart_to_render = ${defaultChartToRender},
+ default_bar_stacking = ${defaultBarStacking};
diff --git a/src/server/test/db/barchartReadingsTests.js b/src/server/test/db/barchartReadingsTests.js
index 8f5c31a15..88d9554f8 100644
--- a/src/server/test/db/barchartReadingsTests.js
+++ b/src/server/test/db/barchartReadingsTests.js
@@ -10,7 +10,6 @@ chai.use(chaiAsPromised);
const expect = chai.expect;
const recreateDB = require('./common').recreateDB;
-const db = require('../../models/database').db;
const Meter = require('../../models/Meter');
const Reading = require('../../models/Reading');
diff --git a/src/server/test/db/common.js b/src/server/test/db/common.js
index 517885613..264d9b355 100644
--- a/src/server/test/db/common.js
+++ b/src/server/test/db/common.js
@@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const config = require('../../config');
+const { log, LogLevel } = require('../../log');
// This swaps us to the test database for running test.
// TODO: Fix up configuration between different environments. Maybe use the config npm package.
@@ -15,6 +16,10 @@ config.database = {
port: process.env.OED_DB_TEST_PORT || process.env.OED_DB_PORT
};
+// Disable logging during tests.
+// TODO: Move logging disabling to a better place.
+log.level = LogLevel.SILENT;
+
const { db, createSchema } = require('../../models/database');
async function recreateDB() {
diff --git a/src/server/test/db/compressedReadingsTests.js b/src/server/test/db/compressedReadingsTests.js
index 147f220d3..9d54620b1 100644
--- a/src/server/test/db/compressedReadingsTests.js
+++ b/src/server/test/db/compressedReadingsTests.js
@@ -10,7 +10,6 @@ chai.use(chaiAsPromised);
const expect = chai.expect;
const recreateDB = require('./common').recreateDB;
-const db = require('../../models/database').db;
const Group = require('../../models/Group');
const Meter = require('../../models/Meter');
const Reading = require('../../models/Reading');
diff --git a/src/server/test/db/cyclicGroupTests.js b/src/server/test/db/cyclicGroupTests.js
new file mode 100644
index 000000000..eea4b81ac
--- /dev/null
+++ b/src/server/test/db/cyclicGroupTests.js
@@ -0,0 +1,50 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+
+const recreateDB = require('./common').recreateDB;
+const Group = require('../../models/Group');
+const mocha = require('mocha');
+
+const db = require('../../models/database').db;
+
+
+mocha.describe('Group Cycles', async () => {
+ mocha.beforeEach(recreateDB);
+ let group1;
+ let group2;
+ let group3;
+ mocha.beforeEach(async () => {
+ await new Group(undefined, 'group1').insert();
+ await new Group(undefined, 'group2').insert();
+ await new Group(undefined, 'group3').insert();
+ group1 = await Group.getByName('group1');
+ group2 = await Group.getByName('group2');
+ group3 = await Group.getByName('group3');
+ });
+
+ mocha.it('Cannot save immediate cycles', async () => {
+ await group1.adoptGroup(group2.id);
+ await expect(group2.adoptGroup(group1.id), 'cyclic group insert was not rejected').to.eventually.be.rejected;
+ });
+
+ mocha.it('Cannot save deeply nested cycles', async () => {
+ await group1.adoptGroup(group2.id);
+ await group2.adoptGroup(group3.id);
+ await expect(group3.adoptGroup(group1.id), 'cyclic group insert was not rejected').to.eventually.be.rejected;
+ });
+
+ mocha.it('Cannot run update queries that create cycles', async () => {
+ await group1.adoptGroup(group2.id);
+ await group2.adoptGroup(group3.id);
+ await expect(db.none(`UPDATE groups_immediate_children set child_id = ${group1.id} WHERE parent_id = ${group2.id}`)).to.eventually.be.rejected;
+ });
+});
diff --git a/src/server/test/db/data/mamac-invalid.csv b/src/server/test/db/data/mamac-invalid.csv
new file mode 100644
index 000000000..c32eb796b
--- /dev/null
+++ b/src/server/test/db/data/mamac-invalid.csv
@@ -0,0 +1,34 @@
+0,7/30/16 10:00
+0,7/30/16 11:00
+1,7/30/16 12:00
+0,7/30/16 13:00
+0,7/30/16 14:00
+0,7/30/16 15:00
+1,7/30/16 16:00
+0,7/30/16 17:00
+0,7/30/16 18:00
+0,7/30/16 19:00
+1,7/30/16 20:00
+0,7/30/16 21:00
+0,7/30/16 22:00
+0,7/30/16 23:00
+1,7/31/16 0:00
+0,7/31/16 1:00
+0,7/31/16 2:00
+0,7/31/16 3:00
+1,7/31/16 4:00
+0,7/31/16 5:00
+0,7/31/16 6:00
+0,7/31/16 7:00
+1,7/31/16 8:00
+0,7/31/16 9:00
+0,7/31/16 10:00
+0,7/31/16 11:00
+1,7/31/16 12:00
+0,7/31/16 13:00
+0,7/31/16 14:00
+0,7/31/16 15:00
+1,7/31/16 16:00
+0,7/31/16 17:00
+0,7/31/16 18:00
+0
diff --git a/src/server/test/db/data/mamac-log.csv b/src/server/test/db/data/mamac-log.csv
new file mode 100644
index 000000000..0198d862f
--- /dev/null
+++ b/src/server/test/db/data/mamac-log.csv
@@ -0,0 +1,20 @@
+0,7/30/16 10:00
+0,7/30/16 11:00
+1,7/30/16 12:00
+0,7/30/16 13:00
+0,7/30/16 14:00
+0,7/30/16 15:00
+1,7/30/16 16:00
+0,7/30/16 17:00
+0,7/30/16 18:00
+0,7/30/16 19:00
+1,7/30/16 20:00
+0,7/30/16 21:00
+0,7/30/16 22:00
+0,7/30/16 23:00
+1,7/31/16 0:00
+0,7/31/16 1:00
+0,7/31/16 2:00
+0,7/31/16 3:00
+1,7/31/16 4:00
+0,7/31/16 5:00
diff --git a/src/server/test/db/loadFromCsvStreamTests.js b/src/server/test/db/loadFromCsvStreamTests.js
new file mode 100644
index 000000000..ff97d24ec
--- /dev/null
+++ b/src/server/test/db/loadFromCsvStreamTests.js
@@ -0,0 +1,96 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+const moment = require('moment');
+const path = require('path');
+const Reading = require('../../models/Reading');
+const streamBuffers = require('stream-buffers');
+const fs = require('fs');
+const promisify = require('es6-promisify');
+
+chai.use(chaiAsPromised);
+const expect = chai.expect;
+const recreateDB = require('./common').recreateDB;
+const db = require('../../models/database').db;
+const Meter = require('../../models/Meter');
+const loadFromCsvStream = require('../../services/loadFromCsvStream');
+
+const mocha = require('mocha');
+
+mocha.describe('Read mamc log from a file: ', () => {
+ mocha.beforeEach(recreateDB);
+ let meter;
+ mocha.beforeEach(async () => {
+ await new Meter(undefined, 'Meter', null, false, Meter.type.MAMAC).insert();
+ meter = await Meter.getByName('Meter');
+ });
+
+ mocha.it('loads the correct number of rows from a file', async () => {
+ const testFilePath = path.join(__dirname, 'data', 'mamac-log.csv');
+ const readFile = promisify(fs.readFile);
+ const buffer = await readFile(testFilePath);
+ const myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
+ frequency: 10,
+ chunkSize: 2048
+ });
+ // open file.
+ myReadableStreamBuffer.put(buffer);
+ myReadableStreamBuffer.stop();
+ await loadFromCsvStream(myReadableStreamBuffer, row => {
+ const readRate = parseInt(row[0]);
+ const endTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm');
+ const startTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm').subtract(60, 'minutes');
+ return new Reading(meter.id, readRate, startTimestamp, endTimestamp);
+ }, (readings, tx) => Reading.insertOrUpdateAll(readings, tx));
+ const { count } = await db.one('SELECT COUNT(*) as count FROM readings');
+ expect(parseInt(count)).to.equal(20);
+ });
+
+ mocha.it('errors correctly on an invalid file', async () => {
+ const testFilePath = path.join(__dirname, 'data', 'mamac-invalid.csv');
+ const readFile = promisify(fs.readFile);
+ const buffer = await readFile(testFilePath);
+ const myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
+ frequency: 10,
+ chunkSize: 2048
+ });
+ myReadableStreamBuffer.put(buffer);
+ myReadableStreamBuffer.stop();
+ return expect(
+ loadFromCsvStream(myReadableStreamBuffer, row => {
+ const readRate = parseInt(row[0]);
+ const endTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm');
+ const startTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm').subtract(60, 'minutes');
+ return new Reading(meter.id, readRate, startTimestamp, endTimestamp);
+ }, (readings, tx) => Reading.insertOrUpdateAll(readings, tx))
+ ).to.eventually.be.rejected;
+ });
+
+ mocha.it('rolls back correctly when it rejects', async () => {
+ const testFilePath = path.join(__dirname, 'data', 'mamac-invalid.csv');
+ const readFile = promisify(fs.readFile);
+ const buffer = await readFile(testFilePath);
+ const myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
+ frequency: 10,
+ chunkSize: 2048
+ });
+ myReadableStreamBuffer.put(buffer);
+ myReadableStreamBuffer.stop();
+ try {
+ await loadFromCsvStream(myReadableStreamBuffer, row => {
+ const readRate = parseInt(row[0]);
+ const endTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm');
+ const startTimestamp = moment(row[1], 'MM/DD/YYYY HH:mm').subtract(60, 'minutes');
+ return new Reading(meter.id, readRate, startTimestamp, endTimestamp);
+ }, (readings, tx) => Reading.insertOrUpdateAll(readings, tx));
+ } catch (e) {
+ const { count } = await db.one('SELECT COUNT(*) as count FROM readings');
+ expect(parseInt(count)).to.equal(0);
+ }
+ });
+});
diff --git a/src/server/test/db/metasysDuplicateandCumulativeTests.js b/src/server/test/db/metasysDuplicateandCumulativeTests.js
index 48ade77b8..6dc6bfe91 100644
--- a/src/server/test/db/metasysDuplicateandCumulativeTests.js
+++ b/src/server/test/db/metasysDuplicateandCumulativeTests.js
@@ -5,7 +5,6 @@
*/
const chai = require('chai');
const chaiAsPromised = require('chai-as-promised');
-const moment = require('moment');
const path = require('path');
chai.use(chaiAsPromised);
@@ -17,28 +16,26 @@ const Meter = require('../../models/Meter');
const readMetasysData = require('../../services/readMetasysData');
const mocha = require('mocha');
- mocha.describe('Insert Metasys readings from a file', () => {
- mocha.beforeEach(recreateDB);
- let meter;
- mocha.beforeEach(async () => {
- await new Meter(undefined, 'metasys-duplicate', null, false, Meter.type.METASYS).insert();
- meter = await Meter.getByName('metasys-duplicate');
- });
- mocha.it('handles duplicate readings', async () => {
- const testFilePath = path.join(__dirname, 'data', 'metasys-duplicate.csv');
- await readMetasysData(testFilePath, 60, 2, false);
- const {count} = await db.one('SELECT COUNT(*) as count FROM readings');
- expect(parseInt(count)).to.equal(37);
- });
-
- mocha.it('handles cumulative readings',async () => {
- const testFilePath = path.join(__dirname, 'data', 'metasys-duplicate.csv');
- await readMetasysData(testFilePath, 60, 2, true);
- const {reading} = await db.one('SELECT reading FROM readings LIMIT 1');
- expect(parseInt(reading)).to.equal(280);
- });
+mocha.describe('Insert Metasys readings from a file', () => {
+ mocha.beforeEach(recreateDB);
+ mocha.beforeEach(async () => {
+ await new Meter(undefined, 'metasys-duplicate', null, false, Meter.type.METASYS).insert();
+ // meter = await Meter.getByName('metasys-duplicate');
});
+ mocha.it('handles duplicate readings', async () => {
+ const testFilePath = path.join(__dirname, 'data', 'metasys-duplicate.csv');
+ await readMetasysData(testFilePath, 60, 2, false);
+ const { count } = await db.one('SELECT COUNT(*) as count FROM readings');
+ expect(parseInt(count)).to.equal(37);
+ });
+ mocha.it('handles cumulative readings', async () => {
+ const testFilePath = path.join(__dirname, 'data', 'metasys-duplicate.csv');
+ await readMetasysData(testFilePath, 60, 2, true);
+ const { reading } = await db.one('SELECT reading FROM readings LIMIT 1');
+ expect(parseInt(reading)).to.equal(280);
+ });
+});
diff --git a/src/server/test/db/metasysInvalidTests.js b/src/server/test/db/metasysInvalidTests.js
index 8fa35b0fa..6858995be 100644
--- a/src/server/test/db/metasysInvalidTests.js
+++ b/src/server/test/db/metasysInvalidTests.js
@@ -6,7 +6,6 @@
const chai = require('chai');
const chaiAsPromised = require('chai-as-promised');
-const moment = require('moment');
const path = require('path');
chai.use(chaiAsPromised);
@@ -21,10 +20,8 @@ const mocha = require('mocha');
mocha.describe('Insert Metasys readings from a file', () => {
mocha.beforeEach(recreateDB);
- let meter;
mocha.beforeEach(async () => {
await new Meter(undefined, 'metasys-invalid', null, false, Meter.type.METASYS).insert();
- meter = await Meter.getByName('metasys-invalid');
});
mocha.it('errors correctly on an invalid file', () => {
@@ -37,7 +34,7 @@ mocha.describe('Insert Metasys readings from a file', () => {
try {
await readMetasysData(testFilePath, 30, 1, false);
} catch (e) {
- const {count} = await db.one('SELECT COUNT(*) as count FROM readings');
+ const { count } = await db.one('SELECT COUNT(*) as count FROM readings');
expect(parseInt(count)).to.equal(0);
}
});
diff --git a/src/server/test/db/metasysValidTests.js b/src/server/test/db/metasysValidTests.js
index 037087917..dfd309add 100644
--- a/src/server/test/db/metasysValidTests.js
+++ b/src/server/test/db/metasysValidTests.js
@@ -6,7 +6,6 @@
const chai = require('chai');
const chaiAsPromised = require('chai-as-promised');
-const moment = require('moment');
const path = require('path');
chai.use(chaiAsPromised);
@@ -22,16 +21,14 @@ const mocha = require('mocha');
mocha.describe('Insert Metasys readings from a file', () => {
mocha.beforeEach(recreateDB);
- let meter;
mocha.beforeEach(async () => {
await new Meter(undefined, 'metasys-valid', null, false, Meter.type.METASYS).insert();
- meter = await Meter.getByName('metasys-valid');
});
mocha.it('loads the correct number of rows from a file', async () => {
const testFilePath = path.join(__dirname, 'data', 'metasys-valid.csv');
await readMetasysData(testFilePath, 30, 1, true);
- const {count} = await db.one('SELECT COUNT(*) as count FROM readings');
+ const { count } = await db.one('SELECT COUNT(*) as count FROM readings');
expect(parseInt(count)).to.equal(125);
});
});
diff --git a/src/server/test/db/momentPatchTests.js b/src/server/test/db/momentPatchTests.js
index d035d7773..246d40df8 100644
--- a/src/server/test/db/momentPatchTests.js
+++ b/src/server/test/db/momentPatchTests.js
@@ -21,13 +21,13 @@ mocha.describe('MomentJS patching', () => {
mocha.it('patches moment durations', async () => {
const result = await db.one('SELECT pg_typeof(${interval})', { interval: moment.duration(1, 'days') });
- const type = result['pg_typeof'];
+ const type = result.pg_typeof;
expect(type).to.equal('interval');
});
mocha.it('patches arrays of moment durations', async () => {
const result = await db.one('SELECT pg_typeof(${intervalArr})', { intervalArr: [moment.duration(1, 'days'), moment.duration(2, 'days')] });
- const type = result['pg_typeof'];
+ const type = result.pg_typeof;
expect(type).to.equal('interval[]');
});
diff --git a/src/server/test/db/readingTests.js b/src/server/test/db/readingTests.js
index ac7c187dd..c7cd5c353 100644
--- a/src/server/test/db/readingTests.js
+++ b/src/server/test/db/readingTests.js
@@ -10,7 +10,6 @@ chai.use(chaiAsPromised);
const expect = chai.expect;
const recreateDB = require('./common').recreateDB;
-const db = require('../../models/database').db;
const Meter = require('../../models/Meter');
const Reading = require('../../models/Reading');
diff --git a/src/server/version.js b/src/server/version.js
index a82140c9f..5d999e1e9 100644
--- a/src/server/version.js
+++ b/src/server/version.js
@@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const pkgJson = require('../../package.json');
-const log = require('./log');
+const { log } = require('./log');
/**
* Creates a new OEDVersion object, which contains a major, minor, and patch release level.
@@ -12,7 +12,7 @@ const log = require('./log');
function OEDVersion() {
const versionParts = pkgJson.version.split('.');
if (versionParts.length !== 3) {
- log(`package.json version string "${pkgJson.version}" is not in semver x.y.z format`, 'error', true);
+ log.error(`package.json version string "${pkgJson.version}" is not in semver x.y.z format`);
}
this.major = versionParts[0];
this.minor = versionParts[1];