move disabled_utc to be with the other fields

fixes #116

keg_auth/model/__init__.py

@@ -80,6 +80,10 @@ class UserMixin(object):
     # when a user logs in.
     last_login_utc = sa.Column(ArrowType, nullable=True, default=None, server_default=None)
 
+    # The datetime when a user will be disabled. User will be inactive if this is set
+    # to a datetime in the past.
+    disabled_utc = sa.Column(ArrowType, nullable=True, default=None, server_default=sa.null())
+
     # is_active defines the complexities of how to determine what users are active. For instance,
     #   if email is in scope, we need to have an additional flag to verify users, and that would
     #   get included in is_active logic.
@@ -105,10 +109,6 @@ def is_disabled_by_date(cls):
         )
         return sa_sql.case([(is_disabled_expr, sa.true())], else_=sa.false())
 
-    # The datetime when a user will be disabled. User will be inactive if this is set
-    # to a datetime in the past.
-    disabled_utc = sa.Column(ArrowType, nullable=True, default=None, server_default=sa.null())
-
     def get_id(self):
         # Flask-Login requires that this return a string value for the session
         return str(self.session_key)