Transactions table (#7)

Reviewed-on: #7
Co-authored-by: Mathias <mathias2784@web.de>

src/models/b4w.py

@@ -2,8 +2,8 @@ from datetime import date
 from decimal import Decimal
 
 from pydantic import Field, computed_field, field_validator
-from sqlalchemy import Column, Date, ForeignKey, Integer, String, UniqueConstraint
-from sqlalchemy.orm import relationship
+from sqlalchemy import Date, ForeignKey, Integer, String, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from src.constants import IBAN_PATTERN, Currency
 from src.models._common import (
@@ -56,7 +56,7 @@ class B4wExport(ExportBaseModel):
             "Notes": f"{self.notes}",
         }
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def hash_id(self) -> str:
         return _hash(self.id)
@@ -91,7 +91,7 @@ class Category(ExportBaseModel):
     name: str = Field(pattern=r"[^:\r\n]+")
     parent: Category | None = None
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def hash_id(self) -> str:
         return _hash(self.name, self.parent)
@@ -99,7 +99,7 @@ class Category(ExportBaseModel):
     @classmethod
     def from_str(cls, s: str) -> Category | None:
         if not s:
-            return
+            return None
         components = s.split(":")
         name = components[-1]
         rest = ":".join(components[:-1])
@@ -124,9 +124,11 @@ class CategoryDb(BaseModelDb):
         UniqueConstraint("name", "parent_id", name="uq_category_name_parent"),
     )
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    name = Column(String, nullable=False)
-    parent_id = Column(Integer, ForeignKey("category.id"), nullable=True)
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column(String, nullable=False)
+    parent_id: Mapped[int | None] = mapped_column(
+        ForeignKey("category.id"), nullable=True
+    )
 
     # Relationships
     parent = relationship(
@@ -134,18 +136,18 @@ class CategoryDb(BaseModelDb):
     )
     children = relationship("CategoryDb", back_populates="parent")
 
-    UniqueConstraint("name", "parent_id", name="uq_category_name_parent")
-
 
 class B4wDb(IngestdbBase):
     __tablename__ = "import_b4w"
 
-    id_b4w = Column(Integer, nullable=False, unique=True)
-    date_book = Column(Date, nullable=True)
-    other_name = Column(String, nullable=True)
-    other_iban = Column(String, nullable=True)
-    category_id = Column(Integer, ForeignKey("category.id"), nullable=True)
-    notes = Column(String, nullable=True)
+    id_b4w: Mapped[int] = mapped_column(Integer, nullable=False, unique=True)
+    date_book: Mapped[date | None] = mapped_column(Date, nullable=True)
+    other_name: Mapped[str | None] = mapped_column(String, nullable=True)
+    other_iban: Mapped[str | None] = mapped_column(String, nullable=True)
+    category_id: Mapped[int | None] = mapped_column(
+        ForeignKey("category.id"), nullable=True
+    )
+    notes: Mapped[str | None] = mapped_column(String, nullable=True)
 
     # relationship
     category = relationship("CategoryDb")