Merge branch 'dev'

Author: andrewsosa

.gitignore

@@ -36,3 +36,7 @@ webapp/public/js/register.js
 #
 
 **/.env
+services/gorush/config.yml
+services/gorush/*.pem
+services/gorush/*.p12
+.vscode/

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "python.pythonPath": "/usr/local/bin/python3.6"
+    "python.pythonPath": "/Users/andrew/.virtualenvs/HackFSU/bin/python"
 }

api/api/urls.py

@@ -62,6 +62,8 @@
 
     url(r'events$', views.scan.ScanEventsView.as_view(), name='scan-events'),
     url(r'events/scan$', views.scan.ScanUploadView.as_view(), name='scan-upload'),
+
+    url(r'push/new$', views.push.CreatePushView.as_view(), name='push-new'),
 ]
 
 

api/api/views/__init__.py

@@ -9,3 +9,4 @@
 from . import attendee
 from . import preview
 from . import scan
+from . import push

api/api/views/push/__init__.py

@@ -0,0 +1 @@
+from .create import CreatePushView

api/api/views/push/create.py

@@ -0,0 +1,43 @@
+"""
+    Proxy a new push notification to the push service
+    and then gorush. Maybe save as update.
+"""
+
+from django import forms
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.utils import timezone
+from hackfsu_com.views.generic import ApiView
+from hackfsu_com.util.forms import JsonField
+from hackfsu_com.util import acl
+from api.models import HackathonUpdate, Hackathon
+
+import requests
+
+class CreatePushView(ApiView):
+    class RequestForm(forms.Form):
+        title = forms.CharField()
+        body = forms.CharField()
+        isUpdate = forms.IntegerField()
+
+    http_method_names = ['post']
+    request_form_class = RequestForm
+    access_manager = acl.AccessManager(acl_accept=[acl.group_organizer])
+
+    def work(self, request, req, res):
+        url = "{}/push/new".format(settings.PUSH_HOST)
+        payload = {
+            'title': req['title'],
+            'message': req['body']
+        }
+        resp = requests.post(url, json=payload)
+
+
+        # Optional save as HackathonUpdate
+        if req['isUpdate'] is 1:
+            update = HackathonUpdate(
+                hackathon=Hackathon.objects.current(),
+                title=req['title'],
+                content=req['body']
+            )
+            update.save()

api/api/views/scan/events.py

@@ -8,7 +8,7 @@
 from hackfsu_com.views.generic import ApiView
 from hackfsu_com.util.forms import JsonField
 from hackfsu_com.util import acl
-from api.models import Hackathon, ScanEvent, ScanRecord, UserInfo
+from api.models import Hackathon, ScanEvent, ScanRecord, UserInfo, HackerInfo
 from api.models.attendee_status import AttendeeStatusManager
 
 class ScanEventsView(ApiView):
@@ -76,6 +76,18 @@ def work(self, request, req, res):
             current_hackathon = Hackathon.objects.current()
             attendee_info = AttendeeStatusManager.get_or_create(user, current_hackathon)
 
+            # If hacker, make sure they are approved
+            try:
+                hacker_info = HackerInfo.objects.get(hackathon=current_hackathon, user=user)
+                if not hacker_info.approved:
+                    res['name'] = name
+                    res['message'] = "{} was not accepted.".format(name)
+                    res['status'] = 401
+                    return
+            except:
+                pass
+
+
             attendee_info.checked_in_at = timezone.now()
             attendee_info.save()
 

api/api/views/user/get/profile.py

@@ -51,7 +51,7 @@ def work(self, request, req, res):
         code, qr = user_info.hexcode, user_info.qr_url
 
         if not code or not qr:
-            url = "http://{}/hacker/{}".format(settings.QR_HOST, request.user.email)
+            url = "{}/hacker/{}".format(settings.QR_HOST, request.user.email)
             resp = requests.get(url)
 
             if resp.status_code in (200, 201):

api/entrypoint.sh

@@ -2,4 +2,5 @@
 
 python manage.py collectstatic --noinput
 service nginx start
+service nginx status
 python manage.py runserver 0.0.0.0:8000

api/hackfsu_com/keys.py

@@ -24,6 +24,7 @@
 MANDRILL_SMTP_PASSWORD = str()
 ADMIN_EMAIL = str()
 QR_HOST = str()
+PUSH_HOST = str()
 HTTP_HOSTNAME = str()
 
 
@@ -43,6 +44,7 @@ def load_secret_keys():
     global MANDRILL_SMTP_PASSWORD
     global ADMIN_EMAIL
     global QR_HOST
+    global PUSH_HOST
     global HTTP_HOSTNAME
 
     def load_key(key):
@@ -67,6 +69,7 @@ def load_key(key):
     MANDRILL_SMTP_PASSWORD = load_key('MANDRILL_SMTP_PASSWORD')
     ADMIN_EMAIL = load_key('ADMIN_EMAIL')
     QR_HOST = load_key('QR_HOST')
+    PUSH_HOST = load_key('PUSH_HOST')
     HTTP_HOSTNAME = load_key('HTTP_HOSTNAME')
 
 load_secret_keys()