feat: use Mapped syntax for columns

src/contact/models.py

@@ -5,30 +5,30 @@ Models:
  - Contact: id[pk], email, first_name, last_name, phonenumber, vat_number
             street_address, street_address_line_2, post_office_box_number, address_locality, country_code, address_region, postal_code
 """
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import mapped_column, Mapped
 
-from sqlalchemy import Column, Integer, String, ForeignKey
-
-from src.database import Base
+from src.models import CustomBase
 
 
-class Contact(Base):
+class Contact(CustomBase):
 	__tablename__ = "contact"
 
-	id = Column(Integer, primary_key=True)
-	email = Column(String)
-	first_name = Column(String)
-	last_name = Column(String)
-	phonenumber = Column(String)
-	vat_number = Column(String, default=None, nullable=True)
+	id: Mapped[int] = mapped_column(primary_key=True)
+	email: Mapped[str]
+	first_name: Mapped[str]
+	last_name: Mapped[str]
+	phonenumber: Mapped[str]
+	vat_number: Mapped[str | None] = mapped_column(default=None)
 
-	street_address = Column(String)
-	street_address_line_2 = Column(String)
-	post_office_box_number = Column(String, default=None, nullable=True)
-	locality = Column(String)  # Ie City
-	country_code = Column(String)  # Eg GB
-	address_region = Column(String, default=None, nullable=True)
-	postal_code = Column(String)
+	street_address : Mapped[str]
+	street_address_line_2 : Mapped[str]
+	post_office_box_number: Mapped[str | None] = mapped_column(default=None)
+	locality : Mapped[str]  # Ie City
+	country_code : Mapped[str]  # Eg GB
+	address_region: Mapped[str | None] = mapped_column(default=None)
+	postal_code : Mapped[str]
 
-	org_id = Column(
-		Integer, ForeignKey("organisation.id", ondelete="CASCADE"), nullable=False
+	org_id: Mapped[int] = mapped_column(
+		ForeignKey("organisation.id", ondelete="CASCADE"), nullable=False
 	)