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

Corrects logic to create owner corp model with appropriate alliance, if applicable.

Browse Source 
Properly gets corp alliance ID from api information when checking alliance models.
This commit is contained in:
Adarnof 2015-11-27 23:59:08 +00:00
parent 20362625ea
commit 42e833b2e0
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
celerytask/tasks.py
View File

@ -328,10 +328,20 @@ def run_corp_update():
if settings.IS_CORP: if settings.IS_CORP:
# Create the corp # Create the corp
corpinfo = EveApiManager.get_corporation_information(settings.CORP_ID) ownercorpinfo = EveApiManager.get_corporation_information(settings.CORP_ID)
if not EveManager.check_if_corporation_exists_by_id(corpinfo['id']): if not EveManager.check_if_corporation_exists_by_id(ownercorpinfo['id']):
EveManager.create_corporation_info(corpinfo['id'], corpinfo['name'], corpinfo['ticker'], if ownercorpinfo['alliance']['id'] is None:
corpinfo['members']['current'], False, None) EveManager.create_corporation_info(ownercorpinfo['id'], ownercorpinfo['name'], ownercorpinfo['ticker'],
ownercorpinfo['members']['current'], False, None)
else:
alliance_info = EveApiManager.get_alliance_information(ownercorpinfo['alliance']['id'])
if not EveManager.check_if_alliance_exists_by_id(settings.ALLIANCE_ID):
EveManager.create_alliance_info(settings.ALLIANCE_ID, alliance_info['name'], alliance_info['ticker'],
alliance_info['executor_id'], alliance_info['member_count'], False)
alliance = EveManager.get_alliance_info_by_id(ownercorpinfo['alliance']['id'])
EveManager.create_corporation_info(ownercorpinfo['id'], ownercorpinfo['name'], ownercorpinfo['ticker'],
ownercorpinfo['members']['current'], False, alliance)
else: else:
# Updated alliance info # Updated alliance info
alliance_info = EveApiManager.get_alliance_information(settings.ALLIANCE_ID) alliance_info = EveApiManager.get_alliance_information(settings.ALLIANCE_ID)
@ -470,8 +480,8 @@ def run_corp_update():
for all_alliance_info in EveManager.get_all_alliance_info(): for all_alliance_info in EveManager.get_all_alliance_info():
if settings.IS_CORP: if settings.IS_CORP:
if all_alliance_info.is_blue is not True: if all_alliance_info.is_blue is not True:
if corpinfo.alliance is not None: if ownercorpinfo['alliance']['id'] is not None:
if all_alliance_info.alliance_id != corpinfo.alliance.alliance_id: if all_alliance_info.alliance_id != ownercorpinfo['alliance']['id']:
all_alliance_info.delete() all_alliance_info.delete()
else: else:
all_alliance_info.delete() all_alliance_info.delete()