Moved wait_for_db function to utils module

Jenkinsfile

@@ -1,72 +0,0 @@
-pipeline {
-    agent any
-    environment {
-        DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
-        DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
-        ACR_NAME = 'marcin00'
-    }
-    stages {
-        stage('Checkout') {
-            steps {
-                checkout scm
-            }
-        }
-        stage('Test python app') {
-            steps {
-                script {
-                    dir('api') {
-                        sh '''
-                            python3 -m venv env
-                            source env/bin/activate
-                            pip install -r requirements.txt pytest
-                            python3 -m pytest --junit-xml=pytest_junit.xml
-                        '''
-                    }
-                }
-            }
-            post {
-                always {
-                    junit testResults: '**/*pytest_junit.xml'
-                }
-            }
-        }
-        stage('Build & test docker image') {
-            steps {
-                script {
-                    appImage = docker.build("${DOCKER_IMAGE}")
-
-                    sh label: 'Install dgoss', script: '''
-                        curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o goss
-                        curl -s -L https://github.com/aelsabbahy/goss/releases/latest/download/dgoss -o dgoss
-                        chmod +rx *goss
-                    '''
-                    
-                    withEnv(["GOSS_OPTS=-f junit", 'GOSS_PATH=./goss', "SQLALCHEMY_DATABASE_URI=sqlite:///:memory:"]) {
-                        sh label: 'run image tests', script: './dgoss run ${DOCKER_IMAGE} > goss_junit.xml'
-                    }
-                }
-            }
-            post {
-                always {
-                    junit testResults: '**/*goss_junit.xml'
-                }
-            }
-        }
-        stage('Deploy') {
-            steps {
-                script {
-                    sh '''
-                        az login --identity
-                        az acr login --name ${ACR_NAME}
-                        docker push ${DOCKER_IMAGE}
-                    '''
-                }
-            }
-        }
-    }
-    post {
-        cleanup {
-            script { cleanWs() }
-        }
-    }
-}

api/app.py

@@ -4,7 +4,7 @@ from flask_jwt_extended import JWTManager
 from jwt import ExpiredSignatureError
 from models import db, RevokedToken
 import os
-from utils import init_db
+from utils import init_db, wait_for_db
 from views import user_bp
 from werkzeug.exceptions import HTTPException
 
@@ -53,6 +53,7 @@ def create_app(config_name="default"):
 
     # Fill database by initial values (only if we are not testing)
     with app.app_context():
+        wait_for_db()
         db.create_all()
         if config_name != "testing":
             init_db()
@@ -61,5 +62,7 @@ def create_app(config_name="default"):
 
 # Server start only if we run app directly
 if __name__ == "__main__":
+    from waitress import serve
     app = create_app()
-    app.run(host="0.0.0.0")
+    port = os.getenv("APP_PORT", "80")
+    serve(app, host="0.0.0.0", port=port)

api/requirements.txt

@@ -11,4 +11,5 @@ mysql-connector-python==9.2.0
 python-dotenv==1.0.0
 SQLAlchemy==2.0.23
 typing_extensions==4.8.0
+waitress==3.0.2
 Werkzeug==3.0.1

api/utils.py

@@ -2,6 +2,9 @@ from flask import abort
 from flask_jwt_extended import get_jwt_identity
 from models import User, db
 import os
+from sqlalchemy import text
+from sqlalchemy.exc import DatabaseError
+import time
 from werkzeug.security import generate_password_hash
 
 
@@ -27,6 +30,22 @@ def get_user_or_404(user_id):
     return user
 
 
+MAX_RETRIES = 100
+
+def wait_for_db():
+    for retries in range(MAX_RETRIES):
+        try:
+            with db.engine.connect() as connection:
+                connection.execute(text("SELECT 1"))
+            print("Successfully connected with database.")
+            return
+        except DatabaseError:
+            print(f"Waiting for database... (retry {retries + 1})")
+            time.sleep(3)
+    print("Failed to connect to database.")
+    raise Exception("Database not ready after multiple retries.")
+
+
 def init_db():
     """Create default admin account if database is empty"""
     with db.session.begin():

goss.yaml

@@ -1,8 +0,0 @@
-port:
-  tcp:80:
-    listening: true
-    ip:
-    - 0.0.0.0
-process:
-  python:
-    running: true