feat: applied model mixins

IdMixin used on every table with an ID index (no changes needed to db)

Timestamp and Deleted mixins applied to org and user tables.

ActivatedMixin added to users.

src/contact/models.py

@@ -6,16 +6,17 @@ Models:
             street_address, street_address_line_2, post_office_box_number, address_locality, country_code, address_region, postal_code
 """
 
+from src.models import IdMixin
+
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import mapped_column, Mapped
 
 from src.models import CustomBase
 
 
-class Contact(CustomBase):
+class Contact(CustomBase, IdMixin):
 	__tablename__ = "contact"
 
-	id: Mapped[int] = mapped_column(primary_key=True)
 	email: Mapped[str] = mapped_column(default=None, nullable=True)
 	first_name: Mapped[str] = mapped_column(default=None, nullable=True)
 	last_name: Mapped[str] = mapped_column(default=None, nullable=True)

src/iam/models.py

@@ -21,13 +21,12 @@ Models:
 from sqlalchemy import ForeignKey, UniqueConstraint
 from sqlalchemy.orm import relationship, mapped_column, Mapped
 
-from src.models import CustomBase
+from src.models import CustomBase, IdMixin
 
 
-class Permission(CustomBase):
+class Permission(CustomBase, IdMixin):
 	__tablename__ = "permission"
 
-	id: Mapped[int] = mapped_column(primary_key=True)
 	resource: Mapped[str]
 	action: Mapped[str]
 
@@ -61,9 +60,9 @@ class Permission(CustomBase):
 		return self.service_rel.name
 
 
-class Group(CustomBase):
+class Group(CustomBase, IdMixin):
 	__tablename__ = "group"
-	id: Mapped[int] = mapped_column(primary_key=True)
+
 	name: Mapped[str]
 
 	org_id: Mapped[int] = mapped_column(ForeignKey("organisation.id", ondelete="CASCADE"))

src/organisation/models.py

@@ -14,18 +14,19 @@ Models:
  - OrgUsers: org_id[FK][PK], user_id[FK][PK]
 """
 
+from src.models import IdMixin, DeletedTimestampMixin
+
 from typing import Any
 
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import relationship, Mapped, mapped_column
 
-from src.models import CustomBase
+from src.models import CustomBase, TimestampMixin
 
 
-class Organisation(CustomBase):
+class Organisation(CustomBase, IdMixin, TimestampMixin, DeletedTimestampMixin):
 	__tablename__ = "organisation"
 
-	id: Mapped[int] = mapped_column(primary_key=True)
 	name: Mapped[str]
 	status: Mapped[str] = mapped_column(default="partial")
 	intake_questionnaire: Mapped[dict[str, Any] | None]

src/service/models.py

@@ -8,13 +8,12 @@ Models:
 
 from sqlalchemy.orm import relationship, mapped_column, Mapped
 
-from src.models import CustomBase
+from src.models import CustomBase, IdMixin
 
 
-class Service(CustomBase):
+class Service(CustomBase, IdMixin):
 	__tablename__ = "service"
 
-	id: Mapped[int] = mapped_column(primary_key=True)
 	name: Mapped[str] = mapped_column(unique=True)
 	api_key: Mapped[str]
 

src/user/models.py

@@ -10,6 +10,8 @@ Models:
   - groups: Calc property dict of {group_rel.org_rel.name: group_rel.name}
 """
 
+from src.models import IdMixin, ActivatedMixin, TimestampMixin, DeletedTimestampMixin
+
 from collections import defaultdict
 
 from sqlalchemy.orm import relationship, mapped_column, Mapped
@@ -17,10 +19,9 @@ from sqlalchemy.orm import relationship, mapped_column, Mapped
 from src.models import CustomBase
 
 
-class User(CustomBase):
+class User(CustomBase, IdMixin, ActivatedMixin, TimestampMixin, DeletedTimestampMixin):
 	__tablename__ = "user"
 
-	id: Mapped[int] = mapped_column(primary_key=True)
 	email: Mapped[str]
 	first_name: Mapped[str]
 	last_name: Mapped[str]