Skip to content

Commit

Permalink
style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mdprewitt committed Oct 14, 2022
1 parent d9b5e5f commit 10b94b8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
18 changes: 8 additions & 10 deletions fastapi_crudrouter/core/sqlalchemy.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def __init__(
update_route: Union[bool, DEPENDENCIES] = True,
delete_one_route: Union[bool, DEPENDENCIES] = True,
delete_all_route: Union[bool, DEPENDENCIES] = True,
**kwargs: Any
**kwargs: Any,
) -> None:
assert (
sqlalchemy_installed
Expand All @@ -66,7 +66,7 @@ def __init__(
update_route=update_route,
delete_one_route=delete_one_route,
delete_all_route=delete_all_route,
**kwargs
**kwargs,
)

def _get_all(self, *args: Any, **kwargs: Any) -> CALLABLE_LIST:
Expand Down Expand Up @@ -100,7 +100,6 @@ def route(

return route


def _get_orm_object(self, db: Session, orm_model: Model, model: Model) -> Any:
query = db.query(orm_model)
filter_items = 0
Expand All @@ -110,10 +109,9 @@ def _get_orm_object(self, db: Session, orm_model: Model, model: Model) -> Any:
query = query.filter(column(key) == val)
if filter_items == 0:
raise Exception("No attributes for filter found")
return query.one()

return query.one()

def _get_orm_object_or_value(self, db: Session, val: Any) -> Any:
def _get_orm_object_or_value(self, db: Session, val: Any) -> Any:
"""Return an inflated database object or a plain value.
If a `val` is a SqlModel type and has defined a Meta.orm model
Expand All @@ -133,16 +131,14 @@ def _get_orm_object_or_value(self, db: Session, val: Any) -> Any:
return self._get_orm_object(db, orm_model, val)
return val


def _create(self, *args: Any, **kwargs: Any) -> CALLABLE:

def route(
model: self.create_schema, # type: ignore
db: Session = Depends(self.db_func),
) -> Model:
try:
db_model: Model = self.db_model()

for key, val in model:
if val:
setattr(db_model, key, self._get_orm_object_or_value(db, val))
Expand All @@ -169,7 +165,9 @@ def route(
for key, val in model:
if key != self._pk:
if hasattr(db_model, key):
setattr(db_model, key, self._get_orm_object_or_value(db, val))
setattr(
db_model, key, self._get_orm_object_or_value(db, val)
)

db.commit()
db.refresh(db_model)
Expand Down
1 change: 0 additions & 1 deletion tests/test_sqlalchemy_nested_obj.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ def test_get():
session.commit()
session.refresh(hero)


res = client.get(HEROES_URL)
assert res.status_code == 200
assert res.json() == [{**HeroRead(**object_as_dict(hero)).dict()}]
Expand Down

0 comments on commit 10b94b8

Please sign in to comment.