Skip to content
Open
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
12 changes: 6 additions & 6 deletions app/core/db/session.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from contextvars import ContextVar
from typing import Dict, Optional, Union
from typing import Any, Dict, Optional, Union

from sqlalchemy.engine import Engine
from sqlalchemy.engine.url import URL
Expand Down Expand Up @@ -106,7 +106,7 @@ def session(self) -> Session:
raise MissingSessionError
return session

def get_one(self, model: any, key: any, value: any) -> object:
def get_one(self, model: Any, key: Any, value: Any) -> object:
try:
statement = select(model).where(
key == value, model.deleted == False
Expand All @@ -116,7 +116,7 @@ def get_one(self, model: any, key: any, value: any) -> object:
except NoResultFound:
return None

def get_all(self, model: any, offset: int, limit: int, order_by: any):
def get_all(self, model: Any, offset: int, limit: int, order_by: Any):
"""Get all items excluding delete ones"""
statement = (
select(model)
Expand All @@ -128,20 +128,20 @@ def get_all(self, model: any, offset: int, limit: int, order_by: any):
result = self.session.exec(statement).all()
return result

def update(self, item: any) -> object:
def update(self, item: Any) -> object:
"""Create or modify"""
self.session.add(item)
self.session.commit()
self.session.refresh(item)
return item

def delete(self, item: any) -> bool:
def delete(self, item: Any) -> bool:
"""TODO: Add return False when exceptions are observed"""
self.session.delete(item)
self.session.commit()
return True

def count(self, model: any) -> int:
def count(self, model: Any) -> int:
result = len(
self.session.exec(
select(model).where(model.deleted == False)
Expand Down
5 changes: 3 additions & 2 deletions app/core/models/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from datetime import datetime
from typing import Any

from sqlmodel import Field, SQLModel

Expand Down Expand Up @@ -64,7 +65,7 @@ def delete(
return True

@classmethod
def get_one(cls, value: any, key: any = None) -> any:
def get_one(cls, value: Any, key: Any = None) -> Any:
"""
Get one item based in key/value
- value: the value of the field
Expand All @@ -75,7 +76,7 @@ def get_one(cls, value: any, key: any = None) -> any:
return db.get_one(cls, key=key, value=value)

@classmethod
def get_all(cls, offset: int = 0, limit: int = 100, order_by: any = None):
def get_all(cls, offset: int = 0, limit: int = 100, order_by: Any = None):
"""
Return a list of items
Params:
Expand Down