Adarnof's Little Things (#547)

* Port to Django 1.10
Initial migrations for current states of all models. Requires faking to retain data.
Removed all references to render_to_response, replacing with render shortcut.
Same for HttpResponseRedirect to render shortcut.
Corrected notification signal import to wait for app registry to finish loading.

* Correct typos from render conversion

* Modify models to suppress Django field warnings

* Script for automatic database conversion
 - fakes initial migrations to preserve data
Include LOGIN_URL setting

* Correct context processor import typo

* Removed pathfinder support.
Current pathfinder versions require SSO, not APIs added to database.
Conditionally load additional database definitions only if services are enabled.
Prevents errors when running auth without creating all possible databases.

* Condense context processors

* Include Django 1.10 installation in migrate script
Remove syncdb/evolve, replace with migrate for update script

* Replaced member/blue perms with user state system
Removed sigtracker
Initial migrations for default perms and groups
Removed perm bootstrapping on first run

* Clean up services list

* Remove fleet fittings page

* Provide action feedback via django messaging
Display unread notification count
Correct left navbar alignment

* Stop storing service passwords.
Provide them one time upon activation or reset.
Closes #177

* Add group sync buttons to admin site
Allow searcing of AuthServicesInfo models
Display user main character

* Correct button CSS to remove underlines on hover

* Added bulk actions to notifications
Altered notification default ordering

* Centralize API key validation.
Remove unused error count on API key model.
Restructure API key refresh task to queue all keys per user and await completion.
Closes #350

* Example configuration files for supervisor.
Copy to /etc/supervisor/conf.d and restart to take effect.
Closes #521
Closes #266

* Pre-save receiver for member/blue state switching
Removed is_blue field
Added link to admin site

* Remove all hardcoded URLs from views and templates
Correct missing render arguments
Closes #540

* Correct celeryd process directory

* Migration to automatically set user states.
Runs instead of waiting for next API refresh cycle. Should make the transition much easier.

* Verify service accounts accessible to member state

* Restructure project to remove unnecessary apps.
(celerytask, util, portal, registraion apps)
Added workarounds for python 3 compatibility.

* Correct python2 compatibility

* Check services against state being changed to

* Python3 compatibility fixes

* Relocate x2bool py3 fix

* SSO integration for logging in to existing accounts.

* Add missing url names for fleetup reverse

* Sanitize groupnames before syncing.

* Correct trailing slash preventing url resolution

* Alter group name sanitization to allow periods and hyphens

* Correct state check on pre_save model for corp/alliance group assignment

* Remove sigtracker table from old dbs to allow user deletion

* Include missing celery configuration

* Teamspeak error handling

* Prevent celery worker deadlock on async group result wait

* Correct active navbar links for translated urls.
Correct corp status url resolution for some links.
Remove DiscordAuthToken model.

groupmanagement/__init__.py

@@ -0,0 +1 @@
+from __future__ import unicode_literals

groupmanagement/admin.py

@@ -1,9 +1,10 @@
+from __future__ import unicode_literals
 from django.contrib import admin
 
-from models import GroupDescription
-from models import GroupRequest
-from models import HiddenGroup
-from models import OpenGroup
+from groupmanagement.models import GroupDescription
+from groupmanagement.models import GroupRequest
+from groupmanagement.models import HiddenGroup
+from groupmanagement.models import OpenGroup
 
 
 admin.site.register(GroupDescription)

groupmanagement/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class GroupManagementConfig(AppConfig):
+    name = 'groupmanagement'

groupmanagement/migrations/0001_initial.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-05 21:39
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0008_alter_user_username_max_length'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('eveonline', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GroupDescription',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=512)),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.Group', unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='GroupRequest',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.CharField(max_length=254)),
+                ('leave_request', models.BooleanField(default=0)),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.Group')),
+                ('main_char', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.EveCharacter')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='HiddenGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.Group', unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='OpenGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('group', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='auth.Group')),
+            ],
+        ),
+    ]

groupmanagement/migrations/0002_auto_20160906_2354.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-06 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groupmanagement', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='groupdescription',
+            name='group',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='auth.Group'),
+        ),
+        migrations.AlterField(
+            model_name='hiddengroup',
+            name='group',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='auth.Group'),
+        ),
+    ]

groupmanagement/migrations/0003_default_groups.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-09 23:22
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.conf import settings
+
+def create_groups(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP)
+    Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groupmanagement', '0002_auto_20160906_2354'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_groups, reverse)
+    ]

groupmanagement/models.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.auth.models import Group
@@ -5,14 +7,16 @@ from django.contrib.auth.models import Group
 from eveonline.models import EveCharacter
 
 
+@python_2_unicode_compatible
 class GroupDescription(models.Model):
     description = models.CharField(max_length=512)
-    group = models.ForeignKey(Group, unique=True)
+    group = models.OneToOneField(Group)
 
     def __str__(self):
         return self.group.name + " - Description"
 
 
+@python_2_unicode_compatible
 class GroupRequest(models.Model):
     status = models.CharField(max_length=254)
     leave_request = models.BooleanField(default=0)
@@ -23,12 +27,16 @@ class GroupRequest(models.Model):
     def __str__(self):
         return self.user.username + ":" + self.group.name
 
+
+@python_2_unicode_compatible
 class HiddenGroup(models.Model):
-    group = models.ForeignKey(Group, unique=True)
+    group = models.OneToOneField(Group)
 
     def __str__(self):
         return self.group.name + " - Hidden"
 
+
+@python_2_unicode_compatible
 class OpenGroup(models.Model):
     group = models.OneToOneField(Group)
 

groupmanagement/views.py

@@ -1,16 +1,16 @@
-from django.template import RequestContext
-from django.shortcuts import HttpResponseRedirect
-from django.shortcuts import render_to_response
+from __future__ import unicode_literals
+from django.shortcuts import render, redirect
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.models import Group
+from django.contrib import messages
 from notifications import notify
-from models import GroupDescription
-from models import GroupRequest
-from models import HiddenGroup
-from models import OpenGroup
-from authentication.managers import AuthServicesInfoManager
+from groupmanagement.models import GroupDescription
+from groupmanagement.models import GroupRequest
+from groupmanagement.models import HiddenGroup
+from groupmanagement.models import OpenGroup
+from authentication.models import AuthServicesInfo
 from eveonline.managers import EveManager
 from django.utils.translation import ugettext_lazy as _
 
@@ -18,6 +18,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+
 @login_required
 @permission_required('auth.group_management')
 def group_management(request):
@@ -30,12 +31,12 @@ def group_management(request):
             leaverequests.append(grouprequest)
         else:
             acceptrequests.append(grouprequest)
-    logger.debug("Providing user %s with %s acceptrequests and %s leaverequests." % (request.user, len(acceptrequests), len(leaverequests)))
+    logger.debug("Providing user %s with %s acceptrequests and %s leaverequests." % (
+        request.user, len(acceptrequests), len(leaverequests)))
 
     render_items = {'acceptrequests': acceptrequests, 'leaverequests': leaverequests}
 
-    return render_to_response('registered/groupmanagement.html',
-                              render_items, context_instance=RequestContext(request))
+    return render(request, 'registered/groupmanagement.html', context=render_items)
 
 
 @login_required
@@ -48,13 +49,20 @@ def group_accept_request(request, group_request_id):
         group_request.user.groups.add(group)
         group_request.user.save()
         group_request.delete()
-        logger.info("User %s accepted group request from user %s to group %s" % (request.user, group_request.user, group_request.group.name))
-        notify(group_request.user, "Group Application Accepted", level="success", message="Your application to %s has been accepted." % group_request.group)
+        logger.info("User %s accepted group request from user %s to group %s" % (
+            request.user, group_request.user, group_request.group.name))
+        notify(group_request.user, "Group Application Accepted", level="success",
+               message="Your application to %s has been accepted." % group_request.group)
+        messages.success(request,
+                         'Accepted application from %s to %s.' % (group_request.main_char, group_request.group))
     except:
-        logger.exception("Unhandled exception occured while user %s attempting to accept grouprequest id %s." % (request.user, group_request_id))
+        messages.error(request, 'An unhandled error occurred while processing the application from %s to %s.' % (
+            group_request.main_char, group_request.group))
+        logger.exception("Unhandled exception occurred while user %s attempting to accept grouprequest id %s." % (
+            request.user, group_request_id))
         pass
 
-    return HttpResponseRedirect("/group/management/")
+    return redirect("auth_group_management")
 
 
 @login_required
@@ -65,51 +73,74 @@ def group_reject_request(request, group_request_id):
         group_request = GroupRequest.objects.get(id=group_request_id)
 
         if group_request:
-            logger.info("User %s rejected group request from user %s to group %s" % (request.user, group_request.user, group_request.group.name))
+            logger.info("User %s rejected group request from user %s to group %s" % (
+                request.user, group_request.user, group_request.group.name))
             group_request.delete()
-            notify(group_request.user, "Group Application Rejected", level="danger", message="Your application to %s has been rejected." % group_request.group)
+            notify(group_request.user, "Group Application Rejected", level="danger",
+                   message="Your application to %s has been rejected." % group_request.group)
+            messages.success(request,
+                             'Rejected application from %s to %s.' % (group_request.main_char, group_request.group))
     except:
-        logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s" % (request.user, group_request_id))
+        messages.error(request, 'An unhandled error occured while processing the application from %s to %s.' % (
+            group_request.main_char, group_request.group))
+        logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s" % (
+            request.user, group_request_id))
         pass
 
-    return HttpResponseRedirect("/group/management/")
+    return redirect("auth_group_management")
 
 
 @login_required
 @permission_required('auth.group_management')
 def group_leave_accept_request(request, group_request_id):
-    logger.debug("group_leave_accept_request called by user %s for group request id %s" % (request.user, group_request_id))
+    logger.debug(
+        "group_leave_accept_request called by user %s for group request id %s" % (request.user, group_request_id))
     try:
         group_request = GroupRequest.objects.get(id=group_request_id)
         group, created = Group.objects.get_or_create(name=group_request.group.name)
         group_request.user.groups.remove(group)
         group_request.user.save()
         group_request.delete()
-        logger.info("User %s accepted group leave request from user %s to group %s" % (request.user, group_request.user, group_request.group.name))
-        notify(group_request.user, "Group Leave Request Accepted", level="success", message="Your request to leave %s has been accepted." % group_request.group)
+        logger.info("User %s accepted group leave request from user %s to group %s" % (
+            request.user, group_request.user, group_request.group.name))
+        notify(group_request.user, "Group Leave Request Accepted", level="success",
+               message="Your request to leave %s has been accepted." % group_request.group)
+        messages.success(request,
+                         'Accepted application from %s to leave %s.' % (group_request.main_char, group_request.group))
     except:
-        logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s" % (request.user, group_request_id))
+        messages.error(request, 'An unhandled error occured while processing the application from %s to leave %s.' % (
+            group_request.main_char, group_request.group))
+        logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s" % (
+            request.user, group_request_id))
         pass
 
-    return HttpResponseRedirect("/group/management/")
+    return redirect("auth_group_management")
 
 
 @login_required
 @permission_required('auth.group_management')
 def group_leave_reject_request(request, group_request_id):
-    logger.debug("group_leave_reject_request called by user %s for group request id %s" % (request.user, group_request_id))
+    logger.debug(
+        "group_leave_reject_request called by user %s for group request id %s" % (request.user, group_request_id))
     try:
         group_request = GroupRequest.objects.get(id=group_request_id)
 
         if group_request:
             group_request.delete()
-            logger.info("User %s rejected group leave request from user %s for group %s" % (request.user, group_request.user, group_request.group.name))
-            notify(group_request.user, "Group Leave Request Rejected", level="danger", message="Your request to leave %s has been rejected." % group_request.group)
+            logger.info("User %s rejected group leave request from user %s for group %s" % (
+                request.user, group_request.user, group_request.group.name))
+            notify(group_request.user, "Group Leave Request Rejected", level="danger",
+                   message="Your request to leave %s has been rejected." % group_request.group)
+            messages.success(request, 'Rejected application from %s to leave %s.' % (
+                group_request.main_char, group_request.group))
     except:
-        logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s" % (request.user, group_request_id))
+        messages.error(request, 'An unhandled error occured while processing the application from %s to leave %s.' % (
+            group_request.main_char, group_request.group))
+        logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s" % (
+            request.user, group_request_id))
         pass
 
-    return HttpResponseRedirect("/group/management/")
+    return redirect("auth_group_management")
 
 
 @login_required
@@ -131,23 +162,22 @@ def groups_view(request):
             pass
         else:
             # Get the descriptionn
-            groupDesc = GroupDescription.objects.filter(group=group)
-            groupRequest = GroupRequest.objects.filter(user=request.user).filter(group=group)
+            group_desc = GroupDescription.objects.filter(group=group)
+            group_request = GroupRequest.objects.filter(user=request.user).filter(group=group)
 
-            if groupDesc:
-                if groupRequest:
-                    paired_list.append((group, groupDesc[0], groupRequest[0]))
+            if group_desc:
+                if group_request:
+                    paired_list.append((group, group_desc[0], group_request[0]))
                 else:
-                    paired_list.append((group, groupDesc[0], ""))
+                    paired_list.append((group, group_desc[0], ""))
             else:
-                if groupRequest:
-                    paired_list.append((group, "", groupRequest[0]))
+                if group_request:
+                    paired_list.append((group, "", group_request[0]))
                 else:
                     paired_list.append((group, "", ""))
 
     render_items = {'pairs': paired_list}
-    return render_to_response('registered/groups.html',
-                              render_items, context_instance=RequestContext(request))
+    return render(request, 'registered/groups.html', context=render_items)
 
 
 @login_required
@@ -157,8 +187,8 @@ def group_request_add(request, group_id):
     if OpenGroup.objects.filter(group=group).exists():
         logger.info("%s joining %s as is an open group" % (request.user, group))
         request.user.groups.add(group)
-        return HttpResponseRedirect("/groups")
-    auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
+        return redirect("auth_groups")
+    auth_info = AuthServicesInfo.objects.get_or_create(user=request.user)[0]
     grouprequest = GroupRequest()
     grouprequest.status = _('Pending')
     grouprequest.group = group
@@ -167,7 +197,8 @@ def group_request_add(request, group_id):
     grouprequest.leave_request = False
     grouprequest.save()
     logger.info("Created group request for user %s to group %s" % (request.user, Group.objects.get(id=group_id)))
-    return HttpResponseRedirect("/groups")
+    messages.success(request, 'Applied to group %s.' % group)
+    return redirect("auth_groups")
 
 
 @login_required
@@ -177,8 +208,8 @@ def group_request_leave(request, group_id):
     if OpenGroup.objects.filter(group=group).exists():
         logger.info("%s leaving %s as is an open group" % (request.user, group))
         request.user.groups.remove(group)
-        return HttpResponseRedirect("/groups")
-    auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
+        return redirect("auth_groups")
+    auth_info = AuthServicesInfo.objects.get_or_create(user=request.user)[0]
     grouprequest = GroupRequest()
     grouprequest.status = _('Pending')
     grouprequest.group = group
@@ -187,5 +218,5 @@ def group_request_leave(request, group_id):
     grouprequest.leave_request = True
     grouprequest.save()
     logger.info("Created group leave request for user %s to group %s" % (request.user, Group.objects.get(id=group_id)))
-
-    return HttpResponseRedirect("/groups")
+    messages.success(request, 'Applied to leave group %s.' % group)
+    return redirect("auth_groups")