Merge pull request #222 from RieCo432/dev

Closes #192

Author: RieCo432

fastapi/alembic/versions/29519339abb4_192_store_closing_date_instead_of_.py

@@ -0,0 +1,32 @@
+"""#192 store closing date instead of closed boolean
+
+Revision ID: 29519339abb4
+Revises: b6e19fd0aee6
+Create Date: 2025-08-31 13:48:35.120095
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '29519339abb4'
+down_revision: Union[str, None] = 'b6e19fd0aee6'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('crimereports', sa.Column('closedon', sa.DateTime(), nullable=True))
+    op.drop_column('crimereports', 'closed')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('crimereports', sa.Column('closed', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False))
+    op.drop_column('crimereports', 'closedon')
+    # ### end Alembic commands ###

fastapi/alembic/versions/b6e19fd0aee6_192_added_crimereports_table.py

@@ -0,0 +1,40 @@
+"""#192 added crimereports table
+
+Revision ID: b6e19fd0aee6
+Revises: 2818f7b0c831
+Create Date: 2025-08-31 13:03:01.657852
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'b6e19fd0aee6'
+down_revision: Union[str, None] = '2818f7b0c831'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('crimereports',
+    sa.Column('id', sa.UUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('crimenumber', sa.String(length=40), nullable=False),
+    sa.Column('contractid', sa.UUID(), nullable=False),
+    sa.Column('createdon', sa.DateTime(), server_default=sa.text("(current_timestamp at time zone 'utc')"), nullable=False),
+    sa.Column('closed', sa.Boolean(), server_default=sa.text('FALSE'), nullable=False),
+    sa.ForeignKeyConstraint(['contractid'], ['contracts.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_crimereports_id'), 'crimereports', ['id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_crimereports_id'), table_name='crimereports')
+    op.drop_table('crimereports')
+    # ### end Alembic commands ###

fastapi/app/crud/__init__.py

@@ -13,3 +13,4 @@
 from .expenses import *
 from .permissions import *
 from .groups import *
+from .crimeReports import *

fastapi/app/crud/crimeReports.py

@@ -0,0 +1,59 @@
+import datetime
+from typing import List
+from uuid import UUID
+
+from sqlalchemy.orm import Session
+
+import app.models as models
+import app.schemas as schemas
+from sqlalchemy import select, func
+
+
+def get_crime_report(crime_report_id: UUID, db: Session) -> models.CrimeReport:
+    return db.scalar(
+        select(models.CrimeReport)
+        .where(models.CrimeReport.id == crime_report_id)
+    )
+
+
+def get_crime_reports(db: Session, crime_report_id: UUID | None = None, crime_number: str | None = None, contract_id: UUID | None = None) -> List[models.CrimeReport]:
+    query = select(models.CrimeReport)
+
+    if crime_report_id is not None:
+        query = query.where(models.CrimeReport.id == crime_report_id)
+
+    if crime_number is not None:
+        query = query.where(models.CrimeReport.crimeNumber == crime_number.lower().replace(" ", "").replace("-", ""))
+
+    if contract_id is not None:
+        query = query.where(models.CrimeReport.contractId == contract_id)
+
+    return [_ for _ in db.scalars(query)]
+
+
+def create_crime_report(crime_report_data: schemas.CrimeReport, db: Session) -> models.CrimeReport:
+    crime_report = models.CrimeReport(
+        contractId=crime_report_data.contractId,
+        createdOn=datetime.datetime.utcnow(),
+        crimeNumber=crime_report_data.crimeNumber.lower().replace(" ", "").replace("-", "")
+    )
+    db.add(crime_report)
+    db.commit()
+    return crime_report
+
+
+def close_crime_report(crime_report_id: UUID, db: Session) -> models.CrimeReport:
+    crime_report = get_crime_report(crime_report_id=crime_report_id, db=db)
+    crime_report.closedOn = datetime.datetime.utcnow()
+    db.commit()
+    return crime_report
+
+
+def find_crime_reports(db: Session, crime_number: str, max_distance: int = 4) -> List[models.CrimeReport]:
+    return [_ for _ in db.scalars(
+        select(models.CrimeReport)
+        .where(
+            (models.CrimeReport.crimeNumber.contains(crime_number))
+            | (func.levenshtein(models.CrimeReport.crimeNumber, crime_number) <= max_distance)
+        )
+    )]

fastapi/app/main.py

@@ -47,6 +47,8 @@
 app.include_router(routers.expenses)
 app.include_router(routers.groups)
 
+app.include_router(routers.crime_reports)
+
 
 
 if os.environ["PRODUCTION"] == "true":

fastapi/app/models/__init__.py

@@ -15,3 +15,4 @@
 from .groupUser import *
 from .groupPermission import *
 from .contractDraft import *
+from .crimeReports import *

fastapi/app/models/contract.py

@@ -9,7 +9,7 @@
 import app.services as services
 from app.database.db import Base
 
-from typing import Self
+from typing import Self, List
 
 CONTRACT_EXPIRE_MONTHS = int(os.environ['CONTRACT_EXPIRE_MONTHS'])
 
@@ -57,6 +57,8 @@ class Contract(Base):
     expiryReminderSent: Mapped[bool] = mapped_column("expiryremindersent", Boolean, nullable=False, default=False, server_default=text("FALSE"), quote=False)
     returnDetailsSent: Mapped[bool] = mapped_column("returndetailssent", Boolean, nullable=False, default=False, server_default=text("FALSE"), quote=False)
 
+    crimeReports: Mapped[List["CrimeReport"]] = relationship("CrimeReport", back_populates="contract")
+
     def __eq__dict(self, other: dict):
         return all([
             str(self.id) == str(other.get("id")),

fastapi/app/models/crimeReports.py

@@ -0,0 +1,44 @@
+from typing import List
+from uuid import uuid4
+
+from datetime import datetime
+from sqlalchemy import String, UUID, text, DateTime, ForeignKey, Boolean
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app import services
+from app.database.db import Base
+
+
+class CrimeReport(Base):
+    __tablename__ = "crimereports"
+
+    id: Mapped[UUID] = mapped_column("id", UUID, primary_key=True, nullable=False, default=uuid4, server_default=text("uuid_generate_v4()"), index=True, quote=False)
+    crimeNumber: Mapped[str] = mapped_column("crimenumber", String(40), nullable=False, quote=False)
+    contractId: Mapped[UUID] = mapped_column("contractid", ForeignKey("contracts.id"), nullable=False, quote=False)
+    contract: Mapped["Contract"] = relationship("Contract", back_populates="crimeReports")
+    createdOn: Mapped[datetime] = mapped_column("createdon", DateTime, nullable=False, default=datetime.utcnow(), server_default=text("(current_timestamp at time zone 'utc')"), quote=False)
+    closedOn: Mapped[datetime] = mapped_column("closedon", DateTime, nullable=True, quote=False)
+
+
+    def __eq__(self, other: dict):
+        return all([
+            str(self.id) == str(other.get("id", None)),
+            str(self.contractId) == str(other.get("contractId", None)),
+            str(self.crimeNumber) == str(other.get("crimeNumber", None)),
+            str(self.createdOn) == str(other.get("createdOn", None))
+        ])
+
+    def send_crime_report_added_email(self):
+        email_html_content = services.email_helpers.build_crime_report_added_email(crime_report=self)
+        services.email_helpers.send_email(
+            destination=self.contract.client.emailAddress,
+            subject="Your Stolen Bike",
+            content=email_html_content)
+
+    def send_crime_report_closed_email(self):
+        email_html_content = services.email_helpers.build_crime_report_closed_email(crime_report=self)
+        services.email_helpers.send_email(
+            destination=self.contract.client.emailAddress,
+            subject="Your Stolen Bike",
+            content=email_html_content
+        )

fastapi/app/routers/__init__.py

@@ -17,4 +17,5 @@
 from .clientsPublic import public_clients
 from .appointmentsPublic import appointments_public
 from .usersPublic import users_public
+from .crimeReports import crime_reports
 

fastapi/app/routers/clientsMe.py

@@ -68,7 +68,16 @@ async def get_my_contract(
         depositAmountCollected=contract.depositAmountCollected,
         conditionOfBike=contract.conditionOfBike,
         contractType=contract.contractType,
-        notes=contract.notes
+        notes=contract.notes,
+        crimeReports=[
+            schemas.CrimeReport(
+                id=report.id,
+                crimeNumber=report.crimeNumber,
+                createdOn=report.createdOn,
+                closedOn=report.closedOn,
+                contractId=report.contractId
+            ) for report in contract.crimeReports
+        ]
     )