upload: всегда одно соединение, убран if cid, v1.23

2026-06-17 18:58:43 +04:00
parent 6585598fca
commit 05c41e8c4a
2 changed files with 22 additions and 16 deletions
@@ -152,25 +152,31 @@ class ContractsApp:
        mime = mimeutil.guess_mime(filename) or "application/octet-stream"
        cid = data.get("cid")

-        conn = None
-        if cid:
-            contract_id = cid
-        else:
+        # Всегда одно соединение
        conn, err = db.connect()
        if err:
            return jsonify({"error": f"БД: {err}"}), 500
+        try:
            cur = conn.cursor()
+            if cid:
+                contract_id = cid
+            else:
                cur.execute(
                    "INSERT INTO contracts (number, client) VALUES (%s, %s) RETURNING id",
                    ("б/н " + __import__("datetime").datetime.now().strftime("%Y%m%d-%H%M"), ""),
                )
                contract_id = cur.fetchone()[0]
-            conn.commit()

            doc_id = _save_file_to_db(filename, file_bytes, mime, str(contract_id), conn=conn)
-        if conn:
+            conn.commit()
            cur.close()
+        except Exception as e:
+            try: conn.rollback()
+            except: pass
+            raise e
+        finally:
            db.put_conn(conn)
+
        return jsonify({"contract_id": str(contract_id), "doc_id": str(doc_id) if doc_id else None})

    # ── Чанковая загрузка ──────────────────────────────────────
@@ -59,7 +59,7 @@
 <body>
  <div class="topbar">
    <img src="{{ url_for('static', filename='nubes-logo.svg') }}" alt="Nubes">
-    <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.22</span></span>
+    <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.23</span></span>
  </div>

  <div class="content">