Bulk of the profile work is done.

corputils/managers.py

@@ -1,6 +1,4 @@
 from django.db import models
-from authentication.models import AuthServicesInfo
-from eveonline.models import EveCharacter
 
 
 class CorpStatsQuerySet(models.QuerySet):
@@ -9,9 +7,9 @@ class CorpStatsQuerySet(models.QuerySet):
         if user.is_superuser:
             return self
 
-        auth = AuthServicesInfo.objects.get(user=user)
         try:
-            char = EveCharacter.objects.get(character_id=auth.main_char_id)
+            assert user.profile.main_character
+            char = user.profile.main_character
             # build all accepted queries
             queries = []
             if user.has_perm('corputils.view_corp_corpstats'):
@@ -30,7 +28,7 @@ class CorpStatsQuerySet(models.QuerySet):
             else:
                 # not allowed to see any
                 return self.none()
-        except EveCharacter.DoesNotExist:
+        except AssertionError:
             return self.none()        
 
 

corputils/migrations/0003_auto_20170322_2335.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-22 23:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('corputils', '0002_migrate_permissions'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='corpstats',
+            options={'permissions': (('corp_apis', 'Can view API keys of members of their corporation.'), ('alliance_apis', 'Can view API keys of members of their alliance.'), ('blue_apis', 'Can view API keys of members of blue corporations.'), ('view_corp_corpstats', 'Can view corp stats of their corporation.'), ('view_alliance_corpstats', 'Can view corp stats of members of their alliance.'), ('view_blue_corpstats', 'Can view corp stats of blue corporations.')), 'verbose_name': 'corp stats', 'verbose_name_plural': 'corp stats'},
+        ),
+    ]

corputils/models.py

@@ -1,11 +1,11 @@
 from __future__ import unicode_literals
 from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
-from eveonline.models import EveCorporationInfo, EveCharacter, EveApiKeyPair
+from eveonline.models import EveCorporationInfo, EveCharacter
 from esi.models import Token
 from esi.errors import TokenError
 from notifications import notify
-from authentication.models import AuthServicesInfo
+from authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
 from corputils.managers import CorpStatsManager
 from operator import attrgetter
@@ -97,62 +97,32 @@ class CorpStats(models.Model):
     def member_names(self):
         return [name for id, name in self.members.items()]
 
-    def show_apis(self, user):
-        auth = AuthServicesInfo.objects.get(user=user)
-        if auth.main_char_id:
-            try:
-                char = EveCharacter.objects.get(character_id=auth.main_char_id)
-                if char.corporation_id == self.corp.corporation_id and user.has_perm('corputils.corp_apis'):
-                    return True
-                if self.corp.alliance and char.alliance_id == self.corp.alliance.alliance_id and user.has_perm(
-                        'corputils.alliance_apis'):
-                    return True
-                if user.has_perm('corputils.blue_apis') and self.corp.is_blue:
-                    return True
-            except EveCharacter.DoesNotExist:
-                pass
-        return user.is_superuser
-
-    def entered_apis(self):
-        return EveCharacter.objects.filter(character_id__in=self.member_ids).exclude(api_id__isnull=True).count()
-
     def member_count(self):
         return len(self.members)
 
-    def user_count(self, members):
+    @staticmethod
+    def user_count(members):
         mainchars = []
         for member in members:
             if hasattr(member.main, 'character_name'):
                 mainchars.append(member.main.character_name)
         return len(set(mainchars))
 
+    def registered_characters(self):
+        return len(CharacterOwnership.objects.filter(character__character_id__in=self.member_ids))
+
     @python_2_unicode_compatible
     class MemberObject(object):
-        def __init__(self, character_id, character_name, show_apis=False):
+        def __init__(self, character_id, character_name):
             self.character_id = character_id
             self.character_name = character_name
             try:
                 char = EveCharacter.objects.get(character_id=character_id)
-                auth = AuthServicesInfo.objects.get(user=char.user)
-                try:
-                    self.main = EveCharacter.objects.get(character_id=auth.main_char_id)
-                    self.main_user = self.main.character_name
-                except EveCharacter.DoesNotExist:
-                    self.main = None
-                    self.main_user = ''
-                api = EveApiKeyPair.objects.get(api_id=char.api_id)
+                self.main_user = char.character_ownership.user
+                self.main = self.main_user.profile.main_character
                 self.registered = True
-                if show_apis:
-                    self.api = api
-                else:
-                    self.api = None
-            except (EveCharacter.DoesNotExist, AuthServicesInfo.DoesNotExist):
+            except (EveCharacter.DoesNotExist, CharacterOwnership.DoesNotExist, UserProfile.DoesNotExist, AttributeError):
                 self.main = None
-                self.api = None
-                self.registered = False
-                self.main_user = ''
-            except EveApiKeyPair.DoesNotExist:
-                self.api = None
                 self.registered = False
                 self.main_user = ''
 
@@ -162,9 +132,8 @@ class CorpStats(models.Model):
         def portrait_url(self, size=32):
             return "https://image.eveonline.com/Character/%s_%s.jpg" % (self.character_id, size)
 
-    def get_member_objects(self, user):
-        show_apis = self.show_apis(user)
-        member_list = [CorpStats.MemberObject(id, name, show_apis=show_apis) for id, name in self.members.items()]
+    def get_member_objects(self):
+        member_list = [CorpStats.MemberObject(id, name) for id, name in self.members.items()]
         outlist = sorted([m for m in member_list if m.main_user], key=attrgetter('main_user', 'character_name'))
         outlist = outlist + sorted([m for m in member_list if not m.main_user], key=attrgetter('character_name'))
         return outlist
@@ -180,8 +149,7 @@ class CorpStats(models.Model):
             self.can_update = corpstats.can_update(user)
             self.total_members = len(self.members)
             self.total_users = corpstats.user_count(self.members)
-            self.registered_members = corpstats.entered_apis()
-            self.show_apis = corpstats.show_apis(user)
+            self.registered_members = corpstats.registered_characters()
             self.last_updated = corpstats.last_update
 
         def __str__(self):

corputils/templates/corputils/base.html

@@ -1,4 +1,4 @@
-{% extends 'public/base.html' %}
+{% extends 'registered/base.html' %}
 {% load i18n %}
 {% block title %}{% trans "Corporation Member Data" %}{% endblock %}
 {% block page_title %}{% trans "Corporation Member Data" %}{% endblock %}

corputils/templates/corputils/corpstats.html

@@ -58,9 +58,6 @@
                                         <tr>
                                             <th></th>
                                             <th class="text-center">{% trans "Character" %}</th>
-                                            {% if corpstats.show_apis %}
-                                                <th class="text-center">API</th>
-                                            {% endif %}
                                             <th class="text-center">{% trans "zKillboard" %}</th>
                                             <th class="text-center">{% trans "Main Character" %}</th>
                                             <th class="text-center">{% trans "Main Corporation" %}</th>
@@ -70,13 +67,6 @@
                                             <tr {% if not member.registered %}class="danger"{% endif %}>
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
                                                 <td class="text-center">{{ member.character_name }}</td>
-                                                {% if corpstats.show_apis %}
-                                                    {% if member.api %}
-                                                        <td class="text-center">{{ member.api|api_link:'label label-primary' }}</td>
-                                                    {% else %}
-                                                        <td></td>
-                                                    {% endif %}
-                                                {% endif %}
                                                 <td class="text-center"><a href="https://zkillboard.com/character/{{ member.character_id }}/" class="label label-danger" target="_blank">{% trans "Killboard" %}</a></td>
                                                 <td class="text-center">{{ member.main.character_name }}</td>
                                                 <td class="text-center">{{ member.main.corporation_name }}</td>

corputils/templates/corputils/search.html

@@ -16,7 +16,6 @@
                     <th class="text-center"></th>
                     <th class="text-center">{% trans "Character" %}</th>
                     <th class="text-center">{% trans "Corporation" %}</th>
-                    <th class="text-center">{% trans "API" %}</th>
                     <th class="text-center">{% trans "zKillboard" %}</th>
                     <th class="text-center">{% trans "Main Character" %}</th>
                     <th class="text-center">{% trans "Main Corporation" %}</th>
@@ -27,11 +26,6 @@
                         <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle"></td>
                         <td class="text-center">{{ result.1.character_name }}</td>
                         <td class="text-center">{{ result.0.corp.corporation_name }}</td>
-                        {% if result.1.api %}
-                            <td class="text-center">{{ result.1.api|api_link:"label label-primary" }}</td>
-                        {% else %}
-                            <td></td>
-                        {% endif %}
                         <td class="text-center"><a href="https://zkillboard.com/character/{{ result.1.character_id }}/" class="label label-danger" target="_blank">{% trans "Killboard" %}</a></td>
                         <td class="text-center">{{ result.1.main.character_name }}</td>
                         <td class="text-center">{{ result.1.main.corporation_name }}</td>

corputils/views.py

@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required, user_passes_test
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib import messages
@@ -133,7 +132,7 @@ def corpstats_search(request):
                        search_string.lower() in corpstats.members[member_id].lower()]
             for s in similar:
                 results.append(
-                    (corpstats, CorpStats.MemberObject(s[0], s[1], show_apis=corpstats.show_apis(request.user))))
+                    (corpstats, CorpStats.MemberObject(s[0], s[1])))
         page = request.GET.get('page', 1)
         results = sorted(results, key=lambda x: x[1].character_name)
         results_page = get_page(results, page)