users: migrate last_activity column so it's part of user table.

- allows quicker update
- allows sorting by that column

rhodecode/lib/dbmigrate/versions/069_version_4_7_0.py

@@ -0,0 +1,27 b''
+import logging
+
+from sqlalchemy import Column, MetaData, Integer, Unicode, ForeignKey, DateTime
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_7_0_0 as db
+
+    # add last_activity
+    user_table = db.User.__table__
+    col1 = Column(
+        'last_activity', DateTime(timezone=False), nullable=True, unique=None)
+    col1.create(table=user_table)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine

rhodecode/lib/dbmigrate/versions/070_version_4_7_0.py

@@ -0,0 +1,56 b''
+import logging
+import datetime
+
+from sqlalchemy import *
+
+from rhodecode.lib.utils2 import safe_str
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def time_to_datetime(tm):
+    if tm:
+        if isinstance(tm, basestring):
+            try:
+                tm = float(tm)
+            except ValueError:
+                return
+        return datetime.datetime.fromtimestamp(tm)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_7_0_1
+
+    # fixups
+    fixups(db_4_7_0_1, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def _migrate_user(db, user):
+    last_activity = time_to_datetime(user.user_data.get('last_activity', 0))
+    user.last_activity = last_activity
+    return user
+
+
+def fixups(models, _SESSION):
+    # move the builtin token to external tokens
+
+    query = models.User.query().all()
+    for user in query:
+        migrated_user = _migrate_user(models, user)
+        _SESSION.add(migrated_user)
+        log.info(
+            "Migrating last_activity of user '%s'.", safe_str(user.username))
+
+    _SESSION().commit()

rhodecode/__init__.py

@@ -51,7 +51,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 68  # defines current db version for migrations
+__dbversion__ = 70  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/model/db.py

@@ -514,6 +514,8 b' class User(Base, BaseModel):'
     lastname = Column("lastname", String(255), nullable=True, unique=None, default=None)
     _email = Column("email", String(255), nullable=True, unique=None, default=None)
     last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
+    last_activity = Column('last_activity', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
+
     extern_type = Column("extern_type", String(255), nullable=True, unique=None, default=None)
     extern_name = Column("extern_name", String(255), nullable=True, unique=None, default=None)
     _api_key = Column("api_key", String(255), nullable=True, unique=None, default=None)