Fix merge stuff and improve write routes

backend/src/routes/locality.ts

@@ -26,12 +26,8 @@ router.put(
   requireOneOf([Role.Admin, Role.EditRestricted, Role.EditUnrestricted]),
   // TODO: Check if edit restricted has rights to edit the locality.
   async (req: Request<object, object, { locality: EditDataType<LocalityDetailsType> & EditMetaData }>, res) => {
-    const editedLocality = req.body.locality
-    const { comment, references } = editedLocality
-    delete editedLocality.comment
-    delete editedLocality.references
+    const { comment, references, ...editedLocality } = req.body.locality
     const validationErrors = validateEntireLocality(editedLocality)
-
     if (validationErrors.length > 0) {
       return res.status(400).send({ validationErrors })
     }

backend/src/routes/timeBound.ts

@@ -27,24 +27,9 @@ router.get('/time-units/:id', async (req, res) => {
 router.put(
   '/',
   async (req: Request<object, object, { timeBound: EditDataType<TimeBoundDetailsType> & EditMetaData }>, res) => {
-    const editedObject = req.body.timeBound
-<<<<<<< HEAD
-    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' })
-=======
-    const { comment, references } = editedObject
-    delete editedObject.comment
-    delete editedObject.references
-    const result = await writeTimeBound(editedObject, comment, references, req.user!.initials)
+    const { comment, references, ...editedTimeBound } = req.body.timeBound
+    const result = await writeTimeBound(editedTimeBound, comment, references, req.user!.initials)
     return res.status(200).send({ id: result })
->>>>>>> reWrite2
   }
 )
 

backend/src/routes/timeUnit.ts

@@ -33,11 +33,8 @@ router.get('/localities/:id', async (req, res) => {
 router.put(
   '/',
   async (req: Request<object, object, { timeUnit: EditDataType<TimeUnitDetailsType> & EditMetaData }>, res) => {
-    const editedObject = req.body.timeUnit
-    const { comment, references } = editedObject
-    delete editedObject.comment
-    delete editedObject.references
-    const result = await writeTimeUnit(editedObject, comment, references, req.user!.initials)
+    const { comment, references, ...editedTimeUnit } = req.body.timeUnit
+    const result = await writeTimeUnit(editedTimeUnit, comment, references, req.user!.initials)
     return res.status(200).send({ id: result })
   }
 )