All the queries done (sync version)

Author: mikeckennedy

code/ch7-databases/db/pypi.sqlite

@@ -14,11 +14,53 @@ def user_count() -> int:
 
 
 def create_account(name: str, email: str, password: str) -> User:
-    return User(name, email, 'abc')
+    session = db_session.create_session()
+
+    try:
+        user = User()
+        user.email = email
+        user.name = name
+        # TODO: Set proper password
+        user.hash_password = "TBD"
+
+        session.add(user)
+        session.commit()
+
+        return user
+    finally:
+        session.close()
 
 
 def login_user(email: str, password: str) -> Optional[User]:
-    if password == 'abc':
-        return User("test user", email, 'abc')
+    session = db_session.create_session()
+
+    try:
+        user = session.query(User).filter(User.email == email).first()
+        if not user:
+            return user
+
+        # TODO: Verify password
+        if False:
+            return None
+
+        return user
+    finally:
+        session.close()
 
-    return None
+
+def get_user_by_id(user_id: int) -> Optional[User]:
+    session = db_session.create_session()
+
+    try:
+        return session.query(User).filter(User.id == user_id).first()
+    finally:
+        session.close()
+
+
+def get_user_by_email(email: str) -> Optional[User]:
+    session = db_session.create_session()
+
+    try:
+        return session.query(User).filter(User.email == email).first()
+    finally:
+        session.close()

code/ch7-databases/services/user_service.py

@@ -1,10 +1,12 @@
 from starlette.requests import Request
 
 from data.user import User
+from services import user_service
 from viewmodels.shared.viewmodel import ViewModelBase
 
 
 class AccountViewModel(ViewModelBase):
     def __init__(self, request: Request):
         super().__init__(request)
-        self.user = User('Michael', 'michael@talkpython.fm', '9hsdhhsy74s')
+
+        self.user = user_service.get_user_by_id(self.user_id)

code/ch7-databases/viewmodels/account/account_viewmodel.py

@@ -2,6 +2,7 @@
 
 from starlette.requests import Request
 
+from services import user_service
 from viewmodels.shared.viewmodel import ViewModelBase
 
 
@@ -25,3 +26,5 @@ async def load(self):
             self.error = "Your email is required."
         elif not self.password or len(self.password) < 5:
             self.error = "Your password is required and must be at 5 characters."
+        elif user_service.get_user_by_email(self.email):
+            self.error = "That email is already taken. Log in instead?"

code/ch7-databases/viewmodels/account/register_viewmodel.py

@@ -10,10 +10,10 @@ class ViewModelBase:
     def __init__(self, request: Request):
         self.request: Request = request
         self.error: Optional[str] = None
-        self.user_id: Optional[int] = None
+        self.user_id: Optional[int] = cookie_auth.get_user_id_via_auth_cookie(self.request)
 
         # We'll get this once we have users from the cookies.
-        self.is_logged_in = cookie_auth.get_user_id_via_auth_cookie(self.request)
+        self.is_logged_in = self.user_id is not None
 
     def to_dict(self) -> dict:
         return self.__dict__