diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2546c6b..6591b4e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,4 +13,4 @@ repos: rev: 5.12.0 hooks: - id: isort - args: ['--src-path', 'flights-domain/flights-information/src', 'auth-domain/user-manager/src'] + args: ['--src-path', 'flights-domain/flights-information/src', 'auth-domain/user-manager/src', 'gateway/src'] diff --git a/flights-domain/flights-information/src/tests/test_flights.py b/flights-domain/flights-information/src/tests/test_flights.py index f0bd295..bcb3162 100644 --- a/flights-domain/flights-information/src/tests/test_flights.py +++ b/flights-domain/flights-information/src/tests/test_flights.py @@ -1,21 +1,22 @@ from fastapi.testclient import TestClient -import src.api.cruds.flight +import src.api.cruds.flight from src.api.main import app client = TestClient(app) mocked_flight = { - "id": 1, - "flight_code": "ABC125", - "status": "En ruta", - "origin": "Ciudad B", - "destination": "Ciudad A", - "departure_time": "2023-10-10 10:00 AM", - "arrival_time": "2023-10-10 12:00 PM", - "gate": "A2", - } + "id": 1, + "flight_code": "ABC125", + "status": "En ruta", + "origin": "Ciudad B", + "destination": "Ciudad A", + "departure_time": "2023-10-10 10:00 AM", + "arrival_time": "2023-10-10 12:00 PM", + "gate": "A2", +} + class AttrDict(dict): def __init__(self, *args, **kwargs): @@ -23,25 +24,22 @@ class AttrDict(dict): self.__dict__ = self - def test_not_found_flight(monkeypatch): - - def mock_get_flight_by_id(db,id): - return None + def mock_get_flight_by_id(db, id): + return None monkeypatch.setattr(src.api.cruds.flight, "get_flight_by_id", mock_get_flight_by_id) resp = client.get("/flights/1") assert resp.status_code == 404 -def test_successful_get_flight(monkeypatch): - def mock_get_flight_by_id(db,id): - return mocked_flight +def test_successful_get_flight(monkeypatch): + def mock_get_flight_by_id(db, id): + return mocked_flight monkeypatch.setattr(src.api.cruds.flight, "get_flight_by_id", mock_get_flight_by_id) - response = client.get("/flights/1") assert response.status_code == 200 assert response.json() == mocked_flight diff --git a/gateway/src/api/main.py b/gateway/src/api/main.py index 948fe8a..e154a27 100644 --- a/gateway/src/api/main.py +++ b/gateway/src/api/main.py @@ -1,7 +1,7 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from src.api.routes import flights, health, auth, users +from src.api.routes import auth, flights, health, users app = FastAPI(title="Flights Information API") app.include_router(flights.router, prefix="/flights") diff --git a/gateway/src/api/routes/auth.py b/gateway/src/api/routes/auth.py index 6afab4a..c1cd3f0 100644 --- a/gateway/src/api/routes/auth.py +++ b/gateway/src/api/routes/auth.py @@ -1,11 +1,10 @@ -from typing import Optional -from fastapi import APIRouter, Depends, HTTPException, status, Request, Header -from typing import Annotated +from typing import Annotated, Optional + +from fastapi import APIRouter, Depends, Header, HTTPException, Request, status from src.api.config import API_AUTH -from src.api.schemas.auth import Token, RefreshToken -from src.api.schemas.user import User, UserLogin, UserRegister, UserMin - +from src.api.schemas.auth import RefreshToken, Token +from src.api.schemas.user import User, UserLogin, UserMin, UserRegister from src.api.utils.network import make_request, request router = APIRouter() diff --git a/gateway/src/api/routes/flights.py b/gateway/src/api/routes/flights.py index ef3e8b4..2076222 100644 --- a/gateway/src/api/routes/flights.py +++ b/gateway/src/api/routes/flights.py @@ -1,15 +1,13 @@ -from typing import Optional -from fastapi import APIRouter, Depends, HTTPException, status, Request, Header -import aiohttp import asyncio -from typing import Annotated +from typing import Annotated, Optional -from src.api.routes.auth import status as checkAuth +import aiohttp +from fastapi import APIRouter, Depends, Header, HTTPException, Request, status -from src.api.utils.network import make_request, request from src.api.config import API_FLIGHTS - +from src.api.routes.auth import status as checkAuth from src.api.schemas.flight import Flight, FlightCreate, FlightStatusUpdate +from src.api.utils.network import make_request, request router = APIRouter() diff --git a/gateway/src/api/routes/users.py b/gateway/src/api/routes/users.py index 327d233..45d17ff 100644 --- a/gateway/src/api/routes/users.py +++ b/gateway/src/api/routes/users.py @@ -1,8 +1,8 @@ from typing import Optional -from fastapi import APIRouter, Depends, HTTPException, status, Request, Header + +from fastapi import APIRouter, Depends, Header, HTTPException, Request, status from src.api.config import API_USERS - from src.api.schemas.user import User, UserLogin, UserRegister from src.api.utils.network import make_request, request diff --git a/gateway/src/api/schemas/auth.py b/gateway/src/api/schemas/auth.py index 9b08354..21846ae 100644 --- a/gateway/src/api/schemas/auth.py +++ b/gateway/src/api/schemas/auth.py @@ -3,6 +3,7 @@ from typing import Optional from pydantic import BaseModel, validator + class Token(BaseModel): access_token: str refresh_token: str diff --git a/gateway/src/api/schemas/user.py b/gateway/src/api/schemas/user.py index 5f77894..4450389 100644 --- a/gateway/src/api/schemas/user.py +++ b/gateway/src/api/schemas/user.py @@ -2,6 +2,7 @@ from datetime import datetime from pydantic import BaseModel, validator + class User(BaseModel): id: int username: str diff --git a/gateway/src/api/utils/network.py b/gateway/src/api/utils/network.py index b682b6e..f3dfaab 100644 --- a/gateway/src/api/utils/network.py +++ b/gateway/src/api/utils/network.py @@ -1,7 +1,8 @@ +from typing import Optional, Union + import aiohttp import async_timeout -from typing import Optional, Union -from aiohttp import JsonPayload, ContentTypeError, ClientConnectorError +from aiohttp import ClientConnectorError, ContentTypeError, JsonPayload from fastapi import HTTPException