User.all accepts both userids and usernames now. Fixes #162

lastuser_core/models/user.py

@@ -326,14 +326,21 @@ def all(cls, userids=None, usernames=None, defercols=False):
         :param bool defercols: Defer loading non-critical columns
         """
         users = set()
-        if userids:
+        if userids and usernames:
+            query = cls.query.filter(or_(cls.userid.in_(userids), cls.username.in_(usernames)))
+        elif userids:
             query = cls.query.filter(cls.userid.in_(userids))
-            if defercols:
-                query = query.options(*cls._defercols)
-            for user in query.all():
-                user = user.merged_user()
-                if user.is_active:
-                    users.add(user)
+        elif usernames:
+            query = cls.query.filter(cls.username.in_(usernames))
+        else:
+            raise Exception
+
+        if defercols:
+            query = query.options(*cls._defercols)
+        for user in query.all():
+            user = user.merged_user()
+            if user.is_active:
+                users.add(user)
         return list(users)
 
     @classmethod