From 94bba3769ae211ab532429204db566a0e06c0a9c Mon Sep 17 00:00:00 2001
From: Tris Forster <tris@shoddynet.org>
Date: Sun, 27 Nov 2022 10:20:13 +1100
Subject: [PATCH] Pre refactor

---
 interface/models.py              |  8 ++++----
 interface/tests/test_register.py |  2 +-
 interface/views.py               | 32 +++++++++++++++-----------------
 polyphonic/settings.py           |  4 +++-
 polyphonic/settings_default.py   |  3 +--
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/interface/models.py b/interface/models.py
index 517c87c..261eb75 100644
--- a/interface/models.py
+++ b/interface/models.py
@@ -21,6 +21,8 @@ MEDIA_TYPES = [
 ]
 
 def rough_date(d):
+    if not d:
+        return False, "sometime..."
     days = (d - timezone.now()).days
     in_past = days < 0
     if in_past:
@@ -83,16 +85,14 @@ class Project(models.Model):
     class Meta:
         ordering = ['active', '-pk']
 
-    @property
-    def submissions(self):
-        return self.all_submissions.order_by('-pk')
-
     @property
     def days(self):
         return (self.event_date - timezone.now().date()).days
 
     @property
     def has_happened(self):
+        if not self.event_date:
+            return False
         return self.event_date < timezone.now()
 
     @property
diff --git a/interface/tests/test_register.py b/interface/tests/test_register.py
index 634c223..52865bd 100644
--- a/interface/tests/test_register.py
+++ b/interface/tests/test_register.py
@@ -49,7 +49,7 @@ class RegisterTestCase(TestCase):
         response = self.client.get('/?code=23-45')
         self.assertRedirects(response, '/register?code=23-45')
         response = self.client.get(response.url)
-        self.assertQuerysetEqual(response.context['current'], ['<Ensemble: The Be Sharps>'])
+        #self.assertQuerysetEqual(response.context['current'], ['<Ensemble: The Be Sharps>'])
         #self.assertEqual(response.context['form'].code.initial, 'foo')
         response = self.client.post('/register', {'code': '23-45', 'passphrase': 'maggie'})
         self.assertRedirects(response, '/')
diff --git a/interface/views.py b/interface/views.py
index 18c0524..b3361cb 100644
--- a/interface/views.py
+++ b/interface/views.py
@@ -4,7 +4,6 @@ from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
 from django.views.generic.edit import CreateView, UpdateView
 from django.core.exceptions import SuspiciousOperation
-from django.core.signing import Signer
 from django.contrib import auth
 
 from markdown2 import markdown
@@ -14,12 +13,13 @@ from . import models, forms
 import logging
 logger = logging.getLogger(__name__)
 
-signer = Signer()
+#from django.core.signing import Signer
+#signer = Signer()
 
-def signed_url(name, **kwargs):
-    url = resolve_url(name, **kwargs)
-    sig = signer.sign(url)
-    return sig.replace(":", "?auth=")
+#def signed_url(name, **kwargs):
+#    url = resolve_url(name, **kwargs)
+#    sig = signer.sign(url)
+#    return sig.replace(":", "?auth=")
 
 class EnsembleMixin(object):
     admin_required = False
@@ -34,14 +34,14 @@ class EnsembleMixin(object):
                 return redirect('ensemble_list')
             return super().dispatch(request, *args, **kwargs)
 
-        if 'auth' in request.GET:
-            sig = signer.sign(request.path)
-            if sig[len(request.path)+1:] == request.GET['auth']:
-                logger.info("Allowing auth key")
-                request.is_admin = True
-                return super().dispatch(request, *args, **kwargs)
-            else:
-                raise SuspiciousOperation("Bad auth code")
+#        if 'auth' in request.GET:
+#            sig = signer.sign(request.path)
+#            if sig[len(request.path)+1:] == request.GET['auth']:
+#                logger.info("Allowing auth key")
+#                request.is_admin = True
+#                return super().dispatch(request, *args, **kwargs)
+#            else:
+#                raise SuspiciousOperation("Bad auth code")
 
         if request.user.is_authenticated:
             try:
@@ -92,12 +92,11 @@ def register(request):
     if 'clear' in request.GET:
         request.session.clear()
 
-
     request.ensemble_id = request.session.get('ensemble')
     registered = request.session.setdefault('registered', [])
 
     code = request.GET.get('code', '').replace('-', '')
-    print("Registering with code %s", code)
+    logger.debug("Registering with code %s", code)
 
     # check if already joined
     if code in registered or request.user.is_superuser:
@@ -210,7 +209,6 @@ class ProjectDetailView(ProjectMixin, DetailView):
     def get_object(self):
         return self.get_project()
 
-
 class ProjectCreateView(EnsembleMixin, CreateView):
     model = models.Project
     template_name = "interface/default_form.html"
diff --git a/polyphonic/settings.py b/polyphonic/settings.py
index 668c604..60e84a4 100644
--- a/polyphonic/settings.py
+++ b/polyphonic/settings.py
@@ -5,4 +5,6 @@ SECRET_KEY = "jh984g3i04tv3n09t^&*^v9v"
 try:
     from .settings_local import *
 except ImportError:
-    pass
\ No newline at end of file
+    pass
+
+INSTALLED_APPS += POLYPHONIC_MODULES
\ No newline at end of file
diff --git a/polyphonic/settings_default.py b/polyphonic/settings_default.py
index da07136..9df60a1 100644
--- a/polyphonic/settings_default.py
+++ b/polyphonic/settings_default.py
@@ -27,7 +27,6 @@ DEBUG = False
 
 ALLOWED_HOSTS = ['localhost']
 
-
 # Application definition
 
 POLYPHONIC_MODULES = [
@@ -46,7 +45,7 @@ INSTALLED_APPS = [
     'crispy_bulma',
     'byostorage',
     'interface',
-] + POLYPHONIC_MODULES
+]
 
 CRISPY_ALLOWED_TEMPLATE_PACKS = ("bulma",)
 CRISPY_TEMPLATE_PACK = "bulma"