Merge pull request #3 from CatalystCode/extract-schema

Extract database schema

Author: c-w

README.md

@@ -19,13 +19,14 @@ You will be welcomed with the postgres prompt. Now, create the geofeatures datab
 ```
 CREATE DATABASE geofeatures;
 \c geofeatures;
+
+CREATE USER frontend PASSWORD your_password_here;
 ```
 
-There enter the SQL statements at the top of these two files (in that order):
+Next, load the database schema:
 
 ```
-services/features.js
-services/visits.js
+psql -d geofeatures < schema.sql
 ```
 
 Make sure the frontend user has access to the geofeatures database:
@@ -37,7 +38,7 @@ GRANT ALL PRIVILEGES ON DATABASE geofeatures TO frontend;
 Then, make sure the environment variable for the newly-created user is set:
 
 ```
-export FEATURES_CONNECTION_STRING='postgres://frontend:[euro4sure]@127.0.0.1/geofeatures'
+export FEATURES_CONNECTION_STRING='postgres://frontend:your_password_here@127.0.0.1/geofeatures'
 export PORT=3035
 ```
 

schema.sql

@@ -0,0 +1,52 @@
+CREATE EXTENSION postgis;
+
+------------------------------------------------------------------------------
+-- for services/features.js
+------------------------------------------------------------------------------
+
+CREATE TABLE features
+(
+  id                character varying(64)        NOT NULL,
+
+  name              character varying(128)       NOT NULL,
+  layer             character varying(32)        NOT NULL,
+
+  properties        jsonb                        NOT NULL,
+
+  hull              geometry                     NOT NULL,
+
+  created_at        timestamp                    NOT NULL,
+  updated_at        timestamp                    NOT NULL,
+
+  CONSTRAINT nodes_pkey PRIMARY KEY (id),
+
+  CONSTRAINT enforce_srid_hull CHECK (st_srid(hull) = 4326)
+);
+
+CREATE INDEX features_hull_index ON features USING gist (hull);
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON features TO frontend;
+
+------------------------------------------------------------------------------
+-- for services/visits.js
+------------------------------------------------------------------------------
+
+CREATE TABLE visits
+(
+  id                    uuid                         NOT NULL,
+  user_id               character varying(128)       NOT NULL,
+  feature_id            character varying(64)        NOT NULL,
+
+  start                 bigint                       NOT NULL,
+  finish                bigint                       NOT NULL,
+
+  created_at            timestamp                    NOT NULL,
+  updated_at            timestamp                    NOT NULL,
+
+  CONSTRAINT visits_pkey PRIMARY KEY (id)
+);
+
+GRANT SELECT, UPDATE, INSERT, DELETE ON visits TO frontend;
+
+CREATE INDEX visits_start_index ON visits (start);
+CREATE INDEX visits_userid_index ON visits (user_id);

services/features.js

@@ -10,42 +10,6 @@ const async = require('async'),
       ServiceError = common.utils.ServiceError,
       turf = require('turf'),
       url = require('url');
-/*
-
-kubectl run postgis-shell -i --tty --image=timfpark/postgis:9.6 -- bash
-
-CREATE USER frontend PASSWORD '[euro4sure]';
-
-CREATE EXTENSION postgis;
-
-CREATE TABLE features
-(
-  id                character varying(64)        NOT NULL,
-
-  name              character varying(128)       NOT NULL,
-  layer             character varying(32)        NOT NULL,
-
-  properties        jsonb                        NOT NULL,
-
-  hull              geometry                     NOT NULL,
-
-  created_at        timestamp                    NOT NULL,
-  updated_at        timestamp                    NOT NULL,
-
-  CONSTRAINT nodes_pkey PRIMARY KEY (id),
-
-  CONSTRAINT enforce_srid_hull CHECK (st_srid(hull) = 4326)
-);
-
-CREATE INDEX features_hull_index
-  ON features
-  USING gist
-  (hull);
-
-
-GRANT SELECT, UPDATE, INSERT, DELETE ON features TO frontend;
-
-*/
 
 let featureDatabasePool;
 

services/visits.js

@@ -14,60 +14,6 @@ const async = require('async'),
 let featureTablePool;
 let redlock;
 
-/*
-
-CREATE EXTENSION postgis;
-
-CREATE TABLE visits
-(
-  id                    uuid                         NOT NULL,
-  user_id               character varying(128)       NOT NULL,
-  feature_id            character varying(64)        NOT NULL,
-
-  start                 bigint                       NOT NULL,
-  finish                bigint                       NOT NULL,
-
-  created_at            timestamp                    NOT NULL,
-  updated_at            timestamp                    NOT NULL,
-
-  CONSTRAINT visits_pkey PRIMARY KEY (id)
-);
-
-GRANT SELECT, UPDATE, INSERT, DELETE ON visits TO frontend;
-
-CREATE INDEX visits_start_index
-  ON visits
-  (start);
-
-CREATE INDEX visits_userid_index
-  ON visits
-  (user_id);
-
-SELECT v.feature_id, count(v.feature_id), sum(v.finish-v.start) AS duration, f.name
-FROM visits as v
-JOIN features as f on f.id=v.feature_id
-WHERE v.user_id='10152875766888406'
-GROUP BY v.feature_id, f.name
-ORDER BY duration DESC;
-
-SELECT v.feature_id, f.name, v.start, v.finish, (v.finish-v.start)/1000 as duration
-FROM visits as v
-JOIN features as f on f.id=v.feature_id
-WHERE v.user_id='10152875766888406'
-ORDER BY v.start;
-
-SELECT v.feature_id,
-       (v.finish-v.start)/(1000*3600.0) AS duration,
-       to_timestamp(v.start/1000.0) AT TIME ZONE 'PST' AS start,
-       to_timestamp(v.finish/1000.0) AT TIME ZONE 'PST' AS finish,
-       f.name
-FROM visits as v
-JOIN features as vi serf on f.id=v.feature_id
-WHERE v.user_id='10152875766888406' and v.feature_id='wof-102191581'
-ORDER BY duration DESC;
-
-*/
-
 function rowToVisit(row) {
     if (!row) return;