Merge pull request #59 from GabrielVGS/dev

Dev

Author: GabrielVGS

fastapi-base/src/models/base.py

@@ -6,7 +6,7 @@
 from sqlalchemy import text
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import expression
-from sqlmodel import Column, DateTime, Field, SQLModel
+from sqlmodel import DateTime, Field, SQLModel
 
 
 # https://docs.sqlalchemy.org/en/20/core/compiler.html#utc-timestamp-function
@@ -20,8 +20,17 @@ def pg_utcnow(element, compiler, **kw) -> str:  # type: ignore
     return "TIMEZONE('utc', CURRENT_TIMESTAMP)"
 
 
+# def utc_column(server_default=False, onupdate=False):
+#     return Column(
+#         DateTime(timezone=True),
+#         server_default=utcnow() if server_default else None,
+#         onupdate=utcnow() if onupdate else None,
+#         nullable=True,
+#     )
+
+
 # this is the base model, as a best practice, other db models should inherit it
-class BaseModel(SQLModel):
+class BaseModel(SQLModel, table=False):
     id: Optional[uuid.UUID] = Field(
         default_factory=uuid_ext_pkg.uuid7,
         primary_key=True,
@@ -31,25 +40,22 @@ class BaseModel(SQLModel):
 
     created_at: Optional[datetime] = Field(
         default_factory=lambda: datetime.now(timezone.utc),
-        sa_column=Column(
-            DateTime(timezone=True),
-            server_default=utcnow(),
-            nullable=True,
-        ),
+        sa_type=DateTime(timezone=True),  # type: ignore
+        sa_column_kwargs={
+            "server_default": text("TIMEZONE('utc', CURRENT_TIMESTAMP)"),
+            "nullable": True,
+        },
     )
     updated_at: Optional[datetime] = Field(
         default_factory=lambda: datetime.now(timezone.utc),
-        sa_column=Column(
-            DateTime(timezone=True),
-            onupdate=utcnow(),
-            nullable=True,
-        ),
+        sa_type=DateTime(timezone=True),  # type: ignore
+        sa_column_kwargs={
+            "onupdate": text("TIMEZONE('utc', CURRENT_TIMESTAMP)"),
+            "nullable": True,
+        },
     )
-
     deleted_at: Optional[datetime] = Field(
         default=None,
-        sa_column=Column(
-            DateTime(timezone=True),
-            nullable=True,
-        ),
+        sa_type=DateTime(timezone=True),  # type: ignore
+        sa_column_kwargs={"nullable": True},
     )

fastapi-base/src/schemas/common.py

@@ -2,6 +2,7 @@
 
 from pydantic import BaseModel, Field
 
+
 T = TypeVar("T")