API fully functional

Api docs (SWAGGER, REDOC) available
2025-08-09 23:36:52 +09:00
parent 7ac2defcc0
commit 7ecc556c77
13 changed files with 422 additions and 412 deletions
--- a/scripts/api_e2e.py
+++ b/scripts/api_e2e.py
@@ -24,7 +24,12 @@ DEFAULT_BASE_URL = os.getenv("BASE_URL", "http://localhost:8080")
 DEFAULT_PASSWORD = os.getenv("PASS", "secret123")
 DEFAULT_CLIENTS = int(os.getenv("CLIENTS", "2"))
 DEFAULT_EMAIL_DOMAIN = os.getenv("EMAIL_DOMAIN", "agency.dev")
-DEFAULT_LOG_FILE = os.getenv("LOG_FILE", "logs/api.log")
+DEFAULT_LOG_FILE = os.getenv("LOG_FILE", "logs/api.log")trevor@trevor-pc:/home/data/marriage/scripts$ ./e2e.sh 
+=== E2E smoke test start ===
+BASE_URL: http://localhost:8080
+
+[23:20:10] Waiting gateway at http://localhost:8080/auth/health (allowed: 200)
+
 DEFAULT_TIMEOUT = float(os.getenv("HTTP_TIMEOUT", "10.0"))

 # -------------------------
--- a/scripts/patch.sh
+++ b/scripts/patch.sh
@@ -1,120 +1,134 @@
-cat > scripts/fix_chat_uuid_schemas.sh <<'SH'
+#!/usr/bin/env bash
 set -euo pipefail

-svc_dir="services/chat/src/app/schemas"
-test -d "$svc_dir" || { echo "Not found: $svc_dir"; exit 1; }
+CONF="infra/gateway/nginx.conf"
+[[ -f "$CONF" ]] || { echo "[ERR] $CONF not found"; exit 1; }
+cp "$CONF" "$CONF.bak.$(date +%s)"
+echo "[OK] backup saved"

-python3 - <<'PY'
-import re
-from pathlib import Path
+cat > "$CONF" <<'NGINX'
+server {
+  listen 80;
+  server_name _;

-root = Path("services/chat/src/app/schemas")
+  # Docker DNS
+  resolver 127.0.0.11 ipv6=off valid=10s;

-def ensure_future_and_uuid(text: str) -> str:
-    lines = text.splitlines(keepends=True)
-    changed = False
+  # Health of gateway itself
+  location = /health {
+    default_type application/json;
+    return 200 '{"status":"ok","gateway":"nginx"}';
+  }

-    # Удалим дубли future-импорта
-    fut_pat = re.compile(r'^\s*from\s+__future__\s+import\s+annotations\s*(#.*)?$\n?', re.M)
-    if fut_pat.search(text):
-        lines = [ln for ln in lines if not fut_pat.match(ln)]
-        changed = True
+  # ===== Unified API Docs (docs aggregator) =====
+  location = /docs {
+    proxy_pass         http://marriage_docs:8000/docs;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    # Вставим future после докстринга (если он есть)
-    i = 0
-    while i < len(lines) and (lines[i].strip()=="" or lines[i].lstrip().startswith("#!") or re.match(r'^\s*#.*coding[:=]', lines[i])):
-        i += 1
-    insert_at = i
-    if i < len(lines) and re.match(r'^\s*[rubfRUBF]*[\'"]{3}', lines[i]):  # докстринг
-        q = '"""' if '"""' in lines[i] else "'''"
-        j = i
-        while j < len(lines):
-            if q in lines[j] and j != i:
-                j += 1
-                break
-            j += 1
-        insert_at = min(j, len(lines))
+  location = /redoc {
+    proxy_pass         http://marriage_docs:8000/redoc;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    if not any("from __future__ import annotations" in ln for ln in lines):
-        lines.insert(insert_at, "from __future__ import annotations\n")
-        changed = True
+  location = /openapi.json {
+    proxy_pass         http://marriage_docs:8000/openapi.json;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    txt = "".join(lines)
-    if "from uuid import UUID" not in txt:
-        # вставим сразу после future
-        # найдём позицию future
-        pos = next((k for k,ln in enumerate(lines) if "from __future__ import annotations" in ln), 0)
-        lines.insert(pos+1, "from uuid import UUID\n")
-        changed = True
+  location = /refresh {
+    proxy_pass         http://marriage_docs:8000/refresh;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    return "".join(lines), changed
+  location = /_health {
+    proxy_pass         http://marriage_docs:8000/_health;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-def set_config(text: str) -> str:
-    # Pydantic v2: добавим ConfigDict и model_config, если их нет
-    if "ConfigDict" not in text:
-        text = re.sub(r'from pydantic import ([^\n]+)',
-                      lambda m: m.group(0).replace(m.group(1), (m.group(1) + ", ConfigDict").replace(", ConfigDict,"," , ConfigDict,")),
-                      text, count=1) if "from pydantic import" in text else ("from pydantic import BaseModel, ConfigDict\n" + text)
+  # ===== Microservices (prefix strip) =====
+  location /auth/ {
+    rewrite ^/auth/(.*)$ /$1 break;
+    proxy_pass         http://marriage_auth:8000;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+    proxy_set_header   Authorization $http_authorization;
+  }

-    # В каждую модель, наследующую BaseModel, которая заканчивается на Read/Out, добавим from_attributes
-    def inject_cfg(block: str) -> str:
-        # если уже есть model_config/orm_mode — не трогаем
-        if "model_config" in block or "class Config" in block:
-            return block
-        # аккуратно добавим model_config сверху класса
-        header, body = block.split(":", 1)
-        return header + ":\n    model_config = ConfigDict(from_attributes=True)\n" + body
+  location /profiles/ {
+    rewrite ^/profiles/(.*)$ /$1 break;
+    proxy_pass         http://marriage_profiles:8000;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    # Разобьём по классам
-    parts = re.split(r'(\nclass\s+[A-Za-z0-9_]+\s*\([^\)]*BaseModel[^\)]*\)\s*:)', text)
-    if len(parts) > 1:
-        out = [parts[0]]
-        for i in range(1, len(parts), 2):
-            head = parts[i]
-            body = parts[i+1]
-            m = re.search(r'class\s+([A-Za-z0-9_]+)\s*\(', head)
-            name = m.group(1) if m else ""
-            if name.endswith(("Read","Out")):
-                out.append(inject_cfg(head + body))
-            else:
-                out.append(head + body)
-        text = "".join(out)
-    return text
+  location /match/ {
+    rewrite ^/match/(.*)$ /$1 break;
+    proxy_pass         http://marriage_match:8000;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-def fix_uuid_fields(text: str) -> str:
-    # Преобразуем только в классах Read/Out
-    def repl_in_class(cls_text: str) -> str:
-        # заменяем аннотации полей
-        repl = {
-            r'(^\s*)(id)\s*:\s*str(\b)': r'\1\2: UUID\3',
-            r'(^\s*)(pair_id)\s*:\s*str(\b)': r'\1\2: UUID\3',
-            r'(^\s*)(room_id)\s*:\s*str(\b)': r'\1\2: UUID\3',
-            r'(^\s*)(sender_id)\s*:\s*str(\b)': r'\1\2: UUID\3',
-            r'(^\s*)(user_id)\s*:\s*str(\b)': r'\1\2: UUID\3',
-        }
-        for pat, sub in repl.items():
-            cls_text = re.sub(pat, sub, cls_text, flags=re.M)
-        return cls_text
+  location /chat/ {
+    rewrite ^/chat/(.*)$ /$1 break;
+    proxy_pass         http://marriage_chat:8000;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }

-    patt = re.compile(r'(\nclass\s+[A-Za-z0-9_]+(Read|Out)\s*\([^\)]*BaseModel[^\)]*\)\s*:\n(?:\s+.*\n)+)', re.M)
-    return patt.sub(lambda m: repl_in_class(m.group(1)), text)
+  location /payments/ {
+    rewrite ^/payments/(.*)$ /$1 break;
+    proxy_pass         http://marriage_payments:8000;
+    proxy_http_version 1.1;
+    proxy_set_header   Host $host;
+    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+  }
+}
+NGINX

-changed_any = False
-for p in root.glob("**/*.py"):
-    txt = p.read_text()
-    new, c1 = ensure_future_and_uuid(txt)
-    new = set_config(new)
-    new2 = fix_uuid_fields(new)
-    if new2 != txt:
-        p.write_text(new2)
-        print("fixed:", p)
-        changed_any = True
-
-print("DONE" if changed_any else "NO-CHANGES")
-PY
-
-echo "[docker] rebuild & restart chat…"
-docker compose build --no-cache  chat >/dev/null
-docker compose restart chat
+echo "[OK] nginx.conf updated"

+echo "[INFO] restarting gateway..."
+docker compose restart gateway >/dev/null

+echo "[INFO] quick checks:"
+echo -n "gateway:    "; curl -s http://localhost:8080/health; echo
+echo -n "docs/_health:"; curl -s http://localhost:8080/_health; echo
+for svc in auth profiles match chat payments; do
+  code=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:8080/$svc/health")
+  echo "$svc/health: $code"
+done