mirror of
https://github.com/nowcommunity/nowdatabase.git
synced 2026-10-12 19:13:52 +03:00
Fix date in log and update entries
This commit is contained in:
@@ -4,7 +4,7 @@ import { fixBigInt } from '../utils/common'
|
||||
import { EditDataType, EditMetaData, LocalityDetailsType } from '../../../frontend/src/backendTypes'
|
||||
import { requireOneOf } from '../middlewares/authorizer'
|
||||
import { Role } from '../../../frontend/src/types'
|
||||
import { deleteLocality } from '../services/write/delete'
|
||||
// import { deleteLocality } from '../services/write/delete'
|
||||
import { writeLocality } from '../services/write/locality'
|
||||
|
||||
const router = Router()
|
||||
@@ -42,7 +42,7 @@ router.put(
|
||||
|
||||
router.delete('/:id', requireOneOf([Role.Admin]), async (req, res) => {
|
||||
const id = parseInt(req.params.id)
|
||||
await deleteLocality(id)
|
||||
// await deleteLocality(id)
|
||||
return res.status(200).send()
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Request, Router } from 'express'
|
||||
import { getAllTimeBounds, getTimeBoundDetails, getTimeBoundTimeUnits } from '../services/timeBound'
|
||||
import { fixBigInt } from '../utils/common'
|
||||
import { EditDataType, EditMetaData, TimeBoundDetailsType } from '../../../frontend/src/backendTypes'
|
||||
import { write } from '../services/write/write'
|
||||
|
||||
const router = Router()
|
||||
|
||||
@@ -28,15 +27,6 @@ router.put(
|
||||
'/',
|
||||
async (req: Request<object, object, { timeBound: EditDataType<TimeBoundDetailsType> & EditMetaData }>, res) => {
|
||||
const editedObject = req.body.timeBound
|
||||
const result = await write(
|
||||
editedObject,
|
||||
'now_tu_bound',
|
||||
req.user!.initials,
|
||||
editedObject.comment ?? '',
|
||||
editedObject.bid ? 'update' : 'add',
|
||||
editedObject.references ?? []
|
||||
)
|
||||
return res.status(200).send(result ? { result: result } : { error: 'error' })
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Request, Router } from 'express'
|
||||
import { getAllTimeUnits, getTimeUnitDetails, getTimeUnitLocalities } from '../services/timeUnit'
|
||||
import { fixBigInt } from '../utils/common'
|
||||
import { EditDataType, EditMetaData, TimeUnitDetailsType } from '../../../frontend/src/backendTypes'
|
||||
import { write } from '../services/write/write'
|
||||
import { getAllSequences } from '../services/sequence'
|
||||
|
||||
const router = Router()
|
||||
@@ -34,15 +33,6 @@ router.put(
|
||||
'/',
|
||||
async (req: Request<object, object, { timeUnit: EditDataType<TimeUnitDetailsType> & EditMetaData }>, res) => {
|
||||
const editedObject = req.body.timeUnit
|
||||
const result = await write(
|
||||
editedObject,
|
||||
'now_time_unit',
|
||||
req.user!.initials,
|
||||
editedObject.comment ?? '',
|
||||
editedObject.tu_name ? 'update' : 'add',
|
||||
editedObject.references ?? []
|
||||
)
|
||||
return res.status(200).send(result ? { result: result } : { error: 'error' })
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@@ -157,6 +157,7 @@ const writeReferences = async (writeHandler: WriteHandler, updateEntries: Update
|
||||
|
||||
const tableToId: Record<string, string> = { now_lau: 'lid', now_sau: 'species_id', now_tau: 'tu_name', now_bau: 'bid' }
|
||||
const getUpdateIdField = (tableName: string) => `${tableName[4]}uid`
|
||||
export const getFormattedDate = () => new Date().toISOString().split('T')[0]
|
||||
|
||||
export const createUpdateEntry = async (
|
||||
writeHandler: WriteHandler,
|
||||
@@ -173,7 +174,7 @@ export const createUpdateEntry = async (
|
||||
{
|
||||
[`${prefix}_coordinator`]: coordinator,
|
||||
[`${prefix}_authorizer`]: authorizer,
|
||||
[`${prefix}_date`]: new Date(),
|
||||
[`${prefix}_date`]: getFormattedDate(),
|
||||
[tableToId[table]]: id,
|
||||
[`${prefix}_comment`]: comment,
|
||||
},
|
||||
@@ -190,7 +191,7 @@ export const writeLogRows = async (writeHandler: WriteHandler, logRows: LogRow[]
|
||||
update: 3,
|
||||
}
|
||||
const updateRows = logRows.map(logRow => ({
|
||||
event_time: new Date(),
|
||||
event_time: getFormattedDate(),
|
||||
user_name: authorizer,
|
||||
server_name: 'sysbiol',
|
||||
table_name: logRow.table,
|
||||
|
||||
Reference in New Issue
Block a user