Merge branch '535-display-open-jos-in-the-last-24-hours' into 'master'

Resolve "Display open JOs in the last 24 hours"

Closes #535

See merge request jankstudio/resq!626

public/assets/js/map_mqtt.js

@@ -83,7 +83,7 @@ class MapEventHandler {
             case "location":
                 console.log("got location for rider " + chan_split[1] + " - " + payload);
                 var pl_split = payload.split(':');
-                console.log(pl_split);
+                // console.log(pl_split);
 
                 // check for correct format
                 if (pl_split.length != 2)

utils/mqtt_rider_convert/mqtt_rider_convert.py

@@ -0,0 +1,73 @@
+import paho.mqtt.client as mqtt
+import ssl
+import redis
+import time
+import signal
+import sys
+import os
+import json
+
+class MQTTRiderConvert(object):
+
+    def run(self, client):
+        print "running loop..."
+        client.loop_forever()
+
+# TODO: fix this and put these guys back under the class
+def init_subscriptions(client):
+    print "subscribing to wildcard #"
+    client.subscribe('#')
+
+def on_connect(client, userdata, flags, rc):
+    init_subscriptions(client)
+    #print("Connected with result code "+str(rc))
+    # client.subscribe("$SYS/#")
+
+def user_data_set(userdata):
+    conn = redis.StrictRedis(host='localhost', port=6379, db=0)
+    return conn
+
+def on_publish(client, userdata, mid):
+    pass
+
+def on_message(client, userdata, message):
+    redis_conn = user_data_set(userdata)
+    #print("message topic=", message.topic[0:10])
+
+    if message.topic[0:10] != 'motorider_':
+        return
+    #print repr(message)
+
+    # check if json decodable
+    res = json.loads(message.payload)
+    #print res
+
+    # get rider session id
+    sess_id = message.topic[10:]
+
+    # check if it has event
+    if 'event' not in res:
+        return
+
+    # check if event is driver_location
+    if res['event'] != 'driver_location':
+        return
+
+    # save the longitude and latitude
+    rider_long = str(res['longitude'])
+    rider_lat = str(res['latitude'])
+
+    # get the rider id from redis using rider.id.<session id>
+    session_rider_key = 'rider.id.%s' % sess_id 
+    rider_id = redis_conn.get(session_rider_key)
+
+    channel = 'rider/%s/location' % rider_id
+    payload = rider_lat + ':' + rider_long
+
+    #print channel
+    #print payload
+
+    client.publish(channel, payload)
+
+    # add to rider_cache rider's latest location
+    redis_conn.geoadd('loc_rider_active', rider_long, rider_lat, rider_id)

utils/mqtt_rider_convert/riderconvert.py

@@ -0,0 +1,23 @@
+import paho.mqtt.client as mqtt
+import mqtt_rider_convert as rconvert
+import ssl
+import logging
+
+
+client = mqtt.Client()
+client.on_connect = rconvert.on_connect
+# client.on_publish = on_publish
+client.on_message = rconvert.on_message
+
+#client.tls_set(
+#    "/etc/letsencrypt/live/resqaws.jankstudio.com/fullchain.pem", cert_reqs=ssl.CERT_NONE,
+#    tls_version=ssl.PROTOCOL_TLSv1)
+#client.tls_set(
+#    "/root/aws_ssl_keys/fullchain.pem", cert_reqs=ssl.CERT_NONE,
+#    tls_version=ssl.PROTOCOL_TLSv1)
+#client.connect("resqaws.jankstudio.com", 8883, 60)
+client.connect("localhost", 1883, 60)
+
+
+rider_convert = rconvert.MQTTRiderConvert()
+rider_convert.run(client)