Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest ESI routes.

Browse Source
This commit is contained in:
Adarnof 2018-04-18 20:47:44 -04:00
parent 2cd8188ffb
commit a350e175c7
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
allianceauth/corputils/models.py
View File

@ -40,9 +40,8 @@ class CorpStats(models.Model):
c = self.token.get_esi_client(spec_file=SWAGGER_SPEC_PATH) c = self.token.get_esi_client(spec_file=SWAGGER_SPEC_PATH)
assert c.Character.get_characters_character_id(character_id=self.token.character_id).result()[ assert c.Character.get_characters_character_id(character_id=self.token.character_id).result()[
'corporation_id'] == int(self.corp.corporation_id) 'corporation_id'] == int(self.corp.corporation_id)
members = c.Corporation.get_corporations_corporation_id_members( member_ids = c.Corporation.get_corporations_corporation_id_members(
corporation_id=self.corp.corporation_id).result() corporation_id=self.corp.corporation_id).result()
member_ids = [m['character_id'] for m in members]
# requesting too many ids per call results in a HTTP400 # requesting too many ids per call results in a HTTP400
# the swagger spec doesn't have a maxItems count # the swagger spec doesn't have a maxItems count

2
allianceauth/corputils/swagger.json
View File

File diff suppressed because one or more lines are too long

4
allianceauth/corputils/tests.py
View File

@ -85,7 +85,7 @@ class CorpStatsUpdateTestCase(TestCase):
@mock.patch('esi.clients.SwaggerClient') @mock.patch('esi.clients.SwaggerClient')
def test_update_add_member(self, SwaggerClient): def test_update_add_member(self, SwaggerClient):
SwaggerClient.from_spec.return_value.Character.get_characters_character_id.return_value.result.return_value = {'corporation_id': 2} SwaggerClient.from_spec.return_value.Character.get_characters_character_id.return_value.result.return_value = {'corporation_id': 2}
SwaggerClient.from_spec.return_value.Corporation.get_corporations_corporation_id_members.return_value.result.return_value = [{'character_id': 1}] SwaggerClient.from_spec.return_value.Corporation.get_corporations_corporation_id_members.return_value.result.return_value = [1]
SwaggerClient.from_spec.return_value.Character.get_characters_names.return_value.result.return_value = [{'character_id': 1, 'character_name': 'test character'}] SwaggerClient.from_spec.return_value.Character.get_characters_names.return_value.result.return_value = [{'character_id': 1, 'character_name': 'test character'}]
self.corpstats.update() self.corpstats.update()
self.assertTrue(CorpMember.objects.filter(character_id='1', character_name='test character', corpstats=self.corpstats).exists()) self.assertTrue(CorpMember.objects.filter(character_id='1', character_name='test character', corpstats=self.corpstats).exists())
@ -94,7 +94,7 @@ class CorpStatsUpdateTestCase(TestCase):
def test_update_remove_member(self, SwaggerClient): def test_update_remove_member(self, SwaggerClient):
CorpMember.objects.create(character_id='2', character_name='old test character', corpstats=self.corpstats) CorpMember.objects.create(character_id='2', character_name='old test character', corpstats=self.corpstats)
SwaggerClient.from_spec.return_value.Character.get_characters_character_id.return_value.result.return_value = {'corporation_id': 2} SwaggerClient.from_spec.return_value.Character.get_characters_character_id.return_value.result.return_value = {'corporation_id': 2}
SwaggerClient.from_spec.return_value.Corporation.get_corporations_corporation_id_members.return_value.result.return_value = [{'character_id': 1}] SwaggerClient.from_spec.return_value.Corporation.get_corporations_corporation_id_members.return_value.result.return_value = [1]
SwaggerClient.from_spec.return_value.Character.get_characters_names.return_value.result.return_value = [{'character_id': 1, 'character_name': 'test character'}] SwaggerClient.from_spec.return_value.Character.get_characters_names.return_value.result.return_value = [{'character_id': 1, 'character_name': 'test character'}]
self.corpstats.update() self.corpstats.update()
self.assertFalse(CorpMember.objects.filter(character_id='2', corpstats=self.corpstats).exists()) self.assertFalse(CorpMember.objects.filter(character_id='2', corpstats=self.corpstats).exists())

11
allianceauth/eveonline/providers.py
View File

@ -81,7 +81,9 @@ class Alliance(Entity):
@property @property
def executor_corp(self): def executor_corp(self):
if self.executor_corp_id:
return self.corp(self.executor_corp_id) return self.corp(self.executor_corp_id)
return Entity(None, None)
class Character(Entity): class Character(Entity):
@ -150,10 +152,10 @@ class EveSwaggerProvider(EveProvider):
corps = self.client.Alliance.get_alliances_alliance_id_corporations(alliance_id=alliance_id).result() corps = self.client.Alliance.get_alliances_alliance_id_corporations(alliance_id=alliance_id).result()
model = Alliance( model = Alliance(
id=alliance_id, id=alliance_id,
name=data['alliance_name'], name=data['name'],
ticker=data['ticker'], ticker=data['ticker'],
corp_ids=corps, corp_ids=corps,
executor_corp_id=data['executor_corp'], executor_corp_id=data['executor_corporation_id'] if 'executor_corporation_id' in data else None,
) )
return model return model
except HTTPNotFound: except HTTPNotFound:
@ -164,7 +166,7 @@ class EveSwaggerProvider(EveProvider):
data = self.client.Corporation.get_corporations_corporation_id(corporation_id=corp_id).result() data = self.client.Corporation.get_corporations_corporation_id(corporation_id=corp_id).result()
model = Corporation( model = Corporation(
id=corp_id, id=corp_id,
name=data['corporation_name'], name=data['name'],
ticker=data['ticker'], ticker=data['ticker'],
ceo_id=data['ceo_id'], ceo_id=data['ceo_id'],
members=data['member_count'], members=data['member_count'],
@ -177,12 +179,11 @@ class EveSwaggerProvider(EveProvider):
def get_character(self, character_id): def get_character(self, character_id):
try: try:
data = self.client.Character.get_characters_character_id(character_id=character_id).result() data = self.client.Character.get_characters_character_id(character_id=character_id).result()
alliance_id = self.adapter.get_corp(data['corporation_id']).alliance_id
model = Character( model = Character(
id=character_id, id=character_id,
name=data['name'], name=data['name'],
corp_id=data['corporation_id'], corp_id=data['corporation_id'],
alliance_id=alliance_id, alliance_id=data['alliance_id'] if 'alliance_id' in data else None,
) )
return model return model
except (HTTPNotFound, HTTPUnprocessableEntity): except (HTTPNotFound, HTTPUnprocessableEntity):

2
allianceauth/eveonline/swagger.json
View File

File diff suppressed because one or more lines are too long

2
allianceauth/fleetactivitytracking/swagger.json
View File

File diff suppressed because one or more lines are too long