Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 09:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change EveModels to Integer ID fields

Browse Source
This commit is contained in:
Aaron Kable
2020-06-09 13:10:10 +00:00
committed by Ariel Rin
parent a4befc5e59
commit 7f7500ff0c
12 changed files with 289 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
allianceauth/eveonline/migrations/0011_ids_to_integers.py Normal file
View File

@@ -0,0 +1,43 @@
# Generated by Django 2.2.12 on 2020-05-25 02:28
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('eveonline', '0010_alliance_ticker'),
]
operations = [
migrations.AlterField(
model_name='eveallianceinfo',
name='alliance_id',
field=models.PositiveIntegerField(unique=True),
),
migrations.AlterField(
model_name='eveallianceinfo',
name='executor_corp_id',
field=models.PositiveIntegerField(),
),
migrations.AlterField(
model_name='evecharacter',
name='alliance_id',
field=models.PositiveIntegerField(blank=True, default=None, null=True),
),
migrations.AlterField(
model_name='evecharacter',
name='character_id',
field=models.PositiveIntegerField(unique=True),
),
migrations.AlterField(
model_name='evecharacter',
name='corporation_id',
field=models.PositiveIntegerField(),
),
migrations.AlterField(
model_name='evecorporationinfo',
name='corporation_id',
field=models.PositiveIntegerField(unique=True),
),
]

33
allianceauth/eveonline/migrations/0012_index_additions.py Normal file
View File

@@ -0,0 +1,33 @@
# Generated by Django 2.2.12 on 2020-05-26 02:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('eveonline', '0011_ids_to_integers'),
]
operations = [
migrations.AddIndex(
model_name='eveallianceinfo',
index=models.Index(fields=['executor_corp_id'], name='eveonline_e_executo_7f3280_idx'),
),
migrations.AddIndex(
model_name='evecharacter',
index=models.Index(fields=['corporation_id'], name='eveonline_e_corpora_cb4cd9_idx'),
),
migrations.AddIndex(
model_name='evecharacter',
index=models.Index(fields=['alliance_id'], name='eveonline_e_allianc_39ee2a_idx'),
),
migrations.AddIndex(
model_name='evecharacter',
index=models.Index(fields=['corporation_name'], name='eveonline_e_corpora_893c60_idx'),
),
migrations.AddIndex(
model_name='evecharacter',
index=models.Index(fields=['alliance_name'], name='eveonline_e_allianc_63fd98_idx'),
),
]

23
allianceauth/eveonline/models.py
View File

@@ -11,14 +11,17 @@ _DEFAULT_IMAGE_SIZE = 32
class EveAllianceInfo(models.Model):
alliance_id = models.CharField(max_length=254, unique=True)
alliance_id = models.PositiveIntegerField(unique=True)
alliance_name = models.CharField(max_length=254, unique=True)
alliance_ticker = models.CharField(max_length=254)
executor_corp_id = models.CharField(max_length=254)
executor_corp_id = models.PositiveIntegerField()
objects = EveAllianceManager()
provider = EveAllianceProviderManager()
class Meta:
indexes = [models.Index(fields=['executor_corp_id',])]
def populate_alliance(self):
alliance = self.provider.get_alliance(self.alliance_id)
for corp_id in alliance.corp_ids:
@@ -75,7 +78,7 @@ class EveAllianceInfo(models.Model):
class EveCorporationInfo(models.Model):
corporation_id = models.CharField(max_length=254, unique=True)
corporation_id = models.PositiveIntegerField(unique=True)
corporation_name = models.CharField(max_length=254, unique=True)
corporation_ticker = models.CharField(max_length=254)
member_count = models.IntegerField()
@@ -133,18 +136,26 @@ class EveCorporationInfo(models.Model):
class EveCharacter(models.Model):
character_id = models.CharField(max_length=254, unique=True)
character_id = models.PositiveIntegerField(unique=True)
character_name = models.CharField(max_length=254, unique=True)
corporation_id = models.CharField(max_length=254)
corporation_id = models.PositiveIntegerField()
corporation_name = models.CharField(max_length=254)
corporation_ticker = models.CharField(max_length=5)
alliance_id = models.CharField(max_length=254, blank=True, null=True, default='')
alliance_id = models.PositiveIntegerField(blank=True, null=True, default=None)
alliance_name = models.CharField(max_length=254, blank=True, null=True, default='')
alliance_ticker = models.CharField(max_length=5, blank=True, null=True, default='')
objects = EveCharacterManager()
provider = EveCharacterProviderManager()
class Meta:
indexes = [
models.Index(fields=['corporation_id',]),
models.Index(fields=['alliance_id',]),
models.Index(fields=['corporation_name',]),
models.Index(fields=['alliance_name',]),
]
@property
def alliance(self) -> Union[EveAllianceInfo, None]:
"""

123
allianceauth/eveonline/tests/test_managers.py
View File

@@ -12,7 +12,7 @@ class EveCharacterProviderManagerTestCase(TestCase):
expected = Character()
provider.get_character.return_value = expected
result = EveCharacter.provider.get_character('1234')
result = EveCharacter.provider.get_character(1234)
self.assertEqual(expected, result)
@@ -22,30 +22,30 @@ class EveCharacterManagerTestCase(TestCase):
class TestCharacter(Character):
@property
def alliance(self):
return Alliance(id='3456', name='Test Alliance')
return Alliance(id=3456, name='Test Alliance')
@property
def corp(self):
return Corporation(
id='2345',
id=2345,
name='Test Corp',
alliance_id='3456',
ticker='0BUGS'
alliance_id=3456,
ticker='0BUGS' #lies, blatant lies!
)
@mock.patch('allianceauth.eveonline.managers.providers.provider')
def test_create_character(self, provider):
# Also covers create_character_obj
expected = self.TestCharacter(
id='1234',
id=1234,
name='Test Character',
corp_id='2345',
alliance_id='3456'
corp_id=2345,
alliance_id=3456
)
provider.get_character.return_value = expected
result = EveCharacter.objects.create_character('1234')
result = EveCharacter.objects.create_character(1234)
self.assertEqual(result.character_id, expected.id)
self.assertEqual(result.character_name, expected.name)
@@ -58,22 +58,25 @@ class EveCharacterManagerTestCase(TestCase):
@mock.patch('allianceauth.eveonline.managers.providers.provider')
def test_update_character(self, provider):
# Also covers Model.update_character
EveCharacter.objects.create(
character_id='1234',
existing = EveCharacter.objects.create(
character_id=1234,
character_name='character.name',
corporation_id='character.corp.id',
corporation_id=23457,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='character.alliance.id',
corporation_ticker='cc1',
alliance_id=34567,
alliance_name='character.alliance.name',
)
expected = self.TestCharacter(
id='1234', name='Test Character', corp_id='2345', alliance_id='3456'
id=1234,
name='Test Character',
corp_id=2345,
alliance_id=3456
)
provider.get_character.return_value = expected
result = EveCharacter.objects.update_character('1234')
result = EveCharacter.objects.update_character(1234)
self.assertEqual(result.character_id, expected.id)
self.assertEqual(result.character_name, expected.name)
@@ -86,23 +89,23 @@ class EveCharacterManagerTestCase(TestCase):
def test_get_character_by_id(self):
EveCharacter.objects.all().delete()
EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='character.corp.id',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='character.alliance.id',
corporation_ticker='cc1',
alliance_id=3456,
alliance_name='character.alliance.name',
)
# try to get existing character
result = EveCharacter.objects.get_character_by_id('1234')
result = EveCharacter.objects.get_character_by_id(1234)
self.assertEqual(result.character_id, '1234')
self.assertEqual(result.character_id, 1234)
self.assertEqual(result.character_name, 'character.name')
# try to get non existing character
self.assertIsNone(EveCharacter.objects.get_character_by_id('9999'))
self.assertIsNone(EveCharacter.objects.get_character_by_id(9999))
class EveAllianceProviderManagerTestCase(TestCase):
@@ -111,7 +114,7 @@ class EveAllianceProviderManagerTestCase(TestCase):
expected = Alliance()
provider.get_alliance.return_value = expected
result = EveAllianceInfo.provider.get_alliance('1234')
result = EveAllianceInfo.provider.get_alliance(1234)
self.assertEqual(expected, result)
@@ -127,16 +130,16 @@ class EveAllianceManagerTestCase(TestCase):
def test_create_alliance(self, provider, populate_alliance):
# Also covers create_alliance_obj
expected = self.TestAlliance(
id='3456',
id=3456,
name='Test Alliance',
ticker='TEST',
corp_ids=['2345'],
executor_corp_id='2345'
corp_ids=[2345],
executor_corp_id=2345
)
provider.get_alliance.return_value = expected
result = EveAllianceInfo.objects.create_alliance('3456')
result = EveAllianceInfo.objects.create_alliance(3456)
self.assertEqual(result.alliance_id, expected.id)
self.assertEqual(result.alliance_name, expected.name)
@@ -148,22 +151,22 @@ class EveAllianceManagerTestCase(TestCase):
def test_update_alliance(self, provider):
# Also covers Model.update_alliance
EveAllianceInfo.objects.create(
alliance_id='3456',
alliance_id=3456,
alliance_name='alliance.name',
alliance_ticker='alliance.ticker',
executor_corp_id='alliance.executor_corp_id',
alliance_ticker='at1',
executor_corp_id=2345,
)
expected = self.TestAlliance(
id='3456',
id=3456,
name='Test Alliance',
ticker='TEST',
corp_ids=['2345'],
executor_corp_id='2345'
corp_ids=[2345],
executor_corp_id=2345
)
provider.get_alliance.return_value = expected
result = EveAllianceInfo.objects.update_alliance('3456')
result = EveAllianceInfo.objects.update_alliance(3456)
# This is the only thing ever updated in code
self.assertEqual(result.executor_corp_id, expected.executor_corp_id)
@@ -175,7 +178,7 @@ class EveCorporationProviderManagerTestCase(TestCase):
expected = Corporation()
provider.get_corp.return_value = expected
result = EveCorporationInfo.provider.get_corporation('2345')
result = EveCorporationInfo.provider.get_corporation(2345)
self.assertEqual(expected, result)
@@ -186,39 +189,39 @@ class EveCorporationManagerTestCase(TestCase):
@property
def alliance(self):
return EveAllianceManagerTestCase.TestAlliance(
id='3456',
id=3456,
name='Test Alliance',
ticker='TEST',
corp_ids=['2345'],
executor_corp_id='2345'
corp_ids=[2345],
executor_corp_id=2345
)
@property
def ceo(self):
return EveCharacterManagerTestCase.TestCharacter(
id='1234',
id=1234,
name='Test Character',
corp_id='2345',
alliance_id='3456'
corp_id=2345,
alliance_id=3456
)
@mock.patch('allianceauth.eveonline.managers.providers.provider')
def test_create_corporation(self, provider):
# Also covers create_corp_obj
exp_alliance = EveAllianceInfo.objects.create(
alliance_id='3456',
alliance_id=3456,
alliance_name='alliance.name',
alliance_ticker='alliance.ticker',
executor_corp_id='alliance.executor_corp_id',
alliance_ticker='99bug',
executor_corp_id=2345,
)
expected = self.TestCorporation(
id='2345',
id=2345,
name='Test Corp',
ticker='0BUGS',
ceo_id='1234',
ceo_id=1234,
members=1,
alliance_id='3456'
alliance_id=3456
)
provider.get_corp.return_value = expected
@@ -236,17 +239,17 @@ class EveCorporationManagerTestCase(TestCase):
# variant to test no alliance case
# Also covers create_corp_obj
expected = self.TestCorporation(
id='2345',
id=2345,
name='Test Corp',
ticker='0BUGS',
ceo_id='1234',
ceo_id=1234,
members=1,
alliance_id='3456'
alliance_id=3456
)
provider.get_corp.return_value = expected
result = EveCorporationInfo.objects.create_corporation('2345')
result = EveCorporationInfo.objects.create_corporation(2345)
self.assertEqual(result.corporation_id, expected.id)
self.assertEqual(result.corporation_name, expected.name)
@@ -258,27 +261,27 @@ class EveCorporationManagerTestCase(TestCase):
def test_update_corporation(self, provider):
# Also covers Model.update_corporation
exp_alliance = EveAllianceInfo.objects.create(
alliance_id='3456',
alliance_id=3456,
alliance_name='alliance.name',
alliance_ticker='alliance.ticker',
executor_corp_id='alliance.executor_corp_id',
alliance_ticker='at1',
executor_corp_id=2345,
)
EveCorporationInfo.objects.create(
corporation_id='2345',
corporation_id=2345,
corporation_name='corp.name',
corporation_ticker='abc',
corporation_ticker='cc1',
member_count=10,
alliance=None,
)
expected = self.TestCorporation(
id='2345',
id=2345,
name='Test Corp',
ticker='0BUGS',
ceo_id='1234',
ceo_id=1234,
members=1,
alliance_id='3456'
alliance_id=3456
)
provider.get_corp.return_value = expected

80
allianceauth/eveonline/tests/test_models.py
View File

@@ -15,27 +15,27 @@ class EveCharacterTestCase(TestCase):
Test that the correct corporation is returned by the corporation property
"""
character = EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='2345',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='character.alliance.id',
corporation_ticker='cc1',
alliance_id=12345,
alliance_name='character.alliance.name',
)
expected = EveCorporationInfo.objects.create(
corporation_id='2345',
corporation_id=2345,
corporation_name='corp.name',
corporation_ticker='abc',
corporation_ticker='cc1',
member_count=10,
alliance=None,
)
incorrect = EveCorporationInfo.objects.create(
corporation_id='9999',
corporation_id=9999,
corporation_name='corp.name1',
corporation_ticker='abc1',
corporation_ticker='cc11',
member_count=10,
alliance=None,
)
@@ -49,12 +49,12 @@ class EveCharacterTestCase(TestCase):
object is not in the database
"""
character = EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='2345',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='character.alliance.id',
corporation_ticker='cc1',
alliance_id=123456,
alliance_name='character.alliance.name',
)
@@ -66,27 +66,27 @@ class EveCharacterTestCase(TestCase):
Test that the correct alliance is returned by the alliance property
"""
character = EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='2345',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='3456',
corporation_ticker='cc1',
alliance_id=3456,
alliance_name='character.alliance.name',
)
expected = EveAllianceInfo.objects.create(
alliance_id='3456',
alliance_id=3456,
alliance_name='alliance.name',
alliance_ticker='alliance.ticker',
executor_corp_id='alliance.executor_corp_id',
alliance_ticker='ac2',
executor_corp_id=2345,
)
incorrect = EveAllianceInfo.objects.create(
alliance_id='9001',
alliance_id=9001,
alliance_name='alliance.name1',
alliance_ticker='alliance.ticker1',
executor_corp_id='alliance.executor_corp_id1',
alliance_ticker='ac1',
executor_corp_id=2654,
)
self.assertEqual(character.alliance, expected)
@@ -98,12 +98,12 @@ class EveCharacterTestCase(TestCase):
object is not in the database
"""
character = EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='2345',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
alliance_id='3456',
corporation_ticker='cc1',
alliance_id=3456,
alliance_name='character.alliance.name',
)
@@ -115,11 +115,11 @@ class EveCharacterTestCase(TestCase):
Check that None is returned when the character has no alliance
"""
character = EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='2345',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='abc',
corporation_ticker='cc1',
alliance_id=None,
alliance_name=None,
)
@@ -137,12 +137,12 @@ class EveCharacterTestCase(TestCase):
)
my_character = EveCharacter.objects.create(
character_id='1001',
character_id=1001,
character_name='Bruce Wayne',
corporation_id='2001',
corporation_id=2001,
corporation_name='Dummy Corp 1',
corporation_ticker='DC1',
alliance_id='3001',
alliance_id=3001,
alliance_name='Dummy Alliance 1',
)
my_updated_character = Character(
@@ -166,9 +166,9 @@ class EveCharacterTestCase(TestCase):
def test_portrait_urls(self):
x = EveCharacter(
character_id='42',
character_id=42,
character_name='character.name',
corporation_id='123',
corporation_id=123,
corporation_name='corporation.name',
corporation_ticker='ABC',
)
@@ -199,9 +199,9 @@ class EveCharacterTestCase(TestCase):
def test_corporation_logo_urls(self):
x = EveCharacter(
character_id='42',
character_id=42,
character_name='character.name',
corporation_id='123',
corporation_id=123,
corporation_name='corporation.name',
corporation_ticker='ABC',
)
@@ -232,9 +232,9 @@ class EveCharacterTestCase(TestCase):
def test_alliance_logo_urls(self):
x = EveCharacter(
character_id='42',
character_id=42,
character_name='character.name',
corporation_id='123',
corporation_id=123,
corporation_name='corporation.name',
corporation_ticker='ABC',
)
@@ -405,10 +405,10 @@ class EveAllianceTestCase(TestCase):
def test_logo_url(self):
x = EveAllianceInfo(
alliance_id='42',
alliance_id=42,
alliance_name='alliance.name',
alliance_ticker='ABC',
executor_corp_id='123'
executor_corp_id=123
)
self.assertEqual(
x.logo_url(),

12
allianceauth/eveonline/tests/test_tasks.py
View File

@@ -58,25 +58,25 @@ class TestTasks(TestCase):
EveCharacter.objects.all().delete()
EveCorporationInfo.objects.create(
corporation_id='2345',
corporation_id=2345,
corporation_name='corp.name',
corporation_ticker='corp.ticker',
member_count=10,
alliance=None,
)
EveAllianceInfo.objects.create(
alliance_id='3456',
alliance_id=3456,
alliance_name='alliance.name',
alliance_ticker='alliance.ticker',
executor_corp_id='alliance.executor_corp_id',
executor_corp_id='78910',
)
EveCharacter.objects.create(
character_id='1234',
character_id=1234,
character_name='character.name',
corporation_id='character.corp.id',
corporation_id=2345,
corporation_name='character.corp.name',
corporation_ticker='c.c.t', # max 5 chars
alliance_id='character.alliance.id',
alliance_id=3456,
alliance_name='character.alliance.name',
)