Various misc model fixes

Author: madcowfred

thing/models/__init__.py

@@ -1,53 +1,53 @@
 # Locations
-from .constellation import Constellation
-from .region import Region
-from .system import System
-from .station import Station
+from thing.models.region import Region
+from thing.models.constellation import Constellation
+from thing.models.system import System
+from thing.models.station import Station
 
 # Entities
-from .faction import Faction
-from .alliance import Alliance
-from .corporation import Corporation
-from .character import Character
+from thing.models.faction import Faction
+from thing.models.alliance import Alliance
+from thing.models.corporation import Corporation
+from thing.models.character import Character
 
 #
-from .inventoryflag import InventoryFlag
-from .reftype import RefType
+from thing.models.inventoryflag import InventoryFlag
+from thing.models.reftype import RefType
 
 # Items
-from .marketgroup import MarketGroup
-from .itemcategory import ItemCategory
-from .itemgroup import ItemGroup
-from .item import Item
-from .blueprint import Blueprint
-from .skill import Skill
+from thing.models.marketgroup import MarketGroup
+from thing.models.itemcategory import ItemCategory
+from thing.models.itemgroup import ItemGroup
+from thing.models.item import Item
+from thing.models.blueprint import Blueprint
+from thing.models.skill import Skill
 
 # Everything else
-from .apikey import APIKey
-from .apikeyfailure import APIKeyFailure
-from .asset import Asset
-from .assetsummary import AssetSummary
-from .blueprintcomponent import BlueprintComponent
-from .blueprintinstance import BlueprintInstance
-from .campaign import Campaign
-from .characterconfig import CharacterConfig
-from .characterdetails import CharacterDetails
-from .characterskill import CharacterSkill
-from .contract import Contract
-from .contractitem import ContractItem
-from .corporationstanding import CorporationStanding
-from .corpwallet import CorpWallet
-from .event import Event
-from .factionstanding import FactionStanding
-from .industryjob import IndustryJob
-from .journalentry import JournalEntry
-from .marketorder import MarketOrder
-from .pricehistory import PriceHistory
-from .skillplan import SkillPlan
-from .skillqueue import SkillQueue
-from .spentry import SPEntry
-from .spremap import SPRemap
-from .spskill import SPSkill
-from .taskstate import TaskState
-from .transaction import Transaction
-from .userprofile import UserProfile
+from thing.models.apikey import APIKey
+from thing.models.apikeyfailure import APIKeyFailure
+from thing.models.asset import Asset
+from thing.models.assetsummary import AssetSummary
+from thing.models.blueprintcomponent import BlueprintComponent
+from thing.models.blueprintinstance import BlueprintInstance
+from thing.models.campaign import Campaign
+from thing.models.characterconfig import CharacterConfig
+from thing.models.characterdetails import CharacterDetails
+from thing.models.characterskill import CharacterSkill
+from thing.models.contract import Contract
+from thing.models.contractitem import ContractItem
+from thing.models.corporationstanding import CorporationStanding
+from thing.models.corpwallet import CorpWallet
+from thing.models.event import Event
+from thing.models.factionstanding import FactionStanding
+from thing.models.industryjob import IndustryJob
+from thing.models.journalentry import JournalEntry
+from thing.models.marketorder import MarketOrder
+from thing.models.pricehistory import PriceHistory
+from thing.models.skillplan import SkillPlan
+from thing.models.skillqueue import SkillQueue
+from thing.models.spentry import SPEntry
+from thing.models.spremap import SPRemap
+from thing.models.spskill import SPSkill
+from thing.models.taskstate import TaskState
+from thing.models.transaction import Transaction
+from thing.models.userprofile import UserProfile

thing/models/apikey.py

@@ -32,6 +32,8 @@
 
 from core.util import total_seconds
 
+from thing.models.character import Character
+
 # ------------------------------------------------------------------------------
 # API keys
 class APIKey(models.Model):
@@ -105,10 +107,14 @@ class APIKey(models.Model):
     created_at = models.DateTimeField(auto_now=True)
     valid = models.BooleanField(default=True)
 
-    characters = models.ManyToManyField('Character', related_name='apikeys')
+    characters = models.ManyToManyField(Character, related_name='apikeys')
 
     # this is only used for corporate keys, ugh
-    corp_character = models.ForeignKey('Character', null=True, blank=True, related_name='corporate_apikey')
+    corp_character = models.ForeignKey(Character, null=True, blank=True, related_name='corporate_apikey')
+
+    class Meta:
+        app_label = 'thing'
+        ordering = ('keyid',)
 
     def __unicode__(self):
         return '#%s, keyId: %s (%s)' % (self.id, self.keyid, self.key_type)
@@ -149,8 +155,4 @@ def purge_data(self):
 
         send_task('thing.purge_api_key', args=[self.id], kwargs={}, queue='et_high')
 
-    class Meta:
-        app_label = 'thing'
-        ordering = ('keyid',)
-
 # ------------------------------------------------------------------------------

thing/models/asset.py

@@ -26,20 +26,26 @@
 from django.contrib.auth.models import User
 from django.db import models
 
+from thing.models.character import Character
+from thing.models.inventoryflag import InventoryFlag
+from thing.models.item import Item
+from thing.models.station import Station
+from thing.models.system import System
+
 # ------------------------------------------------------------------------------
 # Assets
 class Asset(models.Model):
     asset_id = models.BigIntegerField(db_index=True)
     parent = models.BigIntegerField(default=0)
 
-    character = models.ForeignKey('Character')
+    character = models.ForeignKey(Character)
     corporation_id = models.IntegerField(default=0, db_index=True)
-    system = models.ForeignKey('System')
-    station = models.ForeignKey('Station', blank=True, null=True)
+    system = models.ForeignKey(System)
+    station = models.ForeignKey(Station, blank=True, null=True)
 
-    item = models.ForeignKey('Item')
+    item = models.ForeignKey(Item)
     name = models.CharField(max_length=128, default='')
-    inv_flag = models.ForeignKey('InventoryFlag')
+    inv_flag = models.ForeignKey(InventoryFlag)
     quantity = models.IntegerField()
     raw_quantity = models.IntegerField()
     singleton = models.BooleanField()

thing/models/assetsummary.py

@@ -25,13 +25,17 @@
 
 from django.db import models
 
+from thing.models.character import Character
+from thing.models.station import Station
+from thing.models.system import System
+
 # ------------------------------------------------------------------------------
 
 class AssetSummary(models.Model):
-    character = models.ForeignKey('Character')
+    character = models.ForeignKey(Character)
     corporation_id = models.IntegerField(default=0)
-    system = models.ForeignKey('System')
-    station = models.ForeignKey('Station', blank=True, null=True)
+    system = models.ForeignKey(System)
+    station = models.ForeignKey(Station, blank=True, null=True)
 
     total_items = models.BigIntegerField()
     # 1,234,567,890.12

thing/models/blueprint.py

@@ -23,22 +23,24 @@
 # OF SUCH DAMAGE.
 # ------------------------------------------------------------------------------
 
-from django.contrib.auth.models import User
 from django.db import models
 
+#from thing.models.blueprintcomponent import BlueprintComponent
+from thing.models.item import Item
+
 # ------------------------------------------------------------------------------
 # Blueprints
 class Blueprint(models.Model):
     id = models.IntegerField(primary_key=True)
     name = models.CharField(max_length=128)
-    item = models.ForeignKey('Item')
+    item = models.ForeignKey(Item)
 
     production_time = models.IntegerField()
     productivity_modifier = models.IntegerField()
     material_modifier = models.IntegerField()
     waste_factor = models.IntegerField()
 
-    components = models.ManyToManyField('Item', related_name='component_of', through='BlueprintComponent')
+    #components = models.ManyToManyField(Item, related_name='component_of', through='BlueprintComponent')
 
     class Meta:
         app_label = 'thing'

thing/models/blueprintcomponent.py

@@ -25,12 +25,15 @@
 
 from django.db import models
 
+from thing.models.blueprint import Blueprint
+from thing.models.item import Item
+
 # ------------------------------------------------------------------------------
 # Blueprint components
 class BlueprintComponent(models.Model):
-    blueprint = models.ForeignKey('Blueprint')
+    blueprint = models.ForeignKey(Blueprint)
 
-    item = models.ForeignKey('Item')
+    item = models.ForeignKey(Item)
     count = models.IntegerField()
     needs_waste = models.BooleanField(default=True)
 

thing/models/blueprintinstance.py

@@ -26,11 +26,13 @@
 from django.contrib.auth.models import User
 from django.db import models
 
+from thing.models.blueprint import Blueprint
+
 # ------------------------------------------------------------------------------
 # Blueprint instances - an owned blueprint
 class BlueprintInstance(models.Model):
     user = models.ForeignKey(User, blank=True, null=True)
-    blueprint = models.ForeignKey('Blueprint')
+    blueprint = models.ForeignKey(Blueprint)
 
     original = models.BooleanField()
     material_level = models.IntegerField(default=0)

thing/models/campaign.py

@@ -26,6 +26,9 @@
 from django.contrib.auth.models import User
 from django.db import models
 
+from thing.models.character import Character
+from thing.models.corpwallet import CorpWallet
+
 # ------------------------------------------------------------------------------
 
 class Campaign(models.Model):
@@ -36,8 +39,8 @@ class Campaign(models.Model):
     start_date = models.DateTimeField()
     end_date = models.DateTimeField()
 
-    corp_wallets = models.ManyToManyField('CorpWallet', blank=True, null=True)
-    characters = models.ManyToManyField('Character', blank=True, null=True)
+    corp_wallets = models.ManyToManyField(CorpWallet, blank=True, null=True)
+    characters = models.ManyToManyField(Character, blank=True, null=True)
 
     class Meta:
         app_label = 'thing'

thing/models/character.py

@@ -25,10 +25,13 @@
 
 from django.db import models
 
-from .characterskill import CharacterSkill
-from .corporation import Corporation
-from .faction import Faction
-from .skill import Skill
+#from thing.models.characterskill import CharacterSkill
+from thing.models.corporation import Corporation
+from thing.models.corporationstanding import CorporationStanding
+from thing.models.faction import Faction
+from thing.models.factionstanding import FactionStanding
+from thing.models.skill import Skill
+#from thing.models.skillqueue import SkillQueue
 
 # ------------------------------------------------------------------------------
 
@@ -39,12 +42,12 @@ class Character(models.Model):
     corporation = models.ForeignKey(Corporation, blank=True, null=True)
 
     # Skill stuff
-    skills = models.ManyToManyField(Skill, related_name='learned_by', through='CharacterSkill')
-    skill_queue = models.ManyToManyField(Skill, related_name='training_by', through='SkillQueue')
+    #skills = models.ManyToManyField(Skill, related_name='learned_by', through='CharacterSkill')
+    #skill_queue = models.ManyToManyField(Skill, related_name='training_by', through='SkillQueue')
 
     # Standings stuff
-    faction_standings = models.ManyToManyField(Faction, related_name='has_standings', through='FactionStanding')
-    corporation_standings = models.ManyToManyField(Corporation, related_name='has_standings', through='CorporationStanding')
+    #faction_standings = models.ManyToManyField(Faction, related_name='has_standings', through='FactionStanding')
+    #corporation_standings = models.ManyToManyField(Corporation, related_name='has_standings', through='CorporationStanding')
 
     class Meta:
         app_label = 'thing'

thing/models/characterconfig.py

@@ -25,10 +25,12 @@
 
 from django.db import models
 
+from thing.models.character import Character
+
 # ------------------------------------------------------------------------------
 # Character configuration information
 class CharacterConfig(models.Model):
-    character = models.OneToOneField('Character', unique=True, primary_key=True, related_name='config')
+    character = models.OneToOneField(Character, unique=True, primary_key=True, related_name='config')
 
     is_public = models.BooleanField(default=False)
     show_clone = models.BooleanField(default=False)