From c93f0ccda6041a07f90b1243fb7c2a055125c3b1 Mon Sep 17 00:00:00 2001 From: boris Date: Tue, 23 Sep 2025 19:38:54 +0100 Subject: [PATCH] Standardised Bases across models --- app/db/base.py | 10 ++++------ app/models/access_request.py | 4 ++-- app/models/audit.py | 2 +- app/models/server.py | 2 +- app/models/sshkey.py | 4 ++-- app/models/user.py | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/db/base.py b/app/db/base.py index 4d6d4b1..a63b13a 100644 --- a/app/db/base.py +++ b/app/db/base.py @@ -1,8 +1,6 @@ from app.db.base_class import Base # noqa: F401 - -# Import all models so their tables are registered on Base.metadata -from app.models.user import User # noqa: F401 -from app.models.server import Server # noqa: F401 -from app.models.sshkey import SSHKey # noqa: F401 from app.models.access_request import AccessRequest # noqa: F401 -from app.models.audit import AuditEvent # noqa: F401 \ No newline at end of file +from app.models.audit import AuditEvent # noqa: F401 +from app.models.server import Server # noqa: F401 +from app.models.sshkey import SSHKey # noqa: F401 +from app.models.user import User # noqa: F401 diff --git a/app/models/access_request.py b/app/models/access_request.py index 4831cb5..b04c6fb 100644 --- a/app/models/access_request.py +++ b/app/models/access_request.py @@ -1,9 +1,9 @@ -from datetime import datetime, timezone #noqa +from datetime import datetime from sqlalchemy import DateTime, ForeignKey, String from sqlalchemy.orm import Mapped, mapped_column -from app.models.user import Base +from app.db.base_class import Base class AccessRequest(Base): diff --git a/app/models/audit.py b/app/models/audit.py index 60c8207..af1f6d9 100644 --- a/app/models/audit.py +++ b/app/models/audit.py @@ -3,7 +3,7 @@ from datetime import datetime, timezone from sqlalchemy import DateTime, String from sqlalchemy.orm import Mapped, mapped_column -from app.models.user import Base +from app.db.base_class import Base class AuditEvent(Base): diff --git a/app/models/server.py b/app/models/server.py index a1a2175..15005f7 100644 --- a/app/models/server.py +++ b/app/models/server.py @@ -1,7 +1,7 @@ from sqlalchemy import JSON, Boolean, Integer, String from sqlalchemy.orm import Mapped, mapped_column -from app.models.user import Base +from app.db.base_class import Base class Server(Base): diff --git a/app/models/sshkey.py b/app/models/sshkey.py index 7eb78bc..e554ce1 100644 --- a/app/models/sshkey.py +++ b/app/models/sshkey.py @@ -1,9 +1,9 @@ from datetime import datetime, timezone # noqa: F401 from sqlalchemy import Boolean, DateTime, ForeignKey, String -from sqlalchemy.orm import Mapped, mapped_column, relationship # noqa: F401 +from sqlalchemy.orm import Mapped, mapped_column -from app.models.user import Base +from app.db.base_class import Base class SSHKey(Base): diff --git a/app/models/user.py b/app/models/user.py index 4921a1c..b7b2377 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -1,7 +1,7 @@ from sqlalchemy import Boolean, String from sqlalchemy.orm import Mapped, mapped_column -from app.db.base_class import Base # <-- use the shared Base +from app.db.base_class import Base class User(Base):