Change codebase to query or create correct User model

The code base had many references to User.username and other
specific to LocalUser attributes as that was the way it use to exist.
This updates those to query on the generic User model but filtering
by attributes on the LocalUser.

3 files changed, 21 insertions, 10 deletions

diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py
index 2aa8f96a..2c376b76 100644
--- a/mediagoblin/gmg_commands/addmedia.py
+++ b/mediagoblin/gmg_commands/addmedia.py
@@ -20,6 +20,7 @@ import os
 
 import six
 
+from mediagoblin.db.models import LocalUser
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin.submit.lib import (
     submit_media, get_upload_file_limits,
@@ -70,7 +71,9 @@ def addmedia(args):
     app = commands_util.setup_app(args)
 
     # get the user
-    user = app.db.User.query.filter_by(username=args.username.lower()).first()
+    user = app.db.User.query.filter(
+        LocalUser.username==args.username.lower()
+    ).first()
     if user is None:
         print("Sorry, no user by username '%s'" % args.username)
         return
diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py
index 5a47d698..8012d5e9 100644
--- a/mediagoblin/gmg_commands/batchaddmedia.py
+++ b/mediagoblin/gmg_commands/batchaddmedia.py
@@ -25,6 +25,7 @@ import six
 
 from six.moves.urllib.parse import urlparse
 
+from mediagoblin.db.models import LocalUser
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin.submit.lib import (
     submit_media, get_upload_file_limits,
@@ -64,7 +65,9 @@ def batchaddmedia(args):
     files_uploaded, files_attempted = 0, 0
 
     # get the user
-    user = app.db.User.query.filter_by(username=args.username.lower()).first()
+    user = app.db.User.query.filter(
+        LocalUser.username==args.username.lower()
+    ).first()
     if user is None:
         print(_(u"Sorry, no user by username '{username}' exists".format(
                     username=args.username)))
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index 33abc891..0916308d 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -20,6 +20,7 @@ import sys
 
 import six
 
+from mediagoblin.db.models import LocalUser
 from mediagoblin.gmg_commands import util as commands_util
 from mediagoblin import auth
 from mediagoblin import mg_globals
@@ -46,8 +47,8 @@ def adduser(args):
 
     db = mg_globals.database
     users_with_username = \
-        db.User.query.filter_by(
-            username=args.username.lower()
+        db.User.query.filter(
+            LocalUser.username==args.username.lower()
         ).count()
 
     if users_with_username:
@@ -56,7 +57,7 @@ def adduser(args):
 
     else:
         # Create the user
-        entry = db.User()
+        entry = db.LocalUser()
         entry.username = six.text_type(args.username.lower())
         entry.email = six.text_type(args.email)
         entry.pw_hash = auth.gen_password_hash(args.password)
@@ -87,8 +88,9 @@ def makeadmin(args):
 
     db = mg_globals.database
 
-    user = db.User.query.filter_by(
-        username=six.text_type(args.username.lower())).one()
+    user = db.User.query.filter(
+        LocalUser.username==six.text_type(args.username.lower())
+    ).one()
     if user:
         user.all_privileges.append(
             db.Privilege.query.filter(
@@ -115,8 +117,9 @@ def changepw(args):
 
     db = mg_globals.database
 
-    user = db.User.query.filter_by(
-        username=six.text_type(args.username.lower())).one()
+    user = db.User.query.filter(
+        LocalUser.username==six.text_type(args.username.lower())
+    ).one()
     if user:
         user.pw_hash = auth.gen_password_hash(args.password)
         user.save()
@@ -138,7 +141,9 @@ def deleteuser(args):
 
     db = mg_globals.database
 
-    user = db.User.query.filter_by(username=args.username.lower()).first()
+    user = db.User.query.filter(
+        LocalUser.username==args.username.lower()
+    ).first()
     if user:
         user.delete()
         print('The user %s has been deleted' % args.username)