slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pre-commit hook and reformat files

This commit is contained in:
Santiago Lo Coco 2023-11-01 12:06:52 -03:00
parent 98bacab6a9
commit 5084c38283
32 changed files with 123 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.pre-commit-config.yaml
View File

@ -1,11 +1,28 @@
files: ^flights-domain/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: check-merge-conflict
- id: check-symlinks
- id: check-yaml
exclude: observability/
- id: debug-statements
exclude: tests/
- id: destroyed-symlinks
- id: end-of-file-fixer
files: \.(py|sh|rst|yml|yaml)$
- id: mixed-line-ending
- id: trailing-whitespace
files: \.(py|sh|rst|yml|yaml)$
- repo: https://github.com/ambv/black
rev: 23.10.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 6.1.0
rev: 6.0.0
hooks:
- id: flake8
args: [--config, flights-domain/flights-information/setup.cfg]
@ -13,4 +30,4 @@ repos:
rev: 5.12.0
hooks:
- id: isort
args: ['--src-path', 'flights-domain/flights-information/src', 'auth-domain/user-manager/src', 'gateway/src', 'subscription-domain/subscription-manager/src']
args: ['--profile', 'black', '--src-path', 'flights-domain/flights-information/src', 'auth-domain/user-manager/src', 'gateway/src', 'subscription-domain/subscription-manager/src']

22
auth-domain/user-manager/manage.py
View File

@ -16,9 +16,25 @@ def recreate_db():
@cli.command("seed_db")
def seed_db():
db.session.add(User(username="lufthansa", email="info@lufthansa.com", password="password1234", airline=True))
db.session.add(User(username="ryanair", email="info@ryanair.com", password="password1234", airline=True))
db.session.add(User(username="messi", email="messi@gmail.com", password="password1234"))
db.session.add(
User(
username="lufthansa",
email="info@lufthansa.com",
password="password1234",
airline=True,
)
)
db.session.add(
User(
username="ryanair",
email="info@ryanair.com",
password="password1234",
airline=True,
)
)
db.session.add(
User(username="messi", email="messi@gmail.com", password="password1234")
)
db.session.commit()

1
auth-domain/user-manager/src/.cicd/test.sh
View File

@ -20,4 +20,3 @@ else
## Security
# bandit -c .bandit.yml -r .
fi

8
auth-domain/user-manager/src/api/auth.py
View File

@ -55,9 +55,11 @@ class Login(Resource):
access_token = user.encode_token(user.id, "access", user.airline)
refresh_token = user.encode_token(user.id, "refresh")
response_object = {"access_token": access_token,
response_object = {
"access_token": access_token,
"refresh_token": refresh_token,
"user_id": user.id}
"user_id": user.id,
}
return response_object, 200
@ -84,7 +86,7 @@ class Refresh(Resource):
response_object = {
"access_token": access_token,
"refresh_token": refresh_token,
"user_id": user.id
"user_id": user.id,
}
return response_object, 200
except jwt.ExpiredSignatureError:

8
auth-domain/user-manager/src/api/models/users.py
View File

@ -39,7 +39,7 @@ class User(db.Model):
"exp": datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds),
"iat": datetime.datetime.utcnow(),
"sub": user_id,
"airline": airline
"airline": airline,
}
return jwt.encode(
payload, current_app.config.get("SECRET_KEY"), algorithm="HS256"
@ -61,7 +61,7 @@ class User(db.Model):
"username": fields.String(required=True),
"email": fields.String(required=True),
"created_date": fields.DateTime,
"airline": fields.Boolean(readOnly=True)
"airline": fields.Boolean(readOnly=True),
},
)
@ -82,7 +82,7 @@ class User(db.Model):
{
"username": fields.String(required=True),
"email": fields.String(required=True),
"id": fields.Integer(required=True)
"id": fields.Integer(required=True),
},
)
@ -119,5 +119,5 @@ class User(db.Model):
"Access and Refresh Token",
cls.get_api_auth_refresh_model(namespace),
{"access_token": fields.String(required=True)},
{"user_id": fields.Integer(required=True)}
{"user_id": fields.Integer(required=True)},
)

3
auth-domain/user-manager/src/tests/unit/test_generic.py
View File

@ -1,5 +1,4 @@
from src.api.models.generic import (get_model_create_response,
get_model_error_response)
from src.api.models.generic import get_model_create_response, get_model_error_response
def test_model_create_response(test_namespace):

1
flights-domain/flights-information/src/api/main.py
View File

@ -6,6 +6,7 @@ from src.api.routes import flights, health
Base.metadata.create_all(bind=engine)
app = FastAPI(title="Flights Information API")
app.include_router(flights.router, prefix="/flights")
app.include_router(health.router, prefix="/health")

7
gateway/sleep.sh
View File

@ -1,7 +0,0 @@
#!/bin/sh
# while ! curl -f 'fids_logstash:9600/_node/pipelines'; do
# sleep 1
# done
nc -vz -w1 localhost 5004 # && curl -f fids_logstash:9600/_node/pipelines

6
gateway/src/api/main.py
View File

@ -3,10 +3,10 @@ import logging
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from src.api.routes import (auth, flights, health, notifications,
subscriptions, users)
from src.api.routes import auth, flights, health, notifications, subscriptions, users
logging.config.fileConfig("logging.conf", disable_existing_loggers=False)
logging.config.fileConfig('logging.conf', disable_existing_loggers=False)
app = FastAPI(title="Flights Information API")
app.include_router(flights.router, prefix="/flights")

14
gateway/src/api/routes/flights.py
View File

@ -25,9 +25,7 @@ async def create_flight(
auth = await checkAuth(authorization)
flight_data = flight.model_dump()
flight_data["user_id"] = auth["id"]
(response, status, _) = await request(
f"{API_FLIGHTS}", "POST", json=flight_data
)
(response, status, _) = await request(f"{API_FLIGHTS}", "POST", json=flight_data)
if status < 200 or status > 204:
raise HTTPException(status_code=status, detail=response)
return response
@ -42,16 +40,18 @@ async def update_flight(
auth = await checkAuth(authorization)
status = status_update.model_dump()
status["user_id"] = auth["id"]
(response, status, _) = await request(
f"{API_FLIGHTS}/{id}", "PATCH", json=status
)
(response, status, _) = await request(f"{API_FLIGHTS}/{id}", "PATCH", json=status)
if status < 200 or status > 204:
raise HTTPException(status_code=status, detail=response)
return response
@router.get("", response_model=list[Flight])
async def get_flights(origin: Optional[str] = None, destination: Optional[str] = None, lastUpdated: Optional[str] = None):
async def get_flights(
origin: Optional[str] = None,
destination: Optional[str] = None,
lastUpdated: Optional[str] = None,
):
query = {}
if origin:
query["origin"] = origin

12
gateway/src/api/routes/health.py
View File

@ -1,21 +1,13 @@
# from src.api.main import my_logger
import logging
from fastapi import APIRouter
# from sys import stdout
my_logger = logging.getLogger(__name__)
# my_logger.setLevel(logging.INFO)
# consoleHandler = logging.StreamHandler(stdout)
# my_logger.addHandler(consoleHandler)
# handler = graypy.GELFUDPHandler("fids_logstash", 12201)
# my_logger.addHandler(handler)
router = APIRouter()
@router.get("", status_code=200)
async def get_health():
my_logger.info("{\"health\":\"OK\"}")
my_logger.info('{"health":"OK"}')
return {"status": "OK"}

3
gateway/src/api/routes/subscriptions.py
View File

@ -12,8 +12,7 @@ router = APIRouter()
@router.post("")
async def create_subscription(
subscription: Subscription,
authorization: Annotated[str | None, Header()] = None
subscription: Subscription, authorization: Annotated[str | None, Header()] = None
):
await checkAuth(authorization)
(response, status, _) = await request(

5
subscription-domain/subscription-manager/src/api/cruds/subscription.py
View File

@ -21,8 +21,9 @@ def create_subscription(db: Session, subscription: SubscriptionPydantic):
def remove_subscription(db: Session, user_id: int, flight_id: int):
db.query(Subscription).filter(Subscription.user_id == user_id
and Subscription.flight_id == flight_id).delete()
db.query(Subscription).filter(
Subscription.user_id == user_id and Subscription.flight_id == flight_id
).delete()
db.commit()

1
subscription-domain/subscription-manager/src/api/main.py
View File

@ -6,6 +6,7 @@ from src.api.routes import health, messages, notifications, subscriptions
Base.metadata.create_all(bind=engine)
app = FastAPI(title="Subscription Information API")
app.include_router(subscriptions.router, prefix="/subscriptions")
app.include_router(notifications.router, prefix="/notifications")

4
subscription-domain/subscription-manager/src/api/routes/messages.py
View File

@ -12,7 +12,9 @@ router = APIRouter()
@router.post("")
async def send_notification(flight: FlightData, background_tasks: BackgroundTasks, db: Session = Depends(get_db)):
async def send_notification(
flight: FlightData, background_tasks: BackgroundTasks, db: Session = Depends(get_db)
):
db_subscriptions = sub_crud.send_subscriptions(db=db, flight=flight)
for subscription in db_subscriptions:
db_chat = notif_crud.get_chat_id(db=db, user_id=subscription.user_id)

18
subscription-domain/subscription-manager/src/api/routes/notifications.py
View File

@ -14,14 +14,12 @@ from src.api.utils.messages import get_flight_message, get_invalid_message
router = APIRouter()
msg_options = re.compile(r'^/(flight \d+|stop|start)$')
msg_options = re.compile(r"^/(flight \d+|stop|start)$")
@router.post("")
async def create_chat(
chat: Update,
background_tasks: BackgroundTasks,
db: Session = Depends(get_db)
chat: Update, background_tasks: BackgroundTasks, db: Session = Depends(get_db)
):
print(chat.model_dump())
message = chat.message
@ -32,19 +30,19 @@ async def create_chat(
background_tasks.add_task(telegram.send_message, chat_id, msg)
return Response(status_code=204)
action = text.partition(' ')[0]
if action == '/start':
user_id = int(message["text"].partition(' ')[2])
action = text.partition(" ")[0]
if action == "/start":
user_id = int(message["text"].partition(" ")[2])
new_chat = Chat(chat_id=str(message["chat"]["id"]), user_id=user_id)
notif_crud.create_chat(db=db, chat=new_chat)
elif action == '/stop':
elif action == "/stop":
chat_id = str(message["chat"]["id"])
user_id = notif_crud.get_user_from_chat(db=db, chat_id=chat_id).user_id
subs_crud.remove_subscriptions(user_id)
notif_crud.remove_chat(db=db, chat_id=chat_id)
elif action == '/flight':
elif action == "/flight":
chat_id = str(message["chat"]["id"])
flight_id = int(message["text"].partition(' ')[2])
flight_id = int(message["text"].partition(" ")[2])
(response, status, _) = await request(f"{API_FLIGHTS}/{flight_id}", "GET")
if status < 200 or status > 204:
msg = f"Could not get flight '{flight_id}'. Sorry!"

8
subscription-domain/subscription-manager/src/api/routes/subscriptions.py
View File

@ -22,6 +22,10 @@ def get_subscriptions(user_id: int, db: Session = Depends(get_db)):
@router.delete("/{user_id}")
def delete_subscription(user_id: int, subscription: SubscriptionRemove, db: Session = Depends(get_db)):
sub_crud.remove_subscription(db=db, user_id=user_id, flight_id=subscription.flight_id)
def delete_subscription(
user_id: int, subscription: SubscriptionRemove, db: Session = Depends(get_db)
):
sub_crud.remove_subscription(
db=db, user_id=user_id, flight_id=subscription.flight_id
)
return Response(status_code=204)