-
+
+
+
+
-
diff --git a/mdot/mdot_server/mdot_server/lib/mdot/meeting.js b/mdot/mdot_server/mdot_server/lib/mdot/meeting.js
new file mode 100644
index 0000000..3a3dc23
--- /dev/null
+++ b/mdot/mdot_server/mdot_server/lib/mdot/meeting.js
@@ -0,0 +1,89 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-08-12
+ * Time: 13:41
+ *
+ */
+'use strict';
+var logger = require('log4js').getLogger();
+
+var db = require('../server/db-connector').dbConnection;
+
+var dbMeeting = require('../server/db-meeting')(db);
+
+module.exports = function(app) {
+ var express = require('express');
+ var mdotRouter = express.Router();
+
+ mdotRouter.post('/', function(req, res) {
+
+
+ var body = req.body;
+ var data = {};
+ logger.debug('body', body);
+ if (!Object.hasOwnProperty.call(body, 'roomId') ||
+ !Object.hasOwnProperty.call(body, 'start') ||
+ !Object.hasOwnProperty.call(body, 'end') ||
+ !Object.hasOwnProperty.call(body, 'occupancy')){
+ logger.error('Meeting','Missing required parameter');
+ res.status(400).send({
+ status: 'error',
+ error: 'missing required parameter'
+ });
+ return;
+ } else {
+ data.locationid = req.body.roomId;
+ data.count = req.body.occupancy;
+ data.start = req.body.start;
+ data.end = req.body.end;
+
+ dbMeeting.addNewMeeting(data)
+ .then((d) => {
+ res.json({d: d});
+ })
+ .catch((e) => {
+ logger.error(e);
+ res.status(500).json({});
+ });
+ }
+
+
+ });
+
+
+ mdotRouter.get('/:id', function(req, res) {
+ console.log(req.headers);
+
+ var data = {};
+ logger.debug('track-GetData');
+
+ if (!req.params.id) {
+ logger.error('Track','Missing required parameter');
+ res.status(400).send({
+ status: 'error',
+ error: 'missing required parameter'
+ });
+ return;
+ }
+
+ if (req.params.hasOwnProperty('id')) {
+ data.locationid = req.params.id;
+
+ dbMeeting.doGet(data)
+ .then((d) => {
+ res.json({tracks:d});
+ })
+ .catch((e) => {
+ logger.error(e);
+ res.status(500).json({});
+ });
+
+ }
+
+ });
+
+
+ app.use('/apiv2/meeting/', mdotRouter);
+};
+
diff --git a/mdot/mdot_server/mdot_server/lib/mdot/track.js b/mdot/mdot_server/mdot_server/lib/mdot/track.js
index 8d7e28f..f644bc6 100644
--- a/mdot/mdot_server/mdot_server/lib/mdot/track.js
+++ b/mdot/mdot_server/mdot_server/lib/mdot/track.js
@@ -7,7 +7,6 @@
*/
'use strict';
var logger = require('log4js').getLogger();
-var mdot = require('./mdot.js');
var db = require('../server/db-connector').dbConnection;
diff --git a/mdot/mdot_server/mdot_server/lib/server/db-meeting.js b/mdot/mdot_server/mdot_server/lib/server/db-meeting.js
new file mode 100644
index 0000000..e228cd8
--- /dev/null
+++ b/mdot/mdot_server/mdot_server/lib/server/db-meeting.js
@@ -0,0 +1,53 @@
+'use strict';
+var logger = require('log4js').getLogger();
+
+module.exports = function(db) {
+ var module = {};
+
+ module.sqlInsertMeeting = function(data) {
+ let _data = data;
+
+ logger.debug('sqlInsertMeeting', _data.locationid, _data.timestamp);
+ return new Promise(function(resolve, reject) {
+ db.none('INSERT into meeting(locationid, logged, count, start, "end") Values( ${locationid}, ${timestamp}, ${count}, ${start}, ${end})', _data)
+ .then(()=> {
+ return resolve('ok');
+ })
+ .catch((err)=> {
+ return reject(err);
+ });
+
+ });
+
+ };
+
+
+ module.addNewMeeting = function(data) {
+ logger.debug('addNewMeeting');
+ var self = this;
+ return new Promise((resolve, reject) => {
+
+ let _data = {};
+ _data.timestamp = new Date();
+ _data.locationid = data.locationid;
+ _data.count = data.count;
+ _data.start = new Date(data.start);
+ _data.end = new Date(data.end);
+
+ console.log('_data', _data);
+
+ self.sqlInsertMeeting(_data)
+ .then((d)=> {
+ logger.debug('Postgres returns', d);
+ return resolve({reply: 'track inserted'});
+ })
+ .catch((err)=> {
+ return reject(err);
+ });
+ });
+ };
+
+
+ return module;
+};
+
diff --git a/mdot/mdot_server/mdot_server/server/create_meeting.sql b/mdot/mdot_server/mdot_server/server/create_meeting.sql
new file mode 100644
index 0000000..da8181f
--- /dev/null
+++ b/mdot/mdot_server/mdot_server/server/create_meeting.sql
@@ -0,0 +1,33 @@
+-- Sequence: public.meeting_id_seq
+
+-- DROP SEQUENCE public.meeting_id_seq;
+
+CREATE SEQUENCE public.meeting_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.meeting_id_seq
+ OWNER TO postgres;
+
+
+
+-- Table: public.meeting
+
+-- DROP TABLE public.meeting;
+
+CREATE TABLE public.meeting
+(
+ id integer NOT NULL DEFAULT nextval('meeting_id_seq'::regclass),
+ locationid integer,
+ logged timestamp with time zone,
+ count smallint,
+ start timestamp with time zone,
+ "end" timestamp with time zone
+)
+WITH (
+ OIDS=FALSE
+);
+ALTER TABLE public.meeting
+ OWNER TO postgres;
diff --git a/mdot/mdot_server/mdot_server/server/restore_meeting.sql b/mdot/mdot_server/mdot_server/server/restore_meeting.sql
new file mode 100644
index 0000000..41d83c6
--- /dev/null
+++ b/mdot/mdot_server/mdot_server/server/restore_meeting.sql
@@ -0,0 +1,114 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 9.5.1
+-- Dumped by pg_dump version 9.5.1
+
+-- Started on 2016-08-18 15:46:39 BST
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- TOC entry 188 (class 1259 OID 63387)
+-- Name: meeting; Type: TABLE; Schema: public; Owner: postgres
+--
+
+DROP SEQUENCE public.meeting_id_seq;
+DROP TABLE public.meeting;
+
+
+CREATE TABLE meeting (
+ id integer NOT NULL,
+ locationid integer,
+ logged timestamp with time zone,
+ count smallint,
+ start timestamp with time zone,
+ "end" timestamp with time zone
+);
+
+
+ALTER TABLE meeting OWNER TO postgres;
+
+--
+-- TOC entry 187 (class 1259 OID 63385)
+-- Name: meeting_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE meeting_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+ALTER TABLE meeting_id_seq OWNER TO postgres;
+
+--
+-- TOC entry 2387 (class 0 OID 0)
+-- Dependencies: 187
+-- Name: meeting_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
+--
+
+ALTER SEQUENCE meeting_id_seq OWNED BY meeting.id;
+
+
+--
+-- TOC entry 2266 (class 2604 OID 63390)
+-- Name: id; Type: DEFAULT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY meeting ALTER COLUMN id SET DEFAULT nextval('meeting_id_seq'::regclass);
+
+
+--
+-- TOC entry 2382 (class 0 OID 63387)
+-- Dependencies: 188
+-- Data for Name: meeting; Type: TABLE DATA; Schema: public; Owner: postgres
+--
+
+COPY meeting (id, locationid, logged, count, start, "end") FROM stdin;
+3 1 2016-08-18 15:39:26+01 4 2016-08-04 13:00:00+01 2016-08-04 13:45:00+01
+4 1 2016-08-18 15:39:51+01 11 2014-08-04 14:00:00+01 2014-08-04 14:45:00+01
+5 1 2016-08-18 15:40:29+01 2 2016-08-04 14:45:00+01 2016-08-04 14:55:00+01
+6 1 2016-08-18 15:40:55+01 3 2016-08-04 15:04:00+01 2016-08-04 16:06:00+01
+7 1 2016-08-18 15:41:25+01 2 2016-08-05 11:05:00+01 2016-08-05 12:15:00+01
+8 1 2016-08-18 15:41:47+01 1 2016-08-05 14:10:00+01 2016-08-05 14:25:00+01
+9 1 2016-08-18 15:42:08+01 4 2016-08-05 15:00:00+01 2016-08-05 15:30:00+01
+10 1 2016-08-18 15:42:37+01 4 2016-08-05 15:30:00+01 2016-08-05 16:23:00+01
+11 1 2016-08-18 15:43:02+01 8 2016-08-08 11:00:00+01 2016-08-08 12:12:00+01
+12 1 2016-08-18 15:43:29+01 7 2016-08-08 15:37:00+01 2016-08-08 16:50:00+01
+13 1 2016-08-18 15:44:10+01 5 2016-08-09 10:02:00+01 2016-08-09 10:15:00+01
+14 1 2016-08-18 15:44:34+01 6 2016-08-09 10:15:00+01 2016-08-09 12:05:00+01
+15 1 2016-08-18 15:44:52+01 1 2016-08-09 13:05:00+01 2016-08-09 13:10:00+01
+\.
+
+
+--
+-- TOC entry 2388 (class 0 OID 0)
+-- Dependencies: 187
+-- Name: meeting_id_seq; Type: SEQUENCE SET; Schema: public; Owner: postgres
+--
+
+SELECT pg_catalog.setval('meeting_id_seq', 15, true);
+
+
+-- Completed on 2016-08-18 15:46:39 BST
+
+--
+-- PostgreSQL database dump complete
+--
+