This commit is contained in:
@@ -109,7 +109,7 @@ def callback(code: str, session: Session = Depends(get_session)):
|
|||||||
|
|
||||||
user_create = UserCreate(
|
user_create = UserCreate(
|
||||||
email=decoded_token.get('email'),
|
email=decoded_token.get('email'),
|
||||||
name=decoded_token.get('preferred_username'),
|
name=decoded_token.get('name'),
|
||||||
role_names=roles['roles']
|
role_names=roles['roles']
|
||||||
)
|
)
|
||||||
service.get_or_create_user(session, user_create)
|
service.get_or_create_user(session, user_create)
|
||||||
|
|||||||
@@ -95,8 +95,7 @@ async def create_contract(
|
|||||||
pdf_file = io.BytesIO(pdf_bytes)
|
pdf_file = io.BytesIO(pdf_bytes)
|
||||||
contract_id = f'{new_contract.firstname}_{new_contract.lastname}_{new_contract.form.productor.type}_{new_contract.form.season}'
|
contract_id = f'{new_contract.firstname}_{new_contract.lastname}_{new_contract.form.productor.type}_{new_contract.form.season}'
|
||||||
service.add_contract_file(session, new_contract.id, pdf_bytes, price)
|
service.add_contract_file(session, new_contract.id, pdf_bytes, price)
|
||||||
except Exception as e:
|
except Exception:
|
||||||
print(e)
|
|
||||||
raise HTTPException(status_code=400, detail=messages.pdferror)
|
raise HTTPException(status_code=400, detail=messages.pdferror)
|
||||||
return StreamingResponse(
|
return StreamingResponse(
|
||||||
pdf_file,
|
pdf_file,
|
||||||
|
|||||||
@@ -69,13 +69,11 @@ def update_one(session: Session, id: int, user: models.UserCreate) -> models.Use
|
|||||||
if not new_user:
|
if not new_user:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
user_updates = user.model_dump(exclude="role_names")
|
new_user.email = user.email
|
||||||
for key, value in user_updates.items():
|
new_user.name = user.name
|
||||||
setattr(new_user, key, value)
|
|
||||||
|
|
||||||
roles = get_or_create_roles(session, user.role_names)
|
roles = get_or_create_roles(session, user.role_names)
|
||||||
new_user.roles = roles
|
new_user.roles = roles
|
||||||
|
|
||||||
session.add(new_user)
|
session.add(new_user)
|
||||||
session.commit()
|
session.commit()
|
||||||
session.refresh(new_user)
|
session.refresh(new_user)
|
||||||
|
|||||||
Reference in New Issue
Block a user