Compare commits

..

No commits in common. "301cf5922e247f23f48ee266da0ca8b80e101314" and "d3d3c98f997f5c4731f90b484e01f2fdae000705" have entirely different histories.

5 changed files with 11 additions and 49 deletions

View File

@ -1,6 +1,5 @@
FROM python:3.11.7-alpine FROM python:3.11.7-slim-bookworm
WORKDIR /app WORKDIR /app
COPY api . COPY api .
RUN apk add --no-cache curl
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
CMD python3 app.py CMD python3 app.py

View File

@ -4,7 +4,6 @@ from flask_jwt_extended import JWTManager
from jwt import ExpiredSignatureError from jwt import ExpiredSignatureError
from models import db, RevokedToken from models import db, RevokedToken
import os import os
from tech_views import tech_bp
from utils import init_db, wait_for_db from utils import init_db, wait_for_db
from views import user_bp from views import user_bp
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
@ -27,7 +26,6 @@ def create_app(config_name="default"):
# Blueprints registration # Blueprints registration
app.register_blueprint(user_bp) app.register_blueprint(user_bp)
app.register_blueprint(tech_bp)
# Database and JWT initialization # Database and JWT initialization
db.init_app(app) db.init_app(app)
@ -55,7 +53,7 @@ def create_app(config_name="default"):
# Fill database by initial values (only if we are not testing) # Fill database by initial values (only if we are not testing)
with app.app_context(): with app.app_context():
wait_for_db(max_retries=100) wait_for_db()
db.create_all() db.create_all()
if config_name != "testing": if config_name != "testing":
init_db() init_db()

View File

@ -1,20 +0,0 @@
from flask import Blueprint, jsonify
from models import db
from sqlalchemy import text
from utils import db_ready
# Blueprint with technical endpoints
tech_bp = Blueprint('tech_bp', __name__)
@tech_bp.route('/health', methods=['GET'])
def health_check():
"Check if service works and database is functional"
try:
with db.engine.connect() as connection:
connection.execute(text("SELECT 1"))
return jsonify(status="healthy"), 200
except Exception:
if db_ready:
return jsonify(status="unhealthy"), 500
else:
return jsonify(status="starting"), 503

View File

@ -7,17 +7,15 @@ from sqlalchemy.exc import DatabaseError
import time import time
from werkzeug.security import generate_password_hash from werkzeug.security import generate_password_hash
db_ready = False
def admin_required(user_id, message='Access denied.'): def admin_required(user_id, message='Access denied.'):
"Check if common user try to make administrative action."
user = db.session.get(User, user_id) user = db.session.get(User, user_id)
if user is None or user.role != "Administrator": if user is None or user.role != "Administrator":
abort(403, message) abort(403, message)
def validate_access(owner_id, message='Access denied.'): def validate_access(owner_id, message='Access denied.'):
"Check if user try to access or edit resource that does not belong to them." # Check if user try to access or edit resource that does not belong to them
logged_user_id = int(get_jwt_identity()) logged_user_id = int(get_jwt_identity())
logged_user_role = db.session.get(User, logged_user_id).role logged_user_role = db.session.get(User, logged_user_id).role
if logged_user_role != "Administrator" and logged_user_id != owner_id: if logged_user_role != "Administrator" and logged_user_id != owner_id:
@ -32,18 +30,20 @@ def get_user_or_404(user_id):
return user return user
def wait_for_db(max_retries): MAX_RETRIES = 100
"Try to connect with database <max_retries> times."
global db_ready def wait_for_db():
for _ in range(max_retries): for retries in range(MAX_RETRIES):
try: try:
with db.engine.connect() as connection: with db.engine.connect() as connection:
connection.execute(text("SELECT 1")) connection.execute(text("SELECT 1"))
db_ready = True print("Successfully connected with database.")
return return
except DatabaseError: except DatabaseError:
print(f"Waiting for database... (retry {retries + 1})")
time.sleep(3) time.sleep(3)
raise Exception("Failed to connect to database.") print("Failed to connect to database.")
raise Exception("Database not ready after multiple retries.")
def init_db(): def init_db():

View File

@ -7,24 +7,9 @@ services:
build: . build: .
env_file: env_file:
- api/.env - api/.env
ports:
- 80:80
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/health"]
interval: 10s
timeout: 5s
retries: 5
start_period: 15s
db: db:
container_name: db container_name: db
hostname: db hostname: db
image: mysql:latest image: mysql:latest
env_file: env_file:
- db/.env - db/.env
ports:
- 3306:3306
healthcheck:
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
interval: 10s
timeout: 5s
retries: 5