resync with master

backend.py

@@ -1,29 +1,53 @@
 # backend.py
 # openeventdatabase
 
+import os
 import falcon
 import psycopg2
 import uuid
 import json
+import codecs
+
+def db_connect():
+    db_host = os.getenv("DB_HOST","localhost")
+    db_password = os.getenv("POSTGRES_PASSWORD","")
+    db = psycopg2.connect(dbname="oedb",host=db_host,password=db_password)
+    return db
+
+def standard_headers(resp):
+    resp.set_header('X-Powered-By', 'OpenEventDatabase')
+    resp.set_header('Access-Control-Allow-Origin', '*')
+    resp.set_header('Access-Control-Allow-Headers', 'X-Requested-With')
 
 class StatsResource(object):
     def on_get(self, req, resp):
-        db = psycopg2.connect("dbname=oedb")
+        db = db_connect()
         cur = db.cursor()
         cur.execute("SELECT count(*) as events_count, max(createdate) as last_created, max(lastupdate) as last_updated from events;")
         stat = cur.fetchone()
         cur.close()
         db.close()
 
+        standard_headers(resp)
         resp.body = """{"events_count": %s, "last_created": "%s", "last_updated": "%s"}""" % (stat[0], stat[1],stat[2])
-        resp.set_header('X-Powered-By', 'OpenEventDatabase')
-        resp.set_header('Access-Control-Allow-Origin', '*')
-        resp.set_header('Access-Control-Allow-Headers', 'X-Requested-With')
+        resp.status = falcon.HTTP_200
+
+class EventsResource(object):
+    def on_get(self,req,resp):
+        db = db_connect()
+        cur = db.cursor()
+        # get event geojson Feature
+        cur.execute("""
+SELECT format('{"type":"Feature", "id": "'|| events_id::text ||'", "properties": '|| events_tags::text ||', "geometry":'|| st_asgeojson(geom)) ||' }'
+FROM events
+JOIN geo ON (hash=events_geo)""");
+        standard_headers(resp)
+        resp.body = '{"type": "FeatureCollection","features": ['+','.join([x[0] for x in cur.fetchall()])+']}'
         resp.status = falcon.HTTP_200
 
 class EventResource(object):
     def on_get(self, req, resp, id = None):
-        db = psycopg2.connect("dbname=oedb")
+        db = db_connect()
         cur = db.cursor()
         if id is None:
             cur.execute("""
@@ -44,9 +68,7 @@ JOIN geo ON (hash=events_geo)
 WHERE events_id=%s;""", (id,))
 
         e = cur.fetchone()
-        resp.set_header('X-Powered-By', 'OpenEventDatabase')
-        resp.set_header('Access-Control-Allow-Origin', '*')
-        resp.set_header('Access-Control-Allow-Headers', 'X-Requested-With')
+        standard_headers(resp)
         if e is not None:
             resp.body = e[0]
             resp.status = falcon.HTTP_200
@@ -55,9 +77,7 @@ WHERE events_id=%s;""", (id,))
         db.close()
 
     def on_post(self, req, resp):
-        resp.set_header('X-Powered-By', 'OpenEventDatabase')
-        resp.set_header('Access-Control-Allow-Origin', '*')
-        resp.set_header('Access-Control-Allow-Headers', 'X-Requested-With')
+        standard_headers(resp)
 
         # get request body payload (geojson Feature)
         body = req.stream.read().decode('utf-8')
@@ -78,7 +98,7 @@ WHERE events_id=%s;""", (id,))
         else:
             when = "["+event_start+", "+event_stop+")"
         # connect to db and insert
-        db = psycopg2.connect("dbname=oedb")
+        db = db_connect()
         cur = db.cursor()
         # get the geometry part
         geometry=json.dumps(j['geometry'])
@@ -99,16 +119,16 @@ WHERE events_id=%s;""", (id,))
         resp.body = """{"id":"%s"}""" % (e[0])
         resp.status = falcon.HTTP_201
 
-
 # falcon.API instances are callable WSGI apps
 app = falcon.API()
 
 # Resources are represented by long-lived class instances
+events = EventsResource()
 event = EventResource()
 stats = StatsResource()
 
 # things will handle all requests to the matching URL path
+app.add_route('/events', events)
 app.add_route('/event/{id}', event)  # handle single event requests
 app.add_route('/event', event)  # handle single event requests
 app.add_route('/stats', stats)
-