Remove some old crud functions
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
from sqlmodel import Session
|
||||
|
||||
from app import crud
|
||||
from app.models import Item, ItemCreate
|
||||
from app.tests.utils.user import create_random_user
|
||||
from app.tests.utils.utils import random_lower_string
|
||||
|
||||
|
||||
def create_random_item(db: Session) -> Item:
|
||||
user = create_random_user(db)
|
||||
owner_id = user.id
|
||||
assert owner_id is not None
|
||||
title = random_lower_string()
|
||||
description = random_lower_string()
|
||||
item_in = ItemCreate(title=title, description=description)
|
||||
return crud.create_item(session=db, item_in=item_in, owner_id=owner_id)
|
||||
@@ -1,9 +1,8 @@
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlmodel import Session
|
||||
|
||||
from app import crud
|
||||
from app.core.config import settings
|
||||
from app.models import User, UserCreate, UserUpdate
|
||||
from app.models.user import User, UserCreate, UserUpdate
|
||||
from app.tests.utils.utils import random_email, random_lower_string
|
||||
|
||||
|
||||
@@ -23,7 +22,7 @@ def create_random_user(db: Session) -> User:
|
||||
email = random_email()
|
||||
password = random_lower_string()
|
||||
user_in = UserCreate(email=email, password=password)
|
||||
user = crud.create_user(session=db, user_create=user_in)
|
||||
user = User.create(session=db, create_obj=user_in)
|
||||
return user
|
||||
|
||||
|
||||
@@ -36,14 +35,14 @@ def authentication_token_from_email(
|
||||
If the user doesn't exist it is created first.
|
||||
"""
|
||||
password = random_lower_string()
|
||||
user = crud.get_user_by_email(session=db, email=email)
|
||||
user = User.get_by_email(session=db, email=email)
|
||||
if not user:
|
||||
user_in_create = UserCreate(email=email, password=password)
|
||||
user = crud.create_user(session=db, user_create=user_in_create)
|
||||
user = User.create(session=db, create_obj=user_in_create)
|
||||
else:
|
||||
user_in_update = UserUpdate(password=password)
|
||||
if not user.id:
|
||||
raise Exception("User id not set")
|
||||
user = crud.update_user(session=db, db_user=user, user_in=user_in_update)
|
||||
user = User.update(session=db, db_obj=user, in_obj=user_in_update)
|
||||
|
||||
return user_authentication_headers(client=client, email=email, password=password)
|
||||
|
||||
Reference in New Issue
Block a user