- Introduced `runScheduledSyncTariffs` function to handle tariff synchronization independently from VPS and payment sync. - Updated `syncFromBillmanager` to accept options for skipping tariff and VPS payment syncs. - Added new database columns for `syncTariffsIntervalMinutes` and `customFields` in settings. - Enhanced settings page to configure tariff sync interval. - Implemented bulk update functionality for VPS status and deletion in the VPS management page. - Updated various components to support new features, including sync log display and improved payment handling.
124 lines
4.2 KiB
JavaScript
124 lines
4.2 KiB
JavaScript
import { Router } from 'express'
|
|
import { getDb } from '../db.js'
|
|
import { startScheduler } from '../sync-scheduler.js'
|
|
|
|
const router = Router()
|
|
|
|
export function rowToSettings(row) {
|
|
if (!row) return null
|
|
let customFields = []
|
|
if (row.customFields) {
|
|
try {
|
|
customFields = JSON.parse(row.customFields)
|
|
} catch {
|
|
customFields = []
|
|
}
|
|
}
|
|
return {
|
|
...row,
|
|
autoConvert: Boolean(row.autoConvert),
|
|
syncEnabled: Boolean(row.syncEnabled),
|
|
customFields: Array.isArray(customFields) ? customFields : [],
|
|
}
|
|
}
|
|
|
|
router.get('/', (req, res) => {
|
|
try {
|
|
const db = getDb()
|
|
const rows = db.prepare('SELECT * FROM settings ORDER BY id').all()
|
|
res.json(rows.map(rowToSettings))
|
|
} catch (err) {
|
|
res.status(500).json({ error: err.message })
|
|
}
|
|
})
|
|
|
|
function serializeCustomFields(val) {
|
|
if (val == null) return null
|
|
if (Array.isArray(val)) return JSON.stringify(val)
|
|
if (typeof val === 'string') return val || null
|
|
return null
|
|
}
|
|
|
|
router.put('/:id', (req, res) => {
|
|
try {
|
|
const db = getDb()
|
|
const { id } = req.params
|
|
const r = req.body
|
|
const existing = db.prepare('SELECT * FROM settings WHERE id = ?').get(id)
|
|
const syncEnabled = r.syncEnabled !== undefined ? (r.syncEnabled ? 1 : 0) : (existing?.syncEnabled ? 1 : 0)
|
|
const syncIntervalMinutes = r.syncIntervalMinutes !== undefined ? Math.max(15, Number(r.syncIntervalMinutes) || 60) : (existing?.syncIntervalMinutes ?? 60)
|
|
const syncTariffsIntervalMinutes = r.syncTariffsIntervalMinutes !== undefined ? Math.max(60, Number(r.syncTariffsIntervalMinutes) || 1440) : (existing?.syncTariffsIntervalMinutes ?? 1440)
|
|
const customFields = serializeCustomFields(r.customFields ?? existing?.customFields)
|
|
if (existing) {
|
|
db.prepare(`
|
|
UPDATE settings SET
|
|
baseCurrency = ?, ratesUrl = ?, autoConvert = ?, ratesUpdatedAt = ?, syncEnabled = ?, syncIntervalMinutes = ?, syncTariffsIntervalMinutes = ?, customFields = ?
|
|
WHERE id = ?
|
|
`).run(
|
|
r.baseCurrency ?? existing.baseCurrency ?? 'RUB',
|
|
r.ratesUrl ?? existing.ratesUrl ?? '',
|
|
r.autoConvert !== undefined ? (r.autoConvert !== false ? 1 : 0) : (existing.autoConvert ? 1 : 0),
|
|
r.ratesUpdatedAt ?? existing.ratesUpdatedAt ?? '',
|
|
syncEnabled,
|
|
syncIntervalMinutes,
|
|
syncTariffsIntervalMinutes,
|
|
customFields,
|
|
id,
|
|
)
|
|
} else {
|
|
db.prepare(`
|
|
INSERT INTO settings (id, baseCurrency, ratesUrl, autoConvert, ratesUpdatedAt, syncEnabled, syncIntervalMinutes, syncTariffsIntervalMinutes, customFields)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
`).run(
|
|
id,
|
|
r.baseCurrency ?? 'RUB',
|
|
r.ratesUrl ?? '',
|
|
r.autoConvert !== false ? 1 : 0,
|
|
r.ratesUpdatedAt ?? '',
|
|
syncEnabled,
|
|
syncIntervalMinutes,
|
|
syncTariffsIntervalMinutes,
|
|
customFields,
|
|
)
|
|
}
|
|
startScheduler()
|
|
const row = db.prepare('SELECT * FROM settings WHERE id = ?').get(id)
|
|
res.json(rowToSettings(row))
|
|
} catch (err) {
|
|
res.status(500).json({ error: err.message })
|
|
}
|
|
})
|
|
|
|
router.post('/', (req, res) => {
|
|
try {
|
|
const db = getDb()
|
|
const r = req.body
|
|
const id = r.id ?? 'settings-main'
|
|
const syncEnabled = r.syncEnabled ? 1 : 0
|
|
const syncIntervalMinutes = Math.max(15, Number(r.syncIntervalMinutes) || 60)
|
|
const syncTariffsIntervalMinutes = Math.max(60, Number(r.syncTariffsIntervalMinutes) || 1440)
|
|
const customFields = serializeCustomFields(r.customFields)
|
|
db.prepare(`
|
|
INSERT INTO settings (id, baseCurrency, ratesUrl, autoConvert, ratesUpdatedAt, syncEnabled, syncIntervalMinutes, syncTariffsIntervalMinutes, customFields)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
`).run(
|
|
id,
|
|
r.baseCurrency ?? 'RUB',
|
|
r.ratesUrl ?? 'https://www.cbr-xml-daily.ru/latest.js',
|
|
r.autoConvert !== false ? 1 : 0,
|
|
r.ratesUpdatedAt ?? '',
|
|
syncEnabled,
|
|
syncIntervalMinutes,
|
|
syncTariffsIntervalMinutes,
|
|
customFields,
|
|
)
|
|
startScheduler()
|
|
const row = db.prepare('SELECT * FROM settings WHERE id = ?').get(id)
|
|
res.status(201).json(rowToSettings(row))
|
|
} catch (err) {
|
|
res.status(500).json({ error: err.message })
|
|
}
|
|
})
|
|
|
|
export default router
|