Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/backend/app/app/api/api_v1/endpoints/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def create_item(
"""
Create new item.
"""
item = Item.from_orm(item_in, update={"owner_id": current_user.id})
item = Item.model_validate(item_in, update={"owner_id": current_user.id})
session.add(item)
session.commit()
session.refresh(item)
Expand All @@ -69,9 +69,8 @@ def update_item(
raise HTTPException(status_code=404, detail="Item not found")
if not current_user.is_superuser and (item.owner_id != current_user.id):
raise HTTPException(status_code=400, detail="Not enough permissions")
# TODO: check this actually works
update_dict = item_in.dict(exclude_unset=True)
item.from_orm(update_dict)
update_dict = item_in.model_dump(exclude_unset=True)
item.sqlmodel_update(update_dict)
session.add(item)
session.commit()
session.refresh(item)
Expand Down
13 changes: 7 additions & 6 deletions src/backend/app/app/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Union

from pydantic import BaseModel, EmailStr
from pydantic import EmailStr
from sqlmodel import Field, Relationship, SQLModel


Expand Down Expand Up @@ -29,11 +29,12 @@ class UserUpdate(UserBase):
password: Union[str, None] = None


class UserUpdateMe(BaseModel):
class UserUpdateMe(SQLModel):
password: Union[str, None] = None
full_name: Union[str, None] = None
email: Union[EmailStr, None] = None


# Database model, database table inferred from class name
class User(UserBase, table=True):
id: Union[int, None] = Field(default=None, primary_key=True)
Expand Down Expand Up @@ -78,21 +79,21 @@ class ItemOut(ItemBase):


# Generic message
class Message(BaseModel):
class Message(SQLModel):
message: str


# JSON payload containing access token
class Token(BaseModel):
class Token(SQLModel):
access_token: str
token_type: str = "bearer"


# Contents of JWT token
class TokenPayload(BaseModel):
class TokenPayload(SQLModel):
sub: Union[int, None] = None


class NewPassword(BaseModel):
class NewPassword(SQLModel):
token: str
new_password: str
2 changes: 1 addition & 1 deletion src/backend/app/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ alembic = "^1.12.1"
python-jose = {extras = ["cryptography"], version = "^3.3.0"}
httpx = "^0.25.1"
psycopg = {extras = ["binary"], version = "^3.1.13"}
sqlmodel = "^0.0.12"
sqlmodel = "^0.0.16"

[tool.poetry.group.dev.dependencies]
mypy = "^1.7.0"
Expand Down