changed analytics to segment.io, piwik, and owa

Author: pirate

hotspot/api/migrations/0004_auto__add_field_hotspot_tolerance.py

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Hotspot.tolerance'
+        db.add_column(u'api_hotspot', 'tolerance',
+                      self.gf('django.db.models.fields.FloatField')(default=5, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Hotspot.tolerance'
+        db.delete_column(u'api_hotspot', 'tolerance')
+
+
+    models = {
+        u'api.business': {
+            'Meta': {'object_name': 'Business'},
+            'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['api.User']", 'symmetrical': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'nickname': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '40', 'blank': 'True'}),
+            'website': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'})
+        },
+        u'api.checkin': {
+            'Meta': {'object_name': 'CheckIn'},
+            'hotspot': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Hotspot']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'time_in': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'time_out': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1969, 12, 31, 0, 0)'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.User']"})
+        },
+        u'api.hotspot': {
+            'LAT': ('django.db.models.fields.FloatField', [], {'blank': 'True'}),
+            'LNG': ('django.db.models.fields.FloatField', [], {'blank': 'True'}),
+            'Meta': {'object_name': 'Hotspot'},
+            'address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}),
+            'business': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Business']", 'blank': 'True'}),
+            'capacity': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '2000', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'nickname': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '40', 'blank': 'True'}),
+            'telephone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '25', 'blank': 'True'}),
+            'tolerance': ('django.db.models.fields.FloatField', [], {'default': '5', 'blank': 'True'}),
+            'website': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'})
+        },
+        u'api.user': {
+            'Meta': {'object_name': 'User'},
+            'birthdate': ('django.db.models.fields.DateField', [], {'default': 'None', 'blank': 'True'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['api']

hotspot/api/models.py

@@ -1,5 +1,5 @@
 """
-Hotspot API v1.0  
+Hotspot API v1.0
 Nick Sweeting 2014
 """
 
@@ -51,7 +51,7 @@ class User(AbstractUser):
 
     gender = models.CharField(max_length=1, blank=True, default="")
     status = models.IntegerField(blank=True, default=0)
-    birthdate = models.DateField(blank=True, null=True, default=None)
+    birthdate = models.DateField(blank=True, default=None)
 
     def checkin(self, hotspot, time_in=timezone.now(), time_out=epoch):
         """
@@ -342,9 +342,10 @@ class Hotspot(models.Model):
 
     """
     name = models.CharField(max_length=100)
-    business = models.ForeignKey(Business, blank=True, null=True)
+    business = models.ForeignKey(Business, blank=True)
     LAT = models.FloatField(blank=True)
     LNG = models.FloatField(blank=True)
+    tolerance = models.FloatField(blank=True, default=5)
     address = models.CharField(max_length=500, blank=True, default="")
 
     nickname = models.CharField(max_length=40, blank=True, default="")
@@ -365,7 +366,7 @@ def score(self):
         """
         Returns the number of people checked in (number to display on maps)
         """
-        
+
         # Legit Version
         #return checkins_checkedin().count()
         # "augmented" results
@@ -475,7 +476,7 @@ def search_by_radius(lat, lng, radius=10, limit=200):
         """
 
         find_by_radius_sql = \
-        '''SELECT api_hotspot.id, api_hotspot.LAT, api_hotspot.LNG, 
+        '''SELECT api_hotspot.id, api_hotspot.LAT, api_hotspot.LNG,
         ( 3959 * acos(cos(radians( %(ILAT)s ) ) * cos( radians( LAT )) * cos(radians( LNG ) - radians( %(ILNG)s )) + sin(radians( %(ILAT)s )) * sin(radians( LAT )))) AS distance FROM api_hotspot
         HAVING distance < %(IRAD)s
         ORDER BY distance
@@ -485,6 +486,22 @@ def search_by_radius(lat, lng, radius=10, limit=200):
         ids = [x.id for x in Hotspot.objects.raw(find_by_radius_sql, {"ILAT":float(lat),"ILNG":float(lng),"IRAD":float(radius), "ILIM":int(limit)+1})]
         return Hotspot.objects.filter(id__in=ids)
 
+    # Scanners
+    @staticmethod
+    def raw_search_by_radius(lat, lng, radius=10, limit=200):
+        """
+        Find all hotspots within a given radius (limited to 50km)
+        """
+
+        find_by_radius_sql = \
+        '''SELECT api_hotspot.id, api_hotspot.LAT, api_hotspot.LNG,
+        ( 3959 * acos(cos(radians( %(ILAT)s ) ) * cos( radians( LAT )) * cos(radians( LNG ) - radians( %(ILNG)s )) + sin(radians( %(ILAT)s )) * sin(radians( LAT )))) AS distance FROM api_hotspot
+        HAVING distance < %(IRAD)s
+        ORDER BY distance
+        LIMIT 0, %(ILIM)s'''
+
+        return Hotspot.objects.raw(find_by_radius_sql, {"ILAT":float(lat),"ILNG":float(lng),"IRAD":float(radius), "ILIM":int(limit)+1})
+
 class CheckIn(models.Model):
     """
     CheckIns are linked many-to-one with model:`Hotspot` and many-to-one with model:`User`
@@ -522,7 +539,7 @@ def is_checkedin(self):
         else:
             return False
 
-    
+
     # Returns QuerySet of <object>s that are currently checked into
     @staticmethod
     @sortable
@@ -548,7 +565,7 @@ def merge_objects(primary_object, alias_objects=[], keep_old=False):
     Use this function to merge model objects (i.e. Users, Organizations, Polls,
     etc.) and migrate all of the related fields from the alias objects to the
     primary object.
-    
+
     Usage:
     from django.contrib.auth.models import User
     primary_user = User.objects.get(email='[email protected]')
@@ -557,28 +574,28 @@ def merge_objects(primary_object, alias_objects=[], keep_old=False):
     """
     if not isinstance(alias_objects, list):
         alias_objects = [alias_objects]
-    
+
     # check that all aliases are the same class as primary one and that
     # they are subclass of model
     primary_class = primary_object.__class__
-    
+
     if not issubclass(primary_class, Model):
         raise TypeError('Only django.db.models.Model subclasses can be merged')
-    
+
     for alias_object in alias_objects:
         if not isinstance(alias_object, primary_class):
             raise TypeError('Only models of same class can be merged')
-    
+
     # Get a list of all GenericForeignKeys in all models
     # TODO: this is a bit of a hack, since the generics framework should provide a similar
     # method to the ForeignKey field for accessing the generic related fields.
     generic_fields = []
     for model in get_models():
         for field_name, field in filter(lambda x: isinstance(x[1], GenericForeignKey), model.__dict__.iteritems()):
             generic_fields.append(field)
-            
+
     local_fields = set([field.attname for field in primary_object._meta.local_fields])
-    
+
     # Loop through all alias objects and migrate their data to the primary object.
     for alias_object in alias_objects:
         # Migrate all foreign key references from alias object to primary object.
@@ -596,7 +613,7 @@ def merge_objects(primary_object, alias_objects=[], keep_old=False):
         for related_many_object in alias_object._meta.get_all_related_many_to_many_objects():
             alias_varname = related_many_object.get_accessor_name()
             obj_varname = related_many_object.field.name
-            
+
             if alias_varname is not None:
                 # standard case
                 related_many_objects = getattr(alias_object, alias_varname).all()
@@ -615,7 +632,7 @@ def merge_objects(primary_object, alias_objects=[], keep_old=False):
             for generic_related_object in field.model.objects.filter(**filter_kwargs):
                 setattr(generic_related_object, field.name, primary_object)
                 generic_related_object.save()
-                
+
         # Try to fill all missing values in primary object by values of duplicates
         filled_up = set()
         for field_name in local_fields:
@@ -625,7 +642,7 @@ def merge_objects(primary_object, alias_objects=[], keep_old=False):
                 setattr(primary_object, field_name, val)
                 filled_up.add(field_name)
         local_fields -= filled_up
-            
+
         if not keep_old:
             alias_object.delete()
     primary_object.save()

hotspot/api/urls.py

@@ -5,4 +5,5 @@
 
 urlpatterns = patterns('',
     url(r'^$', views.docs),
+    url(r'^locate', views.locate),
 )

hotspot/api/views.py

@@ -44,6 +44,7 @@ def hotspot_json(hotspot, distance=0):
                     "phone_number":     hotspot.telephone,
                     "latitude":         str(hotspot.LAT),
                     "longitude":        str(hotspot.LNG),
+                    "tolerance":        str(hotspot.tolerance),
                     "full_address":     hotspot.address,
                     "distance":         str(distance),
                     "categories":       None,
@@ -79,3 +80,23 @@ def scan(request):
         response["status"] = "ERROR-NO-AUTH"
 
     return HttpResponse(json.dumps(response), content_type="application/json")
+
+
+@csrf_exempt
+def locate(request):
+    lat = get_parameter(request, 'lat', '')
+    lng = get_parameter(request, 'lng', '')
+    tol = get_parameter(request, 'tolerance', '')
+
+    response = {"status":"ERROR-NO-RESULTS","hotspot": False}
+
+    if lat and lng:
+        hotspot = Hotspot.raw_search_by_radius(lat, lng, radius=1, limit=10)
+        if hotspot:
+            response["status"] = "SUCCESS"
+            response["hotspot"] = hotspot_json(hotspot[0])
+        else:
+            response["status"] = "ERROR-NO-RESULTS"
+
+
+    return HttpResponse(json.dumps(response), content_type="application/json")

hotspot/apps/web/urls.py

@@ -3,5 +3,5 @@
 import views
 
 urlpatterns = patterns('',
-    url(r'^$', views.index, name='index')
+    url(r'^$', views.index, name='index'),
 )

hotspot/apps/web/views.py

@@ -35,7 +35,42 @@ def index(request):
         socialaccount = request.user.socialaccount_set.filter(provider='facebook')
         if socialaccount:
             profile_img = socialaccount[0].get_avatar_url()
-        
+
+    context = {
+        'hotspots': hotspots,
+        'checkins': checkins,
+        'hotspots_json': hotspots_json,
+        'device': device,
+        'profile_img': profile_img,
+    }
+    return render(request, 'web/index.html', context)
+
+def add(request):
+    hotspots = []
+    for hotspot in Hotspot.objects.order_by('checkin__time_in'):
+        hotspots.append({
+            'id':hotspot.id,
+            'name':hotspot.name,
+            'LAT':hotspot.LAT,
+            'LNG':hotspot.LNG,
+            'logo':hotspot.logo,
+            'description':hotspot.description,
+            'address':hotspot.address,
+            'nickname':hotspot.nickname,
+            'capacity':hotspot.capacity,
+            'website':hotspot.website,
+            'telephone':hotspot.telephone,
+        })
+
+    hotspots_json = json.dumps(hotspots)
+    checkins = CheckIn.checkins_checkedin().count()
+
+    profile_img = "http://vpn.nicksweeting.com/images/up.gif"
+    if request.user.is_authenticated():
+        socialaccount = request.user.socialaccount_set.filter(provider='facebook')
+        if socialaccount:
+            profile_img = socialaccount[0].get_avatar_url()
+
     context = {
         'hotspots': hotspots,
         'checkins': checkins,

hotspot/context_processors.py

@@ -1,20 +1,23 @@
 from django.conf import settings
 from django.template.loader import render_to_string
 
-def analytics(request):
-    """
-    Returns Google analytics code.
+def get_ip(request):
+    """Returns the IP of the request, accounting for the possibility of being
+    behind a proxy.
     """
-    if not settings.DEBUG or settings.DEBUG_ANALYTICS:
-        return { 'analytics_code': render_to_string("analytics.html", { 'google_analytics_key': settings.GOOGLE_ANALYTICS_KEY }) }
+    ip = request.META.get("HTTP_X_FORWARDED_FOR", None)
+    if ip:
+        # X_FORWARDED_FOR returns client1, proxy1, proxy2,...
+        ip = ip.split(", ")[0]
     else:
-        return { 'analytics_code': "" }
+        ip = request.META.get("REMOTE_ADDR", "")
+    return ip
 
-def uservoice(request):
+def analytics(request):
     """
-    Returns Uservoice feedback box code.
+    Returns segment.io analytics itegration code.
     """
-    if not settings.DEBUG or settings.DEBUG_USERVOICE:
-        return { 'uservoice_code': render_to_string("uservoice.html", {}) }
+    if not settings.DEBUG or settings.DEBUG_ANALYTICS:
+        return { 'analytics_code': render_to_string("analytics.html", { 'segment_api_key': settings.SEGMENT_ANALYTICS_KEY}) }
     else:
-        return { 'uservoice_code': "" }
+        return { 'analytics_code': "" }

hotspot/docs/hotspot.api.dot

@@ -1,6 +1,6 @@
 digraph model_graph {
   # Dotfile by Django-Extensions graph_models
-  # Created: 2014-02-17 16:09
+  # Created: 2014-02-27 21:56
   # Cli Options: api
 
   fontname = "Helvetica"
@@ -298,6 +298,12 @@ digraph model_graph {
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">CharField</FONT>
     </TD></TR>
 
+    <TR><TD ALIGN="LEFT" BORDER="0">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">tolerance</FONT>
+    </TD><TD ALIGN="LEFT">
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">FloatField</FONT>
+    </TD></TR>
+  
     <TR><TD ALIGN="LEFT" BORDER="0">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">website</FONT>
     </TD><TD ALIGN="LEFT">