fix #36 upgrade cached user to local user

Author: davidism

sopy/auth/models.py

@@ -97,6 +97,17 @@ def oauth_load(cls, token=None):
 
         return o.se_update(data)
 
+    @classmethod
+    def create_unique(cls, session, id):
+        # if the site user was cached, manually upgrade it to a local user
+        if SEUser.query.get(id) is not None:
+            session.execute(cls.__table__.insert().values(id=id))
+            return cls.query.get(id)
+
+        o = cls(id=id)
+        session.add(o)
+        return o
+
 
 user_group = db.Table(
     'user_group',

sopy/ext/sqlalchemy.py

@@ -38,6 +38,13 @@ def __hash__(self):
 class UniqueMixin:
     """Keep a cache of unique instances in memory so new instances can be safely created in bulk before they are committed."""
 
+    @classmethod
+    def create_unique(cls, session, **kwargs):
+        o = cls(**kwargs)
+        session.add(o)
+        return o
+
+
     @classmethod
     def get_unique(cls, **kwargs):
         g._unique_cache = cache = getattr(g, '_unique_cache', {})
@@ -54,8 +61,7 @@ def get_unique(cls, **kwargs):
                 o = session.query(cls).filter_by(**kwargs).first()
 
             if o is None:
-                o = cls(**kwargs)
-                session.add(o)
+                o = cls.create_unique(session, **kwargs)
 
             cache[key] = o
 

sopy/se_data/models/models.py

@@ -16,7 +16,7 @@ class SEUser(ExternalIDModel):
     reputation = db.Column(db.Integer, nullable=False)
 
     def __str__(self):
-        return self.display_name
+        return '{} {}'.format(self.id, self.display_name)
 
     @classmethod
     def se_load(cls, ident, update=True):