fix: use dependency instead of db.next
This commit is contained in:
parent
2d60b4fcc5
commit
1a81be210a
2 changed files with 10 additions and 7 deletions
|
|
@ -6,29 +6,31 @@ Exports:
|
|||
"""
|
||||
from typing import Any
|
||||
|
||||
from src.database import get_db
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from src.exceptions import UnprocessableContentException
|
||||
|
||||
from src.user.schemas import OIDCUser
|
||||
from src.user.models import User
|
||||
|
||||
|
||||
async def add_user_to_db(user_claims: dict[str, Any]) -> int:
|
||||
async def add_user_to_db(db: Session, user_claims: dict[str, Any]) -> int:
|
||||
try:
|
||||
valid_user = OIDCUser(first_name=user_claims["given_name"], last_name=user_claims["family_name"], email=user_claims["email"], oidc_id=user_claims["sub"])
|
||||
except Exception as e:
|
||||
print(e)
|
||||
raise UnprocessableContentException("Invalid or missing OIDC data")
|
||||
|
||||
db = next(get_db())
|
||||
db_user = db.query(User).filter(User.oidc_id == valid_user.oidc_id).first()
|
||||
|
||||
if not db_user:
|
||||
user_model = User(**valid_user.model_dump())
|
||||
db.add(user_model)
|
||||
user_id = user_model.id
|
||||
db.commit()
|
||||
return user_model.id
|
||||
return user_id
|
||||
else:
|
||||
user_id = db_user.id
|
||||
change = False
|
||||
if db_user.first_name != valid_user.first_name:
|
||||
db_user.first_name = valid_user.first_name
|
||||
|
|
@ -39,4 +41,4 @@ async def add_user_to_db(user_claims: dict[str, Any]) -> int:
|
|||
if change:
|
||||
db.add(db_user)
|
||||
db.commit()
|
||||
return db_user.id
|
||||
return user_id
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue