Changed decimal separator to comma

.woodpecker/build.yaml

@@ -1,70 +0,0 @@
-when:
-  - event: push
-    branch: woodpecker
-
-steps:
-  - name: code-tests
-    image: python:3.11.7-alpine
-    commands:
-      - cd api
-      - python3 -m venv env
-      - source env/bin/activate
-      - pip install -r requirements.txt pytest
-      - python3 -m pytest --junit-xml=pytest_junit.xml
-
-  - name: build-and-push
-    image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
-    environment:
-      ACR_NAME: marcin00
-      CLIENT_ID: c302726f-fafb-4143-94c1-67a70975574a
-    commands:
-      - dockerd &
-      - export DOCKER_IMAGE=marcin00.azurecr.io/user-microservice:${CI_COMMIT_SHA}
-      - docker build -t $DOCKER_IMAGE --build-arg APP_VERSION=${CI_COMMIT_SHA} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .
-      - az login --identity --client-id $CLIENT_ID
-      - az acr login --name $ACR_NAME
-      - docker push $DOCKER_IMAGE
-    backend_options:
-      kubernetes:
-        annotations:
-          io.kubernetes.cri-o.userns-mode: "auto:size=65536"
-        runtimeClassName: sysbox-runc
-
-  - name: gitops-commit
-    image: alpine/git
-    environment:
-      DEPLOY_REPO: ssh://git@srv22.mikr.us:20343/pikram/user-microservice-deploy.git
-      GITEA_DEPLOY_KEY:
-        from_secret: gitea-deploy-key
-      GITEA_KNOWN_HOST:
-        from_secret: gitea-known-host
-    commands:
-      - mkdir -p ~/.ssh
-
-      - echo "$GITEA_KNOWN_HOST" >> ~/.ssh/known_hosts
-      - chmod 644 ~/.ssh/known_hosts
-
-      - echo "$GITEA_DEPLOY_KEY" > ~/.ssh/id_rsa
-      - chmod 600 ~/.ssh/id_rsa
-
-      - git config --global user.name "woodpecker[bot]"
-      - git config --global user.email "woodpecker@marcin00.pl"
-
-      - git clone $DEPLOY_REPO --branch woodpecker-deploy
-      - cd user-microservice-deploy
-      
-      - |
-        awk -v commit="$CI_COMMIT_SHA" '
-        $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
-        in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
-            sub(/:[^:[:space:]]+$/, ":" commit)
-            in_api_container = 0
-            print
-            next
-        }
-        { print }
-        ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
-      
-      - git add deploy.yaml
-      - 'git diff-index --quiet HEAD || git commit -m "WOODPECKER: Changed deployed version to $CI_COMMIT_SHA"'
-      - git push origin woodpecker-deploy

api/app.py

@@ -4,7 +4,8 @@ from flask_jwt_extended import JWTManager
 from jwt import ExpiredSignatureError
 from models import db, RevokedToken
 import os
-from utils import init_db
+from tech_views import tech_bp
+from utils import init_db, wait_for_db
 from views import user_bp
 from werkzeug.exceptions import HTTPException
 
@@ -26,6 +27,7 @@ def create_app(config_name="default"):
 
     # Blueprints registration
     app.register_blueprint(user_bp)
+    app.register_blueprint(tech_bp)
 
     # Database and JWT initialization
     db.init_app(app)
@@ -53,6 +55,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(max_retries=100)
         db.create_all()
         if config_name != "testing":
             init_db()

api/tech_views.py

@@ -0,0 +1,20 @@
+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

api/utils.py

@@ -2,17 +2,22 @@ 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, InterfaceError
+import time
 from werkzeug.security import generate_password_hash
 
+db_ready = False
 
 def admin_required(user_id, message='Access denied.'):
+    "Check if common user try to make administrative action."
     user = db.session.get(User, user_id)
     if user is None or user.role != "Administrator":
         abort(403, message)
 
 
 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_role = db.session.get(User, logged_user_id).role
     if logged_user_role != "Administrator" and logged_user_id != owner_id:
@@ -27,6 +32,20 @@ def get_user_or_404(user_id):
     return user
 
 
+def wait_for_db(max_retries):
+    "Try to connect with database <max_retries> times."
+    global db_ready
+    for _ in range(max_retries):
+        try:
+            with db.engine.connect() as connection:
+                connection.execute(text("SELECT 1"))
+            db_ready = True
+            return
+        except DatabaseError | InterfaceError:
+            time.sleep(3)
+    raise Exception("Failed to connect to database.")
+
+
 def init_db():
     """Create default admin account if database is empty"""
     with db.session.begin():

api/views.py

@@ -2,6 +2,7 @@ from flask import Blueprint, jsonify, request, abort
 from flask_jwt_extended import create_access_token, set_access_cookies, jwt_required, \
 verify_jwt_in_request, get_jwt_identity, unset_jwt_cookies, get_jwt
 from models import db, RevokedToken, User
+import os
 from utils import admin_required, validate_access, get_user_or_404
 from werkzeug.security import check_password_hash, generate_password_hash
 
@@ -110,3 +111,10 @@ def user_logout():
     response = jsonify({"msg": "User logged out successfully."})
     unset_jwt_cookies(response)
     return response
+
+@user_bp.route('/version', methods=['GET'])
+def version():
+    return jsonify({
+        "version": os.getenv("APP_VERSION", "unknown"),
+        "build_time": os.getenv("BUILD_DATE", "unknown")
+    })

data_analysis.py

@@ -0,0 +1,67 @@
+import matplotlib.pyplot as plt # type: ignore
+import os
+import statistics
+
+# Dane
+data = {
+    'Jenkins + Jenkins': (165, 158, 217, 164, 136, 135, 147, 145, 138, 134, 137, 129, 136, 142, 125, 138, 133, 136, 128, 131),
+    'Jenkins + ArgoCD': (181, 111, 115, 121, 128, 105, 108, 119, 112, 109, 110, 108, 111, 106, 113, 117, 113, 120, 113, 107),
+    'Jenkins + FluxCD' : (167, 119, 113, 110, 102, 126, 111, 113, 118, 106, 111, 104, 101, 105, 104, 106, 102, 105, 107, 103),
+    'Woodpecker + Woodpecker': (340, 348, 334, 363, 350, 339, 331, 354, 357, 351, 356, 347, 354, 341, 357, 352, 368, 336, 331, 340),
+    'Woodpecker + ArgoCD': (355, 360, 354, 344, 318, 353, 328, 305, 331, 324, 328, 349, 337, 328, 349, 350, 344, 344, 344, 341),
+    'Woodpecker + FluxCD' : (326, 344, 325, 337, 343, 358, 339, 341, 335, 354, 342, 355, 345, 334, 356, 346, 338, 342, 330, 333),
+    'Argo Workflows + Argo-Workflows': (190, 190, 169, 211, 172, 198, 207, 192, 212, 181, 168, 199, 216, 213, 220, 209, 192, 210, 196, 165),
+    'Argo Workflows + ArgoCD': (145, 159, 163, 148, 169, 185, 153, 148, 139, 176, 133, 140, 161, 135, 161, 130, 139, 164, 183, 183),
+    'Argo Workflows + FluxCD': (161, 136, 181, 157, 141, 139, 157, 149, 151, 139, 139, 148, 152, 142, 136, 149, 160, 145, 173, 161)
+}
+
+# Wyliczenie średnich
+labels = list(data.keys())
+means = [statistics.mean(data[k]) for k in labels]
+
+# Grupy indeksów do porównań
+groupings = [
+    [0, 1, 2],
+    [3, 4, 5],
+    [6, 7, 8],
+    [0, 3, 6],
+    [1, 4, 7],
+    [2, 5, 8]
+]
+
+# Kolory z palety 'tab10'
+color_palette = plt.get_cmap('tab10')
+
+# Folder wyjściowy
+output_folder = "plots"
+os.makedirs(output_folder, exist_ok=True)
+
+# Generowanie wykresów
+for i, group in enumerate(groupings):
+    group_labels = [labels[j] for j in group]
+    group_means = [means[j] for j in group]
+    colors = [color_palette(j % 10) for j in group]  # różne kolory
+
+    plt.figure()
+    bars = plt.bar(group_labels, group_means, color=colors)
+
+    # Oblicz maksymalną wartość, by zwiększyć wysokość osi Y
+    max_val = max(group_means)
+    plt.ylim(0, max_val * 1.15)  # dodaj 15% zapasu na tekst
+
+    plt.ylabel("Średni czas wdrożenia (sek)")
+    plt.title(f"Porównanie średnich czasów wdrożenia")
+    plt.xticks(rotation=45)
+
+    # Dodanie wartości nad słupkami
+    for bar in bars:
+        yval = bar.get_height()
+        label = f'{yval:.1f}'.replace('.', ',')  # <-- tutaj zamiana kropki na przecinek
+        plt.text(bar.get_x() + bar.get_width()/2.0, yval + max_val * 0.02, label,
+                ha='center', va='bottom', fontsize=9)
+
+    plt.tight_layout()
+    plt.savefig(f"{output_folder}/mean_times_{i}.png")
+    plt.close()
+
+print("Wszystkie wykresy wygenerowane z dodatkowymi marginesami!")

docker-compose.yml

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

version_marker.txt

@@ -1 +0,0 @@
-1753539316