render power data in table format

server/models/energy_datum.js

@@ -1,4 +1,6 @@
 import DB from "./../config/database";
+import extend from 'extend';
+import ApiHelper from './../helpers/api_helper';
 
 const NAME = 'EnergyDatum';
 
@@ -20,7 +22,12 @@ var EnergyDatum = DB.sequelize.define(NAME, {
   underscored: true,
   tableName: "energy_data",
   instanceMethods: {
-
+    exposeToApi: ()=>{
+      var energy_datum = this,
+        values = this.dataValues;
+      values.energy_datum = energy_datum.day.getTime() / 1000;
+      return values;
+    }
   },
   classMethods: {
     set: ()=>{
@@ -28,6 +35,18 @@ var EnergyDatum = DB.sequelize.define(NAME, {
     },
     associate: ()=>{
       EnergyDatum.belongsTo(DB.House);
+    },
+    exposeForHouseAtDates: (house_id, dates)=>{
+      var params = {house_id: house_id};
+      extend(params, ApiHelper.datesParamToSequelize(dates, 'day'));
+      return EnergyDatum.findAll({
+        where: params,
+        attributes: ['id', 'production', 'consumption', 'day']
+      }).then((energy_data)=>{
+        return energy_data.map((energy_datum)=>{
+          return energy_datum.exposeToApi();
+        });
+      });
     }
   }
 });

server/models/house.js

@@ -44,8 +44,6 @@ var House = DB.sequelize.define(NAME, {
           power_data.forEach((power_datum)=>{
             var day = house.timeToDateString(power_datum.time),
               energy_datum = energy_data.get(day) || {production: 0, consumption: 0, day: day, house_id: house.id};
-            console.log(power_datum.time)
-            console.log(day)
             energy_datum.production += power_datum.production;
             energy_datum.consumption += power_datum.consumption;
             energy_data.set(day, energy_datum);
@@ -62,10 +60,10 @@ var House = DB.sequelize.define(NAME, {
     associate: ()=>{
       House.hasMany(DB.PowerDatum, {as: 'PowerData'});
     },
-    getPowerDataByTime: (start_date, end_date)=>{
+    getPowerDataByTime: (dates)=>{
       var params = {
         where: {time: {}},
-        attributes: ['time', 'consumption', 'production']
+        attributes: ['id', 'time', 'consumption', 'production']
       };
       if (start_date) params.where.time.$gt = moment.utc(start_date).toDate();
       if (end_date) params.where.time.$lt = moment.utc(end_date).toDate();

server/models/power_datum.js

@@ -1,4 +1,6 @@
 import DB from "./../config/database";
+import extend from 'extend';
+import ApiHelper from './../helpers/api_helper';
 
 const NAME = 'PowerDatum';
 
@@ -20,9 +22,28 @@ var PowerDatum = DB.sequelize.define(NAME, {
   underscored: true,
   tableName: "power_data",
   instanceMethods: {
-
+    exposeToApi: function(){
+      var power_datum = this,
+        data = power_datum.dataValues;
+      data.consumption = data.consumption * 4; // convert Wh / 15 minutes, to W
+      data.production = data.production * 4; // convert Wh / 15 minutes, to W
+      return data;
+    }
   },
   classMethods: {
+    exposeForHouseAtDates: (house_id, dates)=>{
+      var params = {house_id: house_id};
+      params = extend(params, ApiHelper.datesParamToSequelize(dates, 'time'));
+      console.log(params);
+      return PowerDatum.findAll({
+        where: params,
+        attributes: ['id', 'production', 'consumption', 'time']
+      }).then((power_data)=>{
+        return power_data.map((power_datum)=>{
+          return power_datum.exposeToApi();
+        });
+      });
+    },
     set: ()=>{
       PowerDatum.associate();
     },