Removed in-model functions for corp updates, switch to tasks. Cleaned up and improved API tasks

eve_api/tasks/corporation.py

@@ -3,18 +3,65 @@ from xml.dom import minidom
 
 from celery.decorators import task
 from eve_proxy.models import CachedDocument
-from eve_api.models import EVEPlayerCorporation
-from eve_api.api_puller.corp_management import pull_corp_members
-from eve_api.utils import basic_xml_parse
-
+from eve_api.models import EVEPlayerCorporation, EVEPlayerCharacter
+from eve_api.utils import basic_xml_parse_doc
+from eve_api.tasks.character import import_eve_character
         
 @task(ignore_result=True)
 def import_corp_details(corp_id):
-    corp, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
+    import_corp_details_func(corp_id)
+
+@task()
+def import_corp_details_result(corp_id):
+    return import_corp_details_func(corp_id)
+
+
+def import_corp_details_func(corp_id):
+    corpobj, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
     
-    if created or not corp.api_last_updated or corp.api_last_updated < (datetime.utcnow() - timedelta(hours=12)):
-        corp.query_and_update_corp()
-        corp.save()
+    if created or not corpobj.api_last_updated or corpobj.api_last_updated < (datetime.utcnow() - timedelta(hours=12)):
+
+        doc = CachedDocument.objects.api_query('/corp/CorporationSheet.xml.aspx', {'corporationID': corp_id})
+        d = basic_xml_parse_doc(doc)['eveapi']['result']
+
+        tag_mappings = (
+            ('corporationName', 'name'),
+            ('ticker', 'ticker'),
+            ('url', 'url'),
+            ('description', 'description'),
+            ('memberCount', 'member_count'),
+        )
+
+        for tag_map in tag_mappings:
+            setattr(corpobj, tag_map[1], d[tag_map[0]])
+
+        logo_mappings = (
+            ('graphicID', 'logo_graphic_id'),
+            ('shape1', 'logo_shape1'),
+            ('shape2', 'logo_shape2'),
+            ('shape3', 'logo_shape3'),
+            ('color1', 'logo_color1'),
+            ('color2', 'logo_color2'),
+            ('color3', 'logo_color3'),
+        )
+
+        for logo_map in logo_mappings:
+            setattr(corpobj, logo_map[1], d['logo'][logo_map[0]])
+
+        import_eve_character.delay(d['ceoID'], callback=link_ceo.subtask(corporation=corpobj.id))
+
+        corpobj.api_last_updated = datetime.utcnow()
+        corpobj.save()
+
+    return EVEPlayerCorporation.objects.get(pk=corpobj.pk)
+
+
+@task(ignore_result=True)
+def link_ceo(corporation, character):
+    """ Links a character to the CEO position of a corporation """
+    corpobj = EVEPlayerCorporation.objects.get(id=corporation)
+    corpobj.ceo_character = EVEPlayerCharacter.objects.get(id=character)
+    corpobj.save()
 
 
 @task(ignore_result=True)