Simplify room login code

Moutix · Feb 17, 2017 · 6f34b9f · 6f34b9f
1 parent 112f44d
commit 6f34b9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/smserver/models/room.py b/smserver/models/room.py
@@ -231,11 +231,8 @@ def login(cls, name, password, session):
             .filter_by(name=name)
             .filter(or_(
                 cls.password.is_(None),
-                and_(
-                    cls.password.isnot(None),
-                    cls.password == password
-                )))
-            .one_or_none()
+                cls.password == password
+            )).one_or_none()
             )
 
     @classmethod

diff --git a/test/test_models/test_room.py b/test/test_models/test_room.py
@@ -73,13 +73,19 @@ def test_login(self):
             models.Room.login("name", "pass", self.session)
         )
 
+        # Room without password
         room = RoomFactory(name="Room 1")
 
         self.assertEqual(
             models.Room.login("Room 1", None, self.session),
             room
         )
+        self.assertEqual(
+            models.Room.login("Room 1", "password", self.session),
+            room
+        )
 
+        # Room with password
         password = hashlib.sha256("pass".encode('utf-8')).hexdigest()
         room = RoomFactory(name="Room 2", password=password)