|
1 | | -from sqlalchemy.orm import Session |
| 1 | +from sqlalchemy.future import select |
| 2 | +from sqlalchemy.ext.asyncio import AsyncSession |
2 | 3 | from models.users import User |
3 | 4 | from pydantic import EmailStr |
4 | 5 | from passlib.context import CryptContext |
5 | 6 | from schemas.users import UserCreate |
6 | 7 | from models.users import User |
7 | | -from database.database import SessionLocal |
| 8 | +import asyncio |
8 | 9 |
|
9 | 10 | hash_helper = CryptContext(schemes=["bcrypt"]) |
10 | 11 |
|
|
13 | 14 |
|
14 | 15 | class DaoUser(): |
15 | 16 |
|
16 | | - db : Session |
| 17 | + db : AsyncSession |
17 | 18 |
|
18 | | - def __init__(self, db: Session) -> None: |
| 19 | + def __init__(self, db: AsyncSession) -> None: |
19 | 20 | self.db = db |
20 | 21 |
|
21 | | - def get_users(self): |
| 22 | + async def get_users(self): |
22 | 23 | users = self.db.query(User).all() |
23 | 24 | return users |
24 | 25 |
|
25 | 26 |
|
26 | | - def get_user_by_email(self, email: str): |
27 | | - user = self.db.query(User).filter(User.email==email).first() |
| 27 | + async def get_user_by_email(self, email: str): |
| 28 | + |
| 29 | + result = await self.db.execute(select(User).where(User.email == email)) |
| 30 | + user = result.scalar_one_or_none() |
28 | 31 | return user |
29 | 32 |
|
30 | | - def get_user_by_id(self, user_id: int): |
31 | | - user = self.db.query(User).filter(User.id==user_id).first() |
| 33 | + async def get_user_by_id(self, user_id: int): |
| 34 | + result = await self.db.execute(select(User).where(User.id == user_id)) |
| 35 | + user = result.scalar_one_or_none() |
32 | 36 | return user |
33 | 37 |
|
34 | 38 |
|
35 | | - def create_new_user(self, user: UserCreate): |
| 39 | + async def create_new_user(self, user: UserCreate): |
36 | 40 | user_db = User(email=user.email, fullname=user.fullname, password = hash_helper.encrypt(user.password)) |
37 | 41 | self.db.add(user_db) |
38 | | - self.db.commit() |
39 | | - self.db.refresh(user_db) |
| 42 | + await self.db.commit() |
| 43 | + await self.db.refresh(user_db) |
40 | 44 | return user_db |
41 | 45 |
|
42 | | - def get_users(self, skip: int = 0, limit: int = 100): |
43 | | - return self.db.query(User).offset(skip).limit(limit).all() |
| 46 | + async def get_users(self, skip: int = 0, limit: int = 100): |
| 47 | + result = await self.db.execute(select(User).offset(skip).limit(limit)) |
| 48 | + users = result.scalars() |
| 49 | + return users |
44 | 50 |
|
45 | 51 |
|
46 | | - def delete_user(self, user): |
| 52 | + async def delete_user(self, user): |
47 | 53 |
|
48 | | - self.db.delete(user) |
49 | | - self.db.commit() |
| 54 | + await self.db.delete(user) |
| 55 | + await self.db.commit() |
50 | 56 |
|
51 | 57 |
|
52 | 58 |
|
|
0 commit comments