Add scheduled tariff synchronization and bulk update functionality

- 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.
This commit is contained in:
Denozordec
2026-03-17 23:45:19 +07:00
parent 221edcda16
commit 0dd2f0d7fa
16 changed files with 615 additions and 76 deletions
+31 -5
View File
@@ -6,10 +6,19 @@ 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 : [],
}
}
@@ -23,6 +32,13 @@ router.get('/', (req, res) => {
}
})
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()
@@ -31,10 +47,12 @@ router.put('/:id', (req, res) => {
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 = ?
baseCurrency = ?, ratesUrl = ?, autoConvert = ?, ratesUpdatedAt = ?, syncEnabled = ?, syncIntervalMinutes = ?, syncTariffsIntervalMinutes = ?, customFields = ?
WHERE id = ?
`).run(
r.baseCurrency ?? existing.baseCurrency ?? 'RUB',
@@ -43,12 +61,14 @@ router.put('/:id', (req, res) => {
r.ratesUpdatedAt ?? existing.ratesUpdatedAt ?? '',
syncEnabled,
syncIntervalMinutes,
syncTariffsIntervalMinutes,
customFields,
id,
)
} else {
db.prepare(`
INSERT INTO settings (id, baseCurrency, ratesUrl, autoConvert, ratesUpdatedAt, syncEnabled, syncIntervalMinutes)
VALUES (?, ?, ?, ?, ?, ?, ?)
INSERT INTO settings (id, baseCurrency, ratesUrl, autoConvert, ratesUpdatedAt, syncEnabled, syncIntervalMinutes, syncTariffsIntervalMinutes, customFields)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
`).run(
id,
r.baseCurrency ?? 'RUB',
@@ -57,6 +77,8 @@ router.put('/:id', (req, res) => {
r.ratesUpdatedAt ?? '',
syncEnabled,
syncIntervalMinutes,
syncTariffsIntervalMinutes,
customFields,
)
}
startScheduler()
@@ -74,9 +96,11 @@ router.post('/', (req, res) => {
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)
VALUES (?, ?, ?, ?, ?, ?, ?)
INSERT INTO settings (id, baseCurrency, ratesUrl, autoConvert, ratesUpdatedAt, syncEnabled, syncIntervalMinutes, syncTariffsIntervalMinutes, customFields)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
`).run(
id,
r.baseCurrency ?? 'RUB',
@@ -85,6 +109,8 @@ router.post('/', (req, res) => {
r.ratesUpdatedAt ?? '',
syncEnabled,
syncIntervalMinutes,
syncTariffsIntervalMinutes,
customFields,
)
startScheduler()
const row = db.prepare('SELECT * FROM settings WHERE id = ?').get(id)
+1 -1
View File
@@ -21,7 +21,7 @@ router.get('/status', (req, res) => {
try {
const db = getDb()
const rows = db.prepare(`
SELECT accountId, startedAt, finishedAt, status, vpsCount, paymentsCount, error
SELECT id, accountId, startedAt, finishedAt, status, vpsCount, paymentsCount, error
FROM sync_log ORDER BY startedAt DESC LIMIT 50
`).all()
res.json(rows)
+33
View File
@@ -194,4 +194,37 @@ router.delete('/:id', (req, res) => {
}
})
router.patch('/bulk', (req, res) => {
try {
const db = getDb()
const { ids = [], action, value } = req.body
if (!Array.isArray(ids) || ids.length === 0) {
return res.status(400).json({ error: 'ids must be a non-empty array' })
}
if (action === 'status' && value) {
const validStatus = ['active', 'paused', 'archived']
if (!validStatus.includes(value)) {
return res.status(400).json({ error: 'value must be active, paused, or archived' })
}
const stmt = db.prepare('UPDATE vps SET status = ? WHERE id = ?')
for (const id of ids) {
stmt.run(value, id)
}
return res.json({ updated: ids.length, status: value })
}
if (action === 'delete') {
const stmt = db.prepare('DELETE FROM vps WHERE id = ?')
let deleted = 0
for (const id of ids) {
const result = stmt.run(id)
if (result.changes > 0) deleted++
}
return res.json({ deleted })
}
return res.status(400).json({ error: 'action must be status or delete' })
} catch (err) {
res.status(500).json({ error: err.message })
}
})
export default router