Skip to content

Incidents Backend Refactor #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naasanov merged 2 commits into from
Jan 31, 2026
Merged

Incidents Backend Refactor #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4b061a
refactor: Store warnings/complaints as a separate Incident table
aLEGEND21 Jan 27, 2026
33cd7dc
refactor: Couple of minor changes that were requested
aLEGEND21 Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions backend/script/reset_dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ async def reset_dev():

for location_data in data["locations"]:
location = LocationEntity(
citation_count=location_data["citation_count"],
warning_count=location_data["warning_count"],
hold_expiration=parse_date(location_data.get("hold_expiration")),
formatted_address=location_data["formatted_address"],
google_place_id=location_data["google_place_id"],
Expand Down
8 changes: 8 additions & 0 deletions backend/src/core/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,11 @@ async def authenticate_police_or_admin(
account: AccountDto | PoliceAccountDto = Depends(authenticate_by_role("police", "admin")),
) -> PoliceAccountDto | AccountDto:
return account


async def authenticate_police_staff_or_admin(
account: AccountDto | PoliceAccountDto = Depends(
authenticate_by_role("police", "staff", "admin")
),
) -> PoliceAccountDto | AccountDto:
return account
6 changes: 2 additions & 4 deletions backend/src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse
from src.modules.account.account_router import account_router
from src.modules.complaint.complaint_router import complaint_router
from src.modules.incident.incident_router import incident_router
from src.modules.location.location_router import location_router
from src.modules.party.party_router import party_router
from src.modules.police.police_router import police_router
from src.modules.student.student_router import student_router

app = FastAPI()
Expand Down Expand Up @@ -45,5 +44,4 @@ def read_root():
app.include_router(party_router)
app.include_router(student_router)
app.include_router(location_router)
app.include_router(police_router)
app.include_router(complaint_router)
app.include_router(incident_router)
4 changes: 2 additions & 2 deletions backend/src/modules/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"""

from .account.account_entity import AccountEntity
from .complaint.complaint_entity import ComplaintEntity
from .incident.incident_entity import IncidentEntity
from .location.location_entity import LocationEntity
from .party.party_entity import PartyEntity
from .police.police_entity import PoliceEntity
from .student.student_entity import StudentEntity

__all__ = [
"AccountEntity",
"ComplaintEntity",
"IncidentEntity",
"LocationEntity",
"PartyEntity",
"PoliceEntity",
Expand Down
17 changes: 0 additions & 17 deletions backend/src/modules/complaint/complaint_model.py
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions backend/src/modules/complaint/complaint_router.py
View file
Open in desktop

This file was deleted.

92 changes: 0 additions & 92 deletions backend/src/modules/complaint/complaint_service.py
View file
Open in desktop

This file was deleted.

0 backend/src/modules/complaint/__init__.py → backend/src/modules/incident/__init__.py
View file
Open in desktop
File renamed without changes.
30 changes: 19 additions & 11 deletions ...src/modules/complaint/complaint_entity.py → ...d/src/modules/incident/incident_entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
from datetime import datetime
from datetime import UTC, datetime
from typing import TYPE_CHECKING, Self

from sqlalchemy import DateTime, ForeignKey, Integer, String
from sqlalchemy import DateTime, Enum, ForeignKey, Integer, String
from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column, relationship
from src.core.database import EntityBase
from src.modules.complaint.complaint_model import ComplaintData, ComplaintDto
from src.modules.incident.incident_model import IncidentData, IncidentDto, IncidentSeverity

if TYPE_CHECKING:
from src.modules.location.location_entity import LocationEntity


class ComplaintEntity(MappedAsDataclass, EntityBase):
__tablename__ = "complaints"
class IncidentEntity(MappedAsDataclass, EntityBase):
__tablename__ = "incidents"

id: Mapped[int] = mapped_column(Integer, primary_key=True, init=False)
location_id: Mapped[int] = mapped_column(
Integer, ForeignKey("locations.id", ondelete="CASCADE"), nullable=False
)
complaint_datetime: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
incident_datetime: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
severity: Mapped[IncidentSeverity] = mapped_column(Enum(IncidentSeverity), nullable=False)
description: Mapped[str] = mapped_column(String, nullable=False, default="")

# Relationships
Expand All @@ -26,18 +27,25 @@ class ComplaintEntity(MappedAsDataclass, EntityBase):
)

@classmethod
def from_data(cls, data: ComplaintData) -> Self:
def from_data(cls, data: IncidentData) -> Self:
return cls(
location_id=data.location_id,
complaint_datetime=data.complaint_datetime,
incident_datetime=data.incident_datetime,
severity=data.severity,
description=data.description,
)

def to_dto(self) -> ComplaintDto:
def to_dto(self) -> IncidentDto:
"""Convert entity to model."""
return ComplaintDto(
# Ensure incident_datetime is timezone-aware
incident_dt = self.incident_datetime
if incident_dt.tzinfo is None:
incident_dt = incident_dt.replace(tzinfo=UTC)

return IncidentDto(
id=self.id,
location_id=self.location_id,
complaint_datetime=self.complaint_datetime,
incident_datetime=incident_dt,
description=self.description,
severity=self.severity,
)
29 changes: 29 additions & 0 deletions backend/src/modules/incident/incident_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from enum import Enum

from pydantic import AwareDatetime, BaseModel


class IncidentSeverity(Enum):
COMPLAINT = "complaint"
WARNING = "warning"
CITATION = "citation"


class IncidentCreateDto(BaseModel):
"""Request body for creating/updating an incident (location_id comes from path)."""

incident_datetime: AwareDatetime
description: str = ""
severity: IncidentSeverity


class IncidentData(IncidentCreateDto):
"""Full incident data including location_id (for internal use)."""

location_id: int


class IncidentDto(IncidentData):
"""Output DTO for an incident."""

id: int
Loading