MERGE: resolve conflicts

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

test/api_endpoints/test_history_endpoints.py

@@ -0,0 +1,41 @@
+import sys
+import pathlib
+import sqlite3
+import random
+import string
+import uuid
+import os
+import pytest
+
+INSTALL_PATH = os.getenv("NETALERTX_APP", "/app")
+sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
+
+from helper import get_setting_value
+from api_server.api_server_start import app
+
+
+@pytest.fixture(scope="session")
+def api_token():
+    return get_setting_value("API_TOKEN")
+
+
+@pytest.fixture
+def client():
+    with app.test_client() as client:
+        yield client
+
+
+@pytest.fixture
+def test_mac():
+    # Generate a unique MAC for each test run
+    return "AA:BB:CC:" + ":".join(f"{random.randint(0,255):02X}" for _ in range(3))
+
+
+def auth_headers(token):
+    return {"Authorization": f"Bearer {token}"}
+
+
+def test_delete_history(client, api_token):
+    resp = client.delete(f"/history", headers=auth_headers(api_token))
+    assert resp.status_code == 200
+    assert resp.json.get("success") is True