Fixed how polymorphism affects listing.

This commit is contained in:
Yaro Kasear 2025-09-05 09:36:15 -05:00
parent 1cf76edf56
commit 4ebc82c08b
3 changed files with 20 additions and 6 deletions

View file

@ -10,7 +10,13 @@ class CRUDMixin:
updated_at = Column(DateTime, default=func.now(), onupdate=func.now()) updated_at = Column(DateTime, default=func.now(), onupdate=func.now())
def as_dict(self): def as_dict(self):
return {c.name: getattr(self, c.name) for c in self.__table__.columns} # Combine all columns from all inherited tables
result = {}
for cls in self.__class__.__mro__:
if hasattr(cls, "__table__"):
for column in cls.__table__.columns:
result[column.name] = getattr(self, column.name)
return result
class Version(Base): class Version(Base):
__tablename__ = "versions" __tablename__ = "versions"

View file

@ -1,5 +1,5 @@
from typing import Type, TypeVar, Generic from typing import Type, TypeVar, Generic
from sqlalchemy.orm import Session from sqlalchemy.orm import Session, with_polymorphic
from crudkit.core.base import Version from crudkit.core.base import Version
from crudkit.core.spec import CRUDSpec from crudkit.core.spec import CRUDSpec
@ -15,8 +15,16 @@ class CRUDService(Generic[T]):
self.polymorphic = polymorphic self.polymorphic = polymorphic
self.supports_soft_delete = hasattr(model, 'is_deleted') self.supports_soft_delete = hasattr(model, 'is_deleted')
def get_query(self):
if self.polymorphic:
poly_model = with_polymorphic(self.model, '*')
return self.session.query(poly_model)
else:
base_only = with_polymorphic(self.model, [], flat=True)
return self.session.query(base_only)
def get(self, id: int, include_deleted: bool = False) -> T | None: def get(self, id: int, include_deleted: bool = False) -> T | None:
obj = self.session.get(self.model, id) obj = self.get_query().filter_by(id=id).first()
if obj is None: if obj is None:
return None return None
if self.supports_soft_delete and not include_deleted and obj.is_deleted: if self.supports_soft_delete and not include_deleted and obj.is_deleted:
@ -24,7 +32,7 @@ class CRUDService(Generic[T]):
return obj return obj
def list(self, params=None) -> list[T]: def list(self, params=None) -> list[T]:
query = self.session.query(self.model) query = self.get_query()
if params: if params:
if self.supports_soft_delete: if self.supports_soft_delete:

View file

@ -27,7 +27,7 @@ bootstrap_world(session)
app = Flask(__name__) app = Flask(__name__)
dbref_service = CRUDService(Dbref, session) dbref_service = CRUDService(Dbref, session, polymorphic=True)
exit_service = CRUDService(Exit, session) exit_service = CRUDService(Exit, session)
player_service = CRUDService(Player, session) player_service = CRUDService(Player, session)
program_service = CRUDService(Program, session) program_service = CRUDService(Program, session)
@ -42,4 +42,4 @@ app.register_blueprint(generate_crud_blueprint(Room, room_service), url_prefix="
app.register_blueprint(generate_crud_blueprint(Thing, thing_service), url_prefix="/api/things") app.register_blueprint(generate_crud_blueprint(Thing, thing_service), url_prefix="/api/things")
if __name__ == "__main__": if __name__ == "__main__":
app.run(debug=True) app.run(debug=True, port=5050)