v2: CRUD-модуль — /v2/app с выбором компании, добавление/изменение/удаление записей

This commit is contained in:
2026-06-12 16:53:33 +04:00
parent 03d480de12
commit e91f1b0ff3
7 changed files with 612 additions and 1 deletions
+232
View File
@@ -0,0 +1,232 @@
// ═══════════════════════════════════════════════════════════════════════════════
// V2 — SQL-запросы (единственное место работы с БД)
// Все функции работают с таблицами v2_companies, v2_entries, v2_audit
// ═══════════════════════════════════════════════════════════════════════════════
const { pool } = require('./index');
const { validate, overlaps } = require('../validators');
// ── Компании ──────────────────────────────────────────────────────────────────
/**
* Получить или создать компанию по client_id (W-номеру).
* Атомарный upsert — исключает дубли при параллельных запросах.
*/
async function getOrCreateCompany(clientId, companyName) {
const res = await pool.query(
`INSERT INTO v2_companies (client_id, name) VALUES ($1, $2)
ON CONFLICT (client_id) DO UPDATE SET name = COALESCE(v2_companies.name, EXCLUDED.name)
RETURNING *`,
[clientId, companyName || clientId]
);
return res.rows[0];
}
/**
* Лимит записей компании: custom_limit или DEFAULT_LIMIT (15).
*/
async function getLimit(company) {
const defaultLimit = parseInt(process.env.DEFAULT_LIMIT, 10) || 15;
return company.custom_limit != null ? company.custom_limit : defaultLimit;
}
// ── Записи ────────────────────────────────────────────────────────────────────
/**
* Список записей компании.
* @param {number} companyId — v2_companies.id
* @param {boolean} includeDeleted — показать удалённые
*/
async function listEntries(companyId, includeDeleted = false) {
let sql = 'SELECT * FROM v2_entries WHERE company_id = $1';
const params = [companyId];
if (!includeDeleted) sql += ' AND deleted_at IS NULL';
sql += ' ORDER BY created_at DESC';
return (await pool.query(sql, params)).rows;
}
/**
* Создать запись (с валидацией, проверкой лимита и пересечений).
*/
async function createEntry(companyId, rawValue, comment, userEmail, impersonatedBy) {
const { cidr, wasNormalized } = validate(rawValue);
const client = await pool.connect();
try {
await client.query('BEGIN');
const company = (await client.query(
'SELECT * FROM v2_companies WHERE id = $1 FOR UPDATE', [companyId]
)).rows[0];
if (!company) throw new Error('Компания не найдена');
const limit = await getLimit(company);
const cnt = (await client.query(
'SELECT COUNT(*)::int AS c FROM v2_entries WHERE company_id = $1 AND deleted_at IS NULL',
[companyId]
)).rows[0].c;
if (cnt >= limit) throw new Error(`Лимит исчерпан: ${cnt} из ${limit}`);
const existing = (await client.query(
'SELECT value_cidr FROM v2_entries WHERE company_id = $1 AND deleted_at IS NULL',
[companyId]
)).rows;
for (const row of existing) {
if (row.value_cidr === cidr) throw new Error('Такой адрес уже существует');
if (overlaps(cidr, row.value_cidr))
throw new Error(`Пересечение с существующей записью ${row.value_cidr}`);
}
const res = await client.query(
`INSERT INTO v2_entries (company_id, value_cidr, comment, created_by)
VALUES ($1, $2, $3, $4) RETURNING *`,
[companyId, cidr, comment || null, userEmail]
);
await logAudit(userEmail, companyId, 'CREATE', null, cidr, res.rows[0].id, impersonatedBy, client);
await client.query('COMMIT');
return { entry: res.rows[0], wasNormalized };
} catch (e) {
await client.query('ROLLBACK');
throw e;
} finally {
client.release();
}
}
/**
* Обновить запись.
*/
async function updateEntry(entryId, companyId, rawValue, comment, userEmail, impersonatedBy) {
const { cidr, wasNormalized } = validate(rawValue);
const client = await pool.connect();
try {
await client.query('BEGIN');
await client.query('SELECT * FROM v2_companies WHERE id = $1 FOR UPDATE', [companyId]);
const old = (await client.query(
'SELECT * FROM v2_entries WHERE id = $1 AND company_id = $2 AND deleted_at IS NULL',
[entryId, companyId]
)).rows[0];
if (!old) throw new Error('Запись не найдена');
const existing = (await client.query(
'SELECT value_cidr FROM v2_entries WHERE company_id = $1 AND deleted_at IS NULL AND id <> $2',
[companyId, entryId]
)).rows;
for (const row of existing) {
if (row.value_cidr === cidr) throw new Error('Такой адрес уже существует');
if (overlaps(cidr, row.value_cidr))
throw new Error(`Пересечение с существующей записью ${row.value_cidr}`);
}
const res = await client.query(
`UPDATE v2_entries SET value_cidr = $1, comment = $2, updated_by = $3, updated_at = NOW()
WHERE id = $4 AND company_id = $5 RETURNING *`,
[cidr, comment || old.comment, userEmail, entryId, companyId]
);
await logAudit(userEmail, companyId, 'UPDATE', old.value_cidr, cidr, entryId, impersonatedBy, client);
await client.query('COMMIT');
return { entry: res.rows[0], wasNormalized };
} catch (e) {
await client.query('ROLLBACK');
throw e;
} finally {
client.release();
}
}
/**
* Удалить запись (soft delete).
*/
async function deleteEntry(entryId, companyId, userEmail, impersonatedBy) {
const client = await pool.connect();
try {
await client.query('BEGIN');
const old = (await client.query(
'SELECT * FROM v2_entries WHERE id = $1 AND company_id = $2 AND deleted_at IS NULL',
[entryId, companyId]
)).rows[0];
if (!old) throw new Error('Запись не найдена');
await client.query(
'UPDATE v2_entries SET deleted_by = $1, deleted_at = NOW() WHERE id = $2 AND company_id = $3',
[userEmail, entryId, companyId]
);
await logAudit(userEmail, companyId, 'DELETE', old.value_cidr, null, entryId, impersonatedBy, client);
await client.query('COMMIT');
} catch (e) {
await client.query('ROLLBACK');
throw e;
} finally {
client.release();
}
}
// ── Админ ─────────────────────────────────────────────────────────────────────
async function getCompanyById(id) {
const res = await pool.query('SELECT * FROM v2_companies WHERE id = $1', [id]);
return res.rows[0] || null;
}
async function getAllCompanies() {
const res = await pool.query(`
SELECT c.*, COUNT(e.id)::int AS active_count
FROM v2_companies c
LEFT JOIN v2_entries e ON e.company_id = c.id AND e.deleted_at IS NULL
GROUP BY c.id
ORDER BY c.name, c.client_id
`);
return res.rows;
}
async function setLimit(companyId, newLimit) {
const result = await pool.query(
'UPDATE v2_companies SET custom_limit = $1, updated_at = NOW() WHERE id = $2',
[newLimit, companyId]
);
if (result.rowCount === 0) {
const err = new Error('Company not found: ' + companyId);
err.status = 404;
throw err;
}
}
// ── Экспорт ───────────────────────────────────────────────────────────────────
async function getExportCIDRs(companyId = null) {
let sql = 'SELECT value_cidr FROM v2_entries WHERE deleted_at IS NULL';
const params = [];
if (companyId) { sql += ' AND company_id = $1'; params.push(companyId); }
sql += ' ORDER BY value_cidr';
return (await pool.query(sql, params)).rows.map(r => r.value_cidr);
}
// ── Аудит ─────────────────────────────────────────────────────────────────────
async function logAudit(userEmail, companyId, action, oldValue, newValue, entryId, impersonatedBy, db = pool) {
await db.query(
`INSERT INTO v2_audit (user_email, company_id, action, old_value, new_value, entry_id, impersonated_by)
VALUES ($1, $2, $3, $4, $5, $6, $7)`,
[userEmail, companyId, action, oldValue, newValue, entryId || null, impersonatedBy || null]
);
}
async function getAudit(companyId = null) {
let sql = `
SELECT a.*, c.name AS company_name, c.client_id
FROM v2_audit a
JOIN v2_companies c ON c.id = a.company_id
`;
const params = [];
if (companyId) { sql += ' WHERE a.company_id = $1'; params.push(companyId); }
sql += ' ORDER BY a.created_at DESC LIMIT 500';
return (await pool.query(sql, params)).rows;
}
module.exports = {
getOrCreateCompany, getLimit,
listEntries, createEntry, updateEntry, deleteEntry,
getExportCIDRs, getAudit,
getCompanyById, getAllCompanies, setLimit,
};