Fin

Author: mslaursen

.gitignore

@@ -170,4 +170,5 @@ cython_debug/
 .pypirc
 
 # Miscellaneous
-delete_me*
+delete_me*
+game_zone*

fastapi_forge/data_type_registry.py

@@ -49,17 +49,6 @@ def all(self) -> list[DataTypeInfo]:
     ),
 )
 
-registry.register(
-    FieldDataType.INTEGER,
-    DataTypeInfo(
-        sqlalchemy_type="Integer",
-        sqlalchemy_prefix=True,
-        python_type="int",
-        faker_field_value=faker_placeholder.format(placeholder='"random_int"'),
-        value="1",
-        test_value="2",
-    ),
-)
 
 registry.register(
     FieldDataType.FLOAT,
@@ -123,3 +112,15 @@ def all(self) -> list[DataTypeInfo]:
         test_value='{"another_key": 123}',
     ),
 )
+
+registry.register(
+    FieldDataType.INTEGER,
+    DataTypeInfo(
+        sqlalchemy_type="Integer",
+        sqlalchemy_prefix=True,
+        python_type="int",
+        faker_field_value=faker_placeholder.format(placeholder='"random_int"'),
+        value="1",
+        test_value="2",
+    ),
+)

fastapi_forge/enums.py

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from functools import lru_cache
 
 
 class FieldDataType(StrEnum):
@@ -10,26 +11,58 @@ class FieldDataType(StrEnum):
     UUID = "UUID"
     JSONB = "JSONB"
 
+    @classmethod
+    @lru_cache
+    def get_type_mappings(cls) -> dict[str, list[str]]:
+        return {
+            cls.STRING: ["character varying", "text", "varchar", "char"],
+            cls.INTEGER: [
+                "integer",
+                "int",
+                "serial",
+                "smallint",
+                "bigint",
+                "bigserial",
+            ],
+            cls.FLOAT: [
+                "real",
+                "float4",
+                "double precision",
+                "float8",
+            ],
+            cls.BOOLEAN: ["boolean", "bool"],
+            cls.DATETIME: [
+                "timestamp",
+                "timestamp with time zone",
+                "timestamp without time zone",
+                "date",
+                "datetime",
+                "time",
+            ],
+            cls.UUID: ["uuid"],
+            cls.JSONB: ["json", "jsonb"],
+        }
+
+    @classmethod
+    def get_custom_types(cls) -> dict[str, "FieldDataType"]:
+        return {}
+
     @classmethod
     def from_db_type(cls, db_type: str) -> "FieldDataType":
         db_type = db_type.lower()
-        match db_type:
-            case _ if db_type.startswith("character varying") or db_type == "text":
-                return cls.STRING
-            case "integer" | "bigint" | "smallint":
-                return cls.INTEGER
-            case "numeric":
-                return cls.FLOAT
-            case "boolean":
-                return cls.BOOLEAN
-            case "uuid":
-                return cls.UUID
-            case _ if db_type.startswith("timestamp") or "date":
-                return cls.DATETIME
-            case "jsonb":
-                return cls.JSONB
-            case _:
-                raise ValueError(f"Unsupported database type: {db_type}")
+
+        custom_types = cls.get_custom_types()
+        if db_type in custom_types:
+            return custom_types[db_type]
+
+        for field_type, patterns in cls.get_type_mappings().items():
+            if any(pattern in db_type for pattern in patterns):
+                return field_type if isinstance(field_type, cls) else cls(field_type)
+
+        raise ValueError(
+            f"Unsupported database type: {db_type}. "
+            f"Supported types are: {list(cls.get_type_mappings().keys())}"
+        )
 
 
 class HTTPMethod(StrEnum):

fastapi_forge/jinja.py

@@ -21,7 +21,9 @@
 from sqlalchemy.dialects.postgresql import JSONB
 from uuid import UUID
 from typing import Any, Annotated
-from datetime import datetime, timezone
+from datetime import datetime, timezone,  timedelta
+
+
 {% set unique_relationships = model.relationships | unique(attribute='target') %}
 {% for relation in unique_relationships -%}
 from src.models.{{ relation.target_model }}_models import {{ relation.target }}
@@ -45,7 +47,9 @@ class {{ model.name_cc }}(Base):
 """
 
 dto_template = """
-from datetime import datetime
+from datetime import datetime, timezone,  timedelta
+
+
 from pydantic import BaseModel, ConfigDict, Field
 from fastapi import Depends
 from uuid import UUID
@@ -177,7 +181,9 @@ async def get_{{ model.name }}(
 from tests import factories
 from src.daos import AllDAOs
 from httpx import AsyncClient
-from datetime import datetime, timezone
+from datetime import datetime, timezone,  timedelta
+
+
 from typing import Any
 from uuid import UUID
 
@@ -221,7 +227,9 @@ async def test_post_{{ model.name }}(client: AsyncClient, daos: AllDAOs,) -> Non
 import pytest
 from tests import factories
 from httpx import AsyncClient
-from datetime import datetime
+from datetime import datetime, timezone,  timedelta
+
+
 from uuid import UUID
 
 URI = "/api/v1/{{ model.name_hyphen }}s/"
@@ -246,7 +254,9 @@ async def test_get_{{ model.name }}s(client: AsyncClient,) -> None:
 import pytest
 from tests import factories
 from httpx import AsyncClient
-from datetime import datetime
+from datetime import datetime, timezone,  timedelta
+
+
 from uuid import UUID
 
 URI = "/api/v1/{{ model.name_hyphen }}s/{ {{- model.name -}}_id}"
@@ -276,7 +286,9 @@ async def test_get_{{ model.name }}_by_id(client: AsyncClient,) -> None:
 from tests import factories
 from src.daos import AllDAOs
 from httpx import AsyncClient
-from datetime import datetime, timezone
+from datetime import datetime, timezone,  timedelta
+
+
 from typing import Any
 from uuid import UUID
 
@@ -322,7 +334,9 @@ async def test_patch_{{ model.name }}(client: AsyncClient, daos: AllDAOs,) -> No
 from tests import factories
 from src.daos import AllDAOs
 from httpx import AsyncClient
-from datetime import datetime
+from datetime import datetime, timezone,  timedelta
+
+
 from uuid import UUID
 
 URI = "/api/v1/{{ model.name_hyphen }}s/{ {{- model.name -}}_id}"

fastapi_forge/project_io.py

@@ -273,22 +273,32 @@ def load_project_spec_from_db(
 
                 data_type = FieldDataType.from_db_type(column.pop("type"))
                 column["type"] = data_type
+                default = None
+                extra_kwargs = None
 
                 metadata = ModelFieldMetadata()
                 if data_type == FieldDataType.DATETIME:
                     column_name = column["name"]
                     default_timestamp = column.get("default") == "CURRENT_TIMESTAMP"
                     if default_timestamp:
-                        if "created" in column_name:
+                        if "create" in column_name:
                             metadata.is_created_at_timestamp = True
-                        elif "updated" in column_name:
+                            default = "datetime.now(timezone.utc)"
+                        elif "update" in column_name:
                             metadata.is_updated_at_timestamp = True
+                            default = "datetime.now(timezone.utc)"
+                            extra_kwargs = {"onupdate": "datetime.now(timezone.utc)"}
 
                 # temporary until any primary key name is supported
                 if column["primary_key"] is True:
                     column["name"] = "id"
 
-                field = ModelField(**column, metadata=metadata)
+                field = ModelField(
+                    **column,
+                    metadata=metadata,
+                    default_value=default,
+                    extra_kwargs=extra_kwargs,
+                )
                 fields.append(field)
 
             model = Model(

fastapi_forge/template/{{cookiecutter.project_name}}/Makefile

@@ -11,7 +11,7 @@ test:
 	$(DOCKER_CMD) pytest ./tests -v -s
 
 test-filter:
-	$(DOCKER_CMD) /tests -v -s -k $(filter)
+	$(DOCKER_CMD) pytest ./tests -v -s -k $(filter)
 
 mig-gen:
 	$(DOCKER_CMD) alembic revision --autogenerate -m "$(name)"

fastapi_forge/template/{{cookiecutter.project_name}}/tests/factories.py

@@ -6,6 +6,9 @@
 from src.db import Base
 import factory
 from typing import Any
+from datetime import datetime, timezone,  timedelta
+
+
 
 {% for model in cookiecutter.models.models -%}
 from src.models.{{ model.name }}_models import {{ model.name_cc }}