Various updates to support server-aware calls per character

eos/db/migrations/upgrade47.py

@@ -0,0 +1,19 @@
+"""
+Migration 28
+
+- adds baseItemID and mutaplasmidID to modules table
+"""
+import sqlalchemy
+
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT server FROM ssoCharacter LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE ssoCharacter ADD COLUMN server VARCHAR;")
+        saveddata_engine.execute("UPDATE ssoCharacter SET server = 'Tranquility';")
+
+
+
+    # update all characters to TQ

eos/db/saveddata/character.py

@@ -44,6 +44,7 @@ sso_table = Table("ssoCharacter", saveddata_meta,
                     Column("client", String, nullable=False),
                     Column("characterID", Integer, nullable=False),
                     Column("characterName", String, nullable=False),
+                    Column("server", String, nullable=False),
                     Column("refreshToken", String, nullable=False),
                     Column("accessToken", String, nullable=False),
                     Column("accessTokenExpires", DateTime, nullable=False),

eos/db/saveddata/queries.py

@@ -493,9 +493,12 @@ def getSsoCharacters(clientHash, eager=None):
 
 
 @cachedQuery(SsoCharacter, 1, "lookfor", "clientHash")
-def getSsoCharacter(lookfor, clientHash, eager=None):
+def getSsoCharacter(lookfor, clientHash, server=None, eager=None):
     filter = SsoCharacter.client == clientHash
 
+    if server is not None:
+        filter = and_(filter, SsoCharacter.server == server)
+
     if isinstance(lookfor, int):
         filter = and_(filter, SsoCharacter.ID == lookfor)
     elif isinstance(lookfor, str):

eos/saveddata/ssocharacter.py

@@ -25,10 +25,11 @@ import time
 
 
 class SsoCharacter:
-    def __init__(self, charID, name, client, accessToken=None, refreshToken=None):
+    def __init__(self, charID, name, client, server, accessToken=None, refreshToken=None):
         self.characterID = charID
         self.characterName = name
         self.client = client
+        self.server = server
         self.accessToken = accessToken
         self.refreshToken = refreshToken
         self.accessTokenExpires = None
@@ -37,6 +38,9 @@ class SsoCharacter:
     def init(self):
         pass
 
+    @property
+    def characterDisplay(self):
+        return "{} [{}]".format(self.characterName, self.server)
     def is_token_expired(self):
         if self.accessTokenExpires is None:
             return True