Updated alert with match id and collapse key

events/models.py

@@ -197,13 +197,17 @@ def alert_string(self):
 def send_alert(sender, instance, created, **kwargs):
     if instance.alert_sent is False and instance.winner is not None:
         instance.alert_sent = True
+        pmatch = instance.player_game_match
+        round = pmatch.match_round
+        event = round.event
         instance.save()
         users = instance.get_relevant_players()
         firstPlayer = instance.player_game_match.first_player
         secondPlayer = instance.player_game_match.second_player
         alert_string = instance.alert_string()
         for user in users:
             if user.device is not None:
-                user.device.send_message(message = alert_string)
+                user.device.collapse_key = str(event.pk) + str(round.pk) + str(pmatch.pk) + str(instance.pk)
+                user.device.send_message(message = alert_string, match_id = instant.player_game_match.pk)
 
 post_save.connect(send_alert, sender = Game)

events/views.py

@@ -45,6 +45,24 @@ def get_events(request):
     response['status_code'] = 200
     return HttpResponse(simplejson.dumps(response),mimetype='application/json')
 
+# get_match - Returns a match that's id matches the query in JSON format, for alert usage
+def get_match(request):
+    user = is_auth(request):
+    if user is None:
+        return auth_required_response()
+
+    response = {}
+    ident = request.GET['id']
+    try:
+        match = PlayerMatch.objects.get(pk=ident)
+        response['status_code'] = 200
+        response['response'] = match.export_to_dict()
+    except PlayerMatch.DoesNotExist:
+        response['status_code'] = 404
+        response['response'] = "Player Match does not exist"
+
+    return HttpResponse(simplejson.dumps(response), mimetype='application/json')
+
 #get_event - Allows a user to search for a specific Event by it's unique private key,
 # then returns a JSON format response of the matching Event.
 def get_event(request):

urls.py

@@ -30,6 +30,7 @@
     url(r'^events/getmatches/', 'events.views.get_matches_from_round'),
     url(r'^events/allevents/', 'events.views.get_events'),
     url(r'^events/get_event/', 'events.views.get_event'),
+    url(r'^events/getmatch/', 'events.views.get_match'),
     url(r'^users/getallfavs/', 'users.views.get_favorites'),
     url(r'^users/setdevice/', 'users.views.set_device'),
 )