TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add updated column to some tables

Browse Source
This commit is contained in:
Eike Kettner
2020-08-24 16:09:11 +02:00
parent 96d2f948f2
commit de5b33c40d
7 changed files with 156 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -341,6 +341,7 @@ trait Conversions {
v.address.city,
v.address.country,
v.notes,
now,
now
)
} yield OOrganization.OrgAndContacts(org, cont)
@ -353,6 +354,7 @@ trait Conversions {
def contacts(oid: Ident) =
v.contacts.traverse(c => newContact(c, oid.some, None))
for {
now <- Timestamp.current[F]
cont <- contacts(v.id)
org = ROrganization(
v.id,
@ -363,7 +365,8 @@ trait Conversions {
v.address.city,
v.address.country,
v.notes,
v.created
v.created,
now
)
} yield OOrganization.OrgAndContacts(org, cont)
}
@ -398,6 +401,7 @@ trait Conversions {
v.address.country,
v.notes,
v.concerning,
now,
now
)
} yield OOrganization.PersonAndContacts(org, cont)
@ -410,6 +414,7 @@ trait Conversions {
def contacts(pid: Ident) =
v.contacts.traverse(c => newContact(c, None, pid.some))
for {
now <- Timestamp.current[F]
cont <- contacts(v.id)
org = RPerson(
v.id,
@ -421,7 +426,8 @@ trait Conversions {
v.address.country,
v.notes,
v.concerning,
v.created
v.created,
now
)
} yield OOrganization.PersonAndContacts(org, cont)
}
@ -536,11 +542,11 @@ trait Conversions {
def newEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
timeId.map({
case (id, now) =>
REquipment(id, cid, e.name, now)
REquipment(id, cid, e.name, now, now)
})
def changeEquipment(e: Equipment, cid: Ident): REquipment =
REquipment(e.id, cid, e.name, e.created)
def changeEquipment[F[_]: Sync](e: Equipment, cid: Ident): F[REquipment] =
Timestamp.current[F].map(now => REquipment(e.id, cid, e.name, e.created, now))
// idref

8
modules/restserver/src/main/scala/docspell/restserver/routes/EquipmentRoutes.scala
View File

@ -39,10 +39,10 @@ object EquipmentRoutes {
case req @ PUT -> Root =>
for {
data <- req.as[Equipment]
equip = changeEquipment(data, user.account.collective)
res <- backend.equipment.update(equip)
resp <- Ok(basicResult(res, "Equipment updated."))
data <- req.as[Equipment]
equip <- changeEquipment(data, user.account.collective)
res <- backend.equipment.update(equip)
resp <- Ok(basicResult(res, "Equipment updated."))
} yield resp
case DELETE -> Root / Ident(id) =>