new file: .dockerignore

new file:   .env.example
	new file:   Dockerfile
	modified:   backend/.env.example
	modified:   backend/package.json
	renamed:    backend/src/migrations/run.ts -> backend/src/scripts/run.ts
	renamed:    backend/src/migrations/seed.ts -> backend/src/scripts/seed.ts
	new file:   docker-compose.external-db.yml
	new file:   docker-compose.yml

.dockerignore

@@ -0,0 +1,44 @@
+# Dependencies
+node_modules
+**/node_modules
+
+# Build outputs (will be rebuilt in container)
+dist
+**/dist
+build
+**/build
+
+# Git
+.git
+.gitignore
+
+# IDE
+.idea
+.vscode
+*.swp
+*.swo
+
+# Logs
+*.log
+logs
+
+# Environment files
+.env
+.env.local
+.env.*.local
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Test files
+coverage
+.nyc_output
+
+# Project-specific (not needed in app container)
+.claude
+.git_backup
+db_connections
+final_endpoints_v2
+nowContext
+queries

.env.example

@@ -0,0 +1,29 @@
+# ============================================
+# KIS API Builder - Configuration
+# ============================================
+# Copy this file to .env and adjust values
+#
+# For default setup (built-in DB):
+#   Only APP_PORT, DB_PASSWORD and JWT_SECRET are needed
+#
+# For external database:
+#   Set all DB_* variables
+# ============================================
+
+# External port (access from host machine)
+APP_PORT=3000
+
+# Database password (used by both built-in and external DB)
+DB_PASSWORD=your_secure_password_here
+
+# JWT Configuration
+JWT_SECRET=your-super-secret-jwt-key-change-this-in-production
+JWT_EXPIRES_IN=24h
+
+# ============================================
+# External Database (only for docker-compose.external-db.yml)
+# ============================================
+# DB_HOST=your-postgres-host
+# DB_PORT=5432
+# DB_NAME=api_builder
+# DB_USER=postgres

.gitignore

@@ -12,3 +12,4 @@ coverage/
 *.sln
 *.sw?
 .claude
+.git_backup/

Dockerfile

@@ -0,0 +1,68 @@
+# ============================================
+# Stage 1: Build Frontend
+# ============================================
+FROM node:20-alpine AS frontend-builder
+
+WORKDIR /app/frontend
+
+# Copy frontend package files
+COPY frontend/package*.json ./
+
+# Install dependencies
+RUN npm ci
+
+# Copy frontend source
+COPY frontend/ ./
+
+# Build frontend
+RUN npm run build
+
+# ============================================
+# Stage 2: Build Backend
+# ============================================
+FROM node:20-alpine AS backend-builder
+
+WORKDIR /app/backend
+
+# Copy backend package files
+COPY backend/package*.json ./
+
+# Install dependencies
+RUN npm ci
+
+# Copy backend source
+COPY backend/ ./
+
+# Build TypeScript
+RUN npm run build
+
+# ============================================
+# Stage 3: Production
+# ============================================
+FROM node:20-alpine AS production
+
+WORKDIR /app
+
+# Copy backend package files and install production deps
+COPY backend/package*.json ./
+RUN npm ci --only=production && npm cache clean --force
+
+# Copy built backend
+COPY --from=backend-builder /app/backend/dist ./dist
+
+# Copy built frontend to the location expected by backend
+COPY --from=frontend-builder /app/frontend/dist ./frontend/dist
+
+# Set environment
+ENV NODE_ENV=production
+ENV PORT=3000
+
+# Expose port
+EXPOSE 3000
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:3000/health || exit 1
+
+# Start the application
+CMD ["node", "dist/server.js"]

backend/.env.example

@@ -16,30 +16,3 @@ JWT_EXPIRES_IN=24h
 # API Rate Limiting
 RATE_LIMIT_WINDOW_MS=900000
 RATE_LIMIT_MAX_REQUESTS=100
-
-# Target Databases Configuration (JSON format)
-# This is where your API endpoints will execute queries
-TARGET_DATABASES='[
-  {
-    "id": "main_postgres",
-    "name": "Main PostgreSQL",
-    "type": "postgresql",
-    "host": "localhost",
-    "port": 5432,
-    "database": "your_database",
-    "user": "your_user",
-    "password": "your_password",
-    "ssl": false
-  },
-  {
-    "id": "analytics_db",
-    "name": "Analytics Database",
-    "type": "postgresql",
-    "host": "localhost",
-    "port": 5432,
-    "database": "analytics",
-    "user": "analytics_user",
-    "password": "analytics_password",
-    "ssl": false
-  }
-]'

backend/check_endpoints.js

@@ -1,49 +0,0 @@
-const { Client } = require('pg');
-
-async function testQueries() {
-  // Подключаемся к целевой БД (emias_pg)
-  const client = new Client({
-    host: 'm112-pgkisc-01.ncms-i.ru',
-    port: 5432,
-    database: 'kis',
-    user: 'XАПИД',
-    password: 'c4d504412b61b0560d442686dfad27'
-  });
-
-  await client.connect();
-  console.log('Connected to kis database');
-
-  const caseId = 'f580b03b-86ee-41b6-a697-1981f116c669';
-
-  // Запрос из проблемного эндпоинта (с табами)
-  const queryWithTabs = `SELECT\tea.c_uid a_uid,
-\tp.ehr_id ehrid,
-\tp.erz_number subjectid,
-\tp.namespace namespace
-  FROM \tmm.ehr_case ec
-\tINNER JOIN mm.ehr_case_action ea ON ec.last_action_id = ea.id
-\tINNER JOIN mm.hospdoc hd ON hd.ehr_case_id = ec.id
-\tINNER JOIN mm.mdoc md ON md.id = hd.mdoc_id
-\tINNER JOIN mm.people p ON p.id = md.people_id
- WHERE\tec.id = $1
-   AND\thd.location_status_id = 1`;
-
-  // Запрос из рабочего эндпоинта (с пробелами и CRLF)
-  const queryWithSpaces = `SELECT ea.c_uid a_uid,\r\n  p.ehr_id ehrid,\r\n  p.erz_number subjectid,\r\n   p.namespace namespace\r\n  FROM     mm.ehr_case ec\r\n   INNER JOIN mm.ehr_case_action ea ON ec.last_action_id = ea.id\r\n   INNER JOIN mm.hospdoc hd ON hd.ehr_case_id = ec.id\r\n  INNER JOIN mm.mdoc md ON md.id = hd.mdoc_id\r\n  INNER JOIN mm.people p ON p.id = md.people_id\r\n WHERE     ec.id = $1\r\n  AND     hd.location_status_id = 1`;
-
-  console.log('\n=== Query with TABS (problematic) ===');
-  console.log('HEX first 50:', Buffer.from(queryWithTabs.substring(0, 50)).toString('hex'));
-  const result1 = await client.query(queryWithTabs, [caseId]);
-  console.log('rowCount:', result1.rowCount);
-  console.log('rows:', JSON.stringify(result1.rows));
-
-  console.log('\n=== Query with SPACES (working) ===');
-  console.log('HEX first 50:', Buffer.from(queryWithSpaces.substring(0, 50)).toString('hex'));
-  const result2 = await client.query(queryWithSpaces, [caseId]);
-  console.log('rowCount:', result2.rowCount);
-  console.log('rows:', JSON.stringify(result2.rows));
-
-  await client.end();
-}
-
-testQueries().catch(console.error);

backend/package.json

@@ -7,8 +7,8 @@
     "dev": "nodemon",
     "build": "tsc",
     "start": "node dist/server.js",
-    "migrate": "ts-node src/migrations/run.ts",
-    "seed": "ts-node src/migrations/seed.ts"
+    "migrate": "ts-node src/scripts/run.ts",
+    "seed": "ts-node src/scripts/seed.ts"
   },
   "keywords": [
     "api",

backend/src/scripts/run.ts

@@ -6,14 +6,18 @@ async function runMigrations() {
   console.log('Running migrations...');
 
   try {
-    const migrationFile = fs.readFileSync(
-      path.join(__dirname, '001_initial_schema.sql'),
-      'utf-8'
-    );
+    const migrationsDir = path.join(__dirname, '../migrations');
+    const files = fs.readdirSync(migrationsDir)
+      .filter(f => f.endsWith('.sql'))
+      .sort();
+
+    for (const file of files) {
+      console.log(`  Running ${file}...`);
+      const sql = fs.readFileSync(path.join(migrationsDir, file), 'utf-8');
+      await mainPool.query(sql);
+    }
 
-    await mainPool.query(migrationFile);
     console.log('✅ Migrations completed successfully');
-
     process.exit(0);
   } catch (error) {
     console.error('❌ Migration failed:', error);

backend/src/services/ScriptExecutor.ts

@@ -108,9 +108,9 @@ export class ScriptExecutor {
       const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor;
       const userFunction = new AsyncFunction('params', 'execQuery', code);
 
-      // Устанавливаем таймаут
+      // Устанавливаем таймаут (10 минут)
       const timeoutPromise = new Promise((_, reject) => {
-        setTimeout(() => reject(new Error('Script execution timeout (30s)')), 30000);
+        setTimeout(() => reject(new Error('Script execution timeout (10min)')), 600000);
       });
 
       // Выполняем скрипт с таймаутом
@@ -322,11 +322,11 @@ print(json.dumps(result))
         }
       });
 
-      // Таймаут 30 секунд
+      // Таймаут 10 минут
       setTimeout(() => {
         python.kill();
-        reject(new Error('Python script execution timeout (30s)'));
-      }, 30000);
+        reject(new Error('Python script execution timeout (10min)'));
+      }, 600000);
     });
   }
 

backend/src/services/SqlExecutor.ts

@@ -47,18 +47,12 @@ export class SqlExecutor {
       this.validateQuery(sqlQuery);
 
       // Log SQL query and parameters before execution
-      console.log('\n[SQL DB]', databaseId);
-      // @ts-ignore - accessing pool options for debugging
-      const poolOpts = pool.options;
-      console.log('[SQL Pool Config] host:', poolOpts?.host, 'database:', poolOpts?.database, 'user:', poolOpts?.user);
-      console.log('[SQL Query]', sqlQuery);
+      console.log('\n[SQL Query]', sqlQuery);
       console.log('[SQL Params]', params);
 
       // Execute with retry mechanism
       const result = await this.retryQuery(async () => {
-        const queryResult = await pool.query(sqlQuery, params);
-        console.log('[SQL Result] rowCount:', queryResult.rowCount, 'rows:', JSON.stringify(queryResult.rows).substring(0, 500));
-        return queryResult;
+        return await pool.query(sqlQuery, params);
       }, 3, 500); // 3 попытки с задержкой 500ms
 
       const executionTime = Date.now() - startTime;

docker-compose.external-db.yml

@@ -0,0 +1,29 @@
+# ============================================
+# KIS API Builder - External Database
+# ============================================
+# Use this when you have your own PostgreSQL
+#
+# 1. Copy .env.example to .env
+# 2. Set DB_HOST, DB_PORT, DB_NAME, DB_USER, DB_PASSWORD
+# 3. Run: docker compose -f docker-compose.external-db.yml up -d
+# ============================================
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: kis-api-builder-app
+    restart: unless-stopped
+    ports:
+      - "${APP_PORT:-3000}:3000"
+    environment:
+      NODE_ENV: production
+      PORT: 3000
+      DB_HOST: ${DB_HOST:?DB_HOST is required}
+      DB_PORT: ${DB_PORT:-5432}
+      DB_NAME: ${DB_NAME:-api_builder}
+      DB_USER: ${DB_USER:-postgres}
+      DB_PASSWORD: ${DB_PASSWORD:?DB_PASSWORD is required}
+      JWT_SECRET: ${JWT_SECRET:-change-this-secret-in-production}
+      JWT_EXPIRES_IN: ${JWT_EXPIRES_IN:-24h}

docker-compose.yml

@@ -0,0 +1,63 @@
+# ============================================
+# KIS API Builder - Docker Compose
+# ============================================
+# Default setup with built-in PostgreSQL
+# Just run: docker compose up -d
+#
+# For external database, use:
+#   docker compose -f docker-compose.external-db.yml up -d
+# ============================================
+
+services:
+  # PostgreSQL Database (built-in)
+  db:
+    image: postgres:16-alpine
+    container_name: kis-api-builder-db
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: api_builder
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./backend/src/migrations:/docker-entrypoint-initdb.d:ro
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d api_builder"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    networks:
+      - kis-network
+
+  # Application (Backend + Frontend)
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: kis-api-builder-app
+    restart: unless-stopped
+    ports:
+      - "${APP_PORT:-3000}:3000"
+    environment:
+      NODE_ENV: production
+      PORT: 3000
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_NAME: api_builder
+      DB_USER: postgres
+      DB_PASSWORD: ${DB_PASSWORD:-postgres}
+      JWT_SECRET: ${JWT_SECRET:-change-this-secret-in-production}
+      JWT_EXPIRES_IN: ${JWT_EXPIRES_IN:-24h}
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - kis-network
+
+volumes:
+  postgres_data:
+
+networks:
+  kis-network:
+    driver: bridge

frontend/src/components/EndpointModal.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useMutation, useQueryClient, useQuery } from '@tanstack/react-query';
 import { endpointsApi, foldersApi } from '@/services/api';
 import { Endpoint, EndpointParameter } from '@/types';
-import { Plus, Trash2, Play, Edit2 } from 'lucide-react';
+import { Plus, Trash2, Play, Edit2, ChevronDown, ChevronUp } from 'lucide-react';
 import toast from 'react-hot-toast';
 import SqlEditor from '@/components/SqlEditor';
 import CodeEditor from '@/components/CodeEditor';
@@ -45,6 +45,8 @@ export default function EndpointModal({
 
   const [editingQueryIndex, setEditingQueryIndex] = useState<number | null>(null);
   const [showScriptCodeEditor, setShowScriptCodeEditor] = useState(false);
+  const [parametersExpanded, setParametersExpanded] = useState(true);
+  const [queriesExpanded, setQueriesExpanded] = useState(true);
 
   // Определяем тип выбранной базы данных
   const selectedDatabase = databases.find(db => db.id === formData.database_id);
@@ -227,17 +229,29 @@ export default function EndpointModal({
             </div>
           </div>
 
-          <div>
-            <div className="flex items-center justify-between mb-2">
-              <label className="block text-sm font-medium text-gray-700">
+          <div className="border border-gray-200 rounded-lg">
+            <div
+              className="flex items-center justify-between p-3 bg-gray-50 cursor-pointer hover:bg-gray-100 rounded-t-lg"
+              onClick={() => setParametersExpanded(!parametersExpanded)}
+            >
+              <div className="flex items-center gap-2">
+                {parametersExpanded ? <ChevronUp size={18} /> : <ChevronDown size={18} />}
+                <label className="text-sm font-medium text-gray-700 cursor-pointer">
                   Параметры запроса
-                <span className="text-xs text-gray-500 ml-2">
+                  {formData.parameters.length > 0 && (
+                    <span className="ml-2 px-2 py-0.5 bg-primary-100 text-primary-700 rounded-full text-xs">
+                      {formData.parameters.length}
+                    </span>
+                  )}
+                </label>
+                <span className="text-xs text-gray-500">
                   (используйте $имяПараметра в QL запросе)
                 </span>
-              </label>
+              </div>
               <button
                 type="button"
-                onClick={() => {
+                onClick={(e) => {
+                  e.stopPropagation();
                   const newParam: EndpointParameter = {
                     name: '',
                     type: 'string' as const,
@@ -246,16 +260,18 @@ export default function EndpointModal({
                     description: '',
                   };
                   setFormData({ ...formData, parameters: [...formData.parameters, newParam] });
+                  setParametersExpanded(true);
                 }}
                 className="text-sm text-primary-600 hover:text-primary-700 flex items-center gap-1"
               >
                 <Plus size={16} />
-                Добавить параметр
+                Добавить
               </button>
             </div>
 
-            {formData.parameters.length > 0 ? (
-              <div className="space-y-3 mb-4 border border-gray-200 rounded-lg p-4">
+            {parametersExpanded && (
+              formData.parameters.length > 0 ? (
+                <div className="space-y-3 p-4">
                   {formData.parameters.map((param: any, index: number) => (
                     <div key={index} className="flex gap-2 items-start bg-gray-50 p-3 rounded">
                       <div className="flex-1 grid grid-cols-5 gap-2">
@@ -337,9 +353,10 @@ export default function EndpointModal({
                   ))}
                 </div>
               ) : (
-              <div className="text-center py-4 mb-4 border border-gray-200 rounded-lg bg-gray-50">
+                <div className="text-center py-4 bg-white rounded-b-lg">
                   <p className="text-sm text-gray-500">Нет параметров. Добавьте параметры для динамического запроса.</p>
                 </div>
+              )
             )}
           </div>
 
@@ -447,14 +464,26 @@ export default function EndpointModal({
                 </select>
               </div>
 
-              <div>
-                <div className="flex items-center justify-between mb-2">
-                  <label className="block text-sm font-medium text-gray-700">
+              <div className="border border-gray-200 rounded-lg">
+                <div
+                  className="flex items-center justify-between p-3 bg-gray-50 cursor-pointer hover:bg-gray-100 rounded-t-lg"
+                  onClick={() => setQueriesExpanded(!queriesExpanded)}
+                >
+                  <div className="flex items-center gap-2">
+                    {queriesExpanded ? <ChevronUp size={18} /> : <ChevronDown size={18} />}
+                    <label className="text-sm font-medium text-gray-700 cursor-pointer">
                       SQL Запросы для скрипта
+                      {formData.script_queries.length > 0 && (
+                        <span className="ml-2 px-2 py-0.5 bg-primary-100 text-primary-700 rounded-full text-xs">
+                          {formData.script_queries.length}
+                        </span>
+                      )}
                     </label>
+                  </div>
                   <button
                     type="button"
-                    onClick={() => {
+                    onClick={(e) => {
+                      e.stopPropagation();
                       const newQueries = [...formData.script_queries, {
                         name: '',
                         sql: '',
@@ -466,15 +495,17 @@ export default function EndpointModal({
                       }];
                       setFormData({ ...formData, script_queries: newQueries });
                       setEditingQueryIndex(newQueries.length - 1);
+                      setQueriesExpanded(true);
                     }}
                     className="text-sm text-primary-600 hover:text-primary-700 flex items-center gap-1"
                   >
                     <Plus size={16} />
-                    Добавить запрос
+                    Добавить
                   </button>
                 </div>
-                {formData.script_queries.length > 0 ? (
-                  <div className="space-y-2 mb-4">
+                {queriesExpanded && (
+                  formData.script_queries.length > 0 ? (
+                    <div className="space-y-2 p-4">
                       {formData.script_queries.map((query: any, idx: number) => (
                         <div key={idx} className="border border-gray-200 rounded-lg p-4 bg-white hover:shadow-sm transition-shadow">
                           <div className="flex items-center justify-between">
@@ -529,9 +560,10 @@ export default function EndpointModal({
                       ))}
                     </div>
                   ) : (
-                  <div className="text-center py-6 mb-4 border border-gray-200 rounded-lg bg-gray-50">
+                    <div className="text-center py-6 bg-white rounded-b-lg">
                       <p className="text-sm text-gray-500">Нет SQL запросов. Добавьте запросы для использования в скрипте.</p>
                     </div>
+                  )
                 )}
               </div>