Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions docs/ARQUITETURA.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class TripService:
email: str,
bus_line: str,
distance: int,
trip_date: datetime,
trip_datetime: datetime,
) -> Trip:
# 1. Validar usuário existe
user = await self._user_repo.get_user(email)
Expand All @@ -174,7 +174,7 @@ class TripService:
email=email,
bus_line=bus_line,
score=score,
trip_date=trip_date,
trip_datetime=trip_datetime,
)

# 4. Salvar viagem
Expand Down Expand Up @@ -222,7 +222,7 @@ async def create_trip(
email=request.email,
bus_line=request.bus_line,
distance=request.distance,
trip_date=request.trip_date,
trip_datetime=request.trip_datetime,
)

# 2. Mapear domínio → API schema
Expand All @@ -249,14 +249,14 @@ class CreateTripRequest(BaseModel):
email: EmailStr
bus_line: str
distance: int
trip_date: datetime
trip_datetime: datetime

class TripResponse(BaseModel):
id: int
email: str
bus_line: str
score: int
trip_date: datetime
trip_datetime: datetime
```

#### `mappers.py` - Conversão de Dados
Expand All @@ -270,7 +270,7 @@ def trip_response_from_domain(trip: Trip) -> TripResponse:
email=trip.email,
bus_line=trip.bus_line,
score=trip.score,
trip_date=trip.trip_date,
trip_datetime=trip.trip_datetime,
)
```

Expand Down
10 changes: 5 additions & 5 deletions docs/TESTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ async def test_create_trip_calculates_score_correctly() -> None:
bus_line="8000",
bus_direction=1,
distance=1000,
trip_date=datetime.now()
trip_datetime=datetime.now()
)

# 3. Assert (Verificar) - Checar resultados
Expand Down Expand Up @@ -117,7 +117,7 @@ async def test_create_trip_fails_for_nonexistent_user() -> None:
bus_line="8000",
bus_direction=1,
distance=1000,
trip_date=datetime.now()
trip_datetime=datetime.now()
)

# Verifica que save_trip NÃO foi chamado
Expand Down Expand Up @@ -152,15 +152,15 @@ async def test_multiple_trips(mocker: "MockerFixture") -> None:
bus_line="8000",
bus_direction=1,
distance=500,
trip_date=datetime.now(),
trip_datetime=datetime.now(),
)

trip2 = await service.create_trip(
email="bob@example.com",
bus_line="8000",
bus_direction=2,
distance=1500,
trip_date=datetime.now(),
trip_datetime=datetime.now(),
)

# Assert
Expand Down Expand Up @@ -203,7 +203,7 @@ async def test_handles_repository_save_error(mocker: "MockerFixture") -> None:
bus_line="8000",
bus_direction=1,
distance=1000,
trip_date=datetime.now(),
trip_datetime=datetime.now(),
)

trip_repo.save_trip.assert_awaited_once()
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ pytest==8.3.0
pytest-asyncio==0.24.0
pytest-mock==3.14.0
pytest-cov==7.0.0
pytest-dotenv==0.5.2
mypy==1.11.0
ruff==0.6.0
10 changes: 6 additions & 4 deletions src/adapters/database/mappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
These functions translate between the persistence layer and the domain layer.
"""

from ...core.models.bus import RouteIdentifier
from typing import cast

from ...core.models.bus import BusDirection, RouteIdentifier
from ...core.models.trip import Trip
from ...core.models.user import User
from ...core.models.user_history import UserHistory
Expand Down Expand Up @@ -79,11 +81,11 @@ def map_trip_db_to_domain(trip_db: TripDB) -> Trip:
email=trip_db.email,
route=RouteIdentifier(
bus_line=trip_db.bus_line,
bus_direction=trip_db.bus_direction,
bus_direction=cast(BusDirection, trip_db.bus_direction),
),
distance=trip_db.distance,
score=trip_db.score,
trip_date=trip_db.trip_date,
trip_datetime=trip_db.trip_datetime,
)


Expand All @@ -103,7 +105,7 @@ def map_trip_domain_to_db(trip: Trip) -> TripDB:
bus_direction=trip.route.bus_direction,
distance=trip.distance,
score=trip.score,
trip_date=trip.trip_date,
trip_datetime=trip.trip_datetime,
)


Expand Down
2 changes: 1 addition & 1 deletion src/adapters/database/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TripDB(Base):
bus_direction: Mapped[int] = mapped_column(Integer, nullable=False)
distance: Mapped[int] = mapped_column(Integer, nullable=False)
score: Mapped[int] = mapped_column(Integer, nullable=False)
trip_date: Mapped[datetime] = mapped_column(DateTime, nullable=False)
trip_datetime: Mapped[datetime] = mapped_column(DateTime, nullable=False)

user: Mapped["UserDB"] = relationship("UserDB", back_populates="trips")

Expand Down
11 changes: 0 additions & 11 deletions src/adapters/external/models/LineInfo.py

This file was deleted.

14 changes: 0 additions & 14 deletions src/adapters/external/models/SPTransPosResp.py

This file was deleted.

Loading