Remove EveManager, refactor into model managers

Lots of unused methods removed.
Unit tests added for those that are left.
This commit is contained in:
Basraah
2017-09-21 14:56:40 +10:00
parent f84de28338
commit f36b038010
12 changed files with 384 additions and 196 deletions

View File

@@ -2,7 +2,6 @@ import logging
from django.db import transaction
from django.db.models import Manager, QuerySet, Q
from allianceauth.eveonline.managers import EveManager
from allianceauth.eveonline.models import EveCharacter
@@ -23,7 +22,7 @@ def available_states_query(character):
class CharacterOwnershipManager(Manager):
def create_by_token(self, token):
if not EveCharacter.objects.filter(character_id=token.character_id).exists():
EveManager.create_character(token.character_id)
EveCharacter.objects.create_character(token.character_id)
return self.create(character=EveCharacter.objects.get(character_id=token.character_id), user=token.user,
owner_hash=token.character_owner_hash)

View File

@@ -6,7 +6,6 @@ from django.db.models import Q
from django.db.models.signals import post_save, pre_delete, m2m_changed, pre_save
from django.dispatch import receiver, Signal
from esi.models import Token
from allianceauth.eveonline.managers import EveManager
from allianceauth.eveonline.models import EveCharacter
@@ -81,7 +80,7 @@ def record_character_ownership(sender, instance, created, *args, **kwargs):
CharacterOwnership.objects.filter(character__character_id=instance.character_id).exclude(query).delete()
# create character if needed
if EveCharacter.objects.filter(character_id=instance.character_id).exists() is False:
EveManager.create_character(instance.character_id)
EveCharacter.objects.create_character(instance.character_id)
char = EveCharacter.objects.get(character_id=instance.character_id)
# check if we need to create ownership
if instance.user and not CharacterOwnership.objects.filter(character__character_id=instance.character_id).exists():