Edit org/person/equipment of multiple items

modules/backend/src/main/scala/docspell/backend/ops/OItem.scala

@@ -63,19 +63,35 @@ trait OItem[F[_]] {
       collective: Ident
   ): F[UpdateResult]
 
-  def setCorrOrg(item: Ident, org: Option[Ident], collective: Ident): F[AddResult]
+  def setCorrOrg(
+      items: NonEmptyList[Ident],
+      org: Option[Ident],
+      collective: Ident
+  ): F[UpdateResult]
 
   def addCorrOrg(item: Ident, org: OOrganization.OrgAndContacts): F[AddResult]
 
-  def setCorrPerson(item: Ident, person: Option[Ident], collective: Ident): F[AddResult]
+  def setCorrPerson(
+      items: NonEmptyList[Ident],
+      person: Option[Ident],
+      collective: Ident
+  ): F[UpdateResult]
 
   def addCorrPerson(item: Ident, person: OOrganization.PersonAndContacts): F[AddResult]
 
-  def setConcPerson(item: Ident, person: Option[Ident], collective: Ident): F[AddResult]
+  def setConcPerson(
+      items: NonEmptyList[Ident],
+      person: Option[Ident],
+      collective: Ident
+  ): F[UpdateResult]
 
   def addConcPerson(item: Ident, person: OOrganization.PersonAndContacts): F[AddResult]
 
-  def setConcEquip(item: Ident, equip: Option[Ident], collective: Ident): F[AddResult]
+  def setConcEquip(
+      items: NonEmptyList[Ident],
+      equip: Option[Ident],
+      collective: Ident
+  ): F[UpdateResult]
 
   def addConcEquip(item: Ident, equip: REquipment): F[AddResult]
 
@@ -304,11 +320,15 @@ object OItem {
               else UpdateResult.success
           } yield res
 
-        def setCorrOrg(item: Ident, org: Option[Ident], collective: Ident): F[AddResult] =
+        def setCorrOrg(
-          store
+            items: NonEmptyList[Ident],
-            .transact(RItem.updateCorrOrg(item, collective, org))
+            org: Option[Ident],
-            .attempt
+            collective: Ident
-            .map(AddResult.fromUpdate)
+        ): F[UpdateResult] =
+          UpdateResult.fromUpdate(
+            store
+              .transact(RItem.updateCorrOrg(items, collective, org))
+          )
 
         def addCorrOrg(item: Ident, org: OOrganization.OrgAndContacts): F[AddResult] =
           (for {
@@ -319,7 +339,11 @@ object OItem {
               case AddResult.Success =>
                 OptionT.liftF(
                   store.transact(
-                    RItem.updateCorrOrg(item, org.org.cid, Some(org.org.oid))
+                    RItem.updateCorrOrg(
+                      NonEmptyList.of(item),
+                      org.org.cid,
+                      Some(org.org.oid)
+                    )
                   )
                 )
               case AddResult.EntityExists(_) =>
@@ -331,14 +355,14 @@ object OItem {
             .getOrElse(AddResult.Failure(new Exception("Collective mismatch")))
 
         def setCorrPerson(
-            item: Ident,
+            items: NonEmptyList[Ident],
             person: Option[Ident],
             collective: Ident
-        ): F[AddResult] =
+        ): F[UpdateResult] =
-          store
+          UpdateResult.fromUpdate(
-            .transact(RItem.updateCorrPerson(item, collective, person))
+            store
-            .attempt
+              .transact(RItem.updateCorrPerson(items, collective, person))
-            .map(AddResult.fromUpdate)
+          )
 
         def addCorrPerson(
             item: Ident,
@@ -353,7 +377,11 @@ object OItem {
                 OptionT.liftF(
                   store.transact(
                     RItem
-                      .updateCorrPerson(item, person.person.cid, Some(person.person.pid))
+                      .updateCorrPerson(
+                        NonEmptyList.of(item),
+                        person.person.cid,
+                        Some(person.person.pid)
+                      )
                   )
                 )
               case AddResult.EntityExists(_) =>
@@ -365,14 +393,14 @@ object OItem {
             .getOrElse(AddResult.Failure(new Exception("Collective mismatch")))
 
         def setConcPerson(
-            item: Ident,
+            items: NonEmptyList[Ident],
             person: Option[Ident],
             collective: Ident
-        ): F[AddResult] =
+        ): F[UpdateResult] =
-          store
+          UpdateResult.fromUpdate(
-            .transact(RItem.updateConcPerson(item, collective, person))
+            store
-            .attempt
+              .transact(RItem.updateConcPerson(items, collective, person))
-            .map(AddResult.fromUpdate)
+          )
 
         def addConcPerson(
             item: Ident,
@@ -387,7 +415,11 @@ object OItem {
                 OptionT.liftF(
                   store.transact(
                     RItem
-                      .updateConcPerson(item, person.person.cid, Some(person.person.pid))
+                      .updateConcPerson(
+                        NonEmptyList.of(item),
+                        person.person.cid,
+                        Some(person.person.pid)
+                      )
                   )
                 )
               case AddResult.EntityExists(_) =>
@@ -399,14 +431,14 @@ object OItem {
             .getOrElse(AddResult.Failure(new Exception("Collective mismatch")))
 
         def setConcEquip(
-            item: Ident,
+            items: NonEmptyList[Ident],
             equip: Option[Ident],
             collective: Ident
-        ): F[AddResult] =
+        ): F[UpdateResult] =
-          store
+          UpdateResult.fromUpdate(
-            .transact(RItem.updateConcEquip(item, collective, equip))
+            store
-            .attempt
+              .transact(RItem.updateConcEquip(items, collective, equip))
-            .map(AddResult.fromUpdate)
+          )
 
         def addConcEquip(item: Ident, equip: REquipment): F[AddResult] =
           (for {
@@ -417,7 +449,8 @@ object OItem {
               case AddResult.Success =>
                 OptionT.liftF(
                   store.transact(
-                    RItem.updateConcEquip(item, equip.cid, Some(equip.eid))
+                    RItem
+                      .updateConcEquip(NonEmptyList.of(item), equip.cid, Some(equip.eid))
                   )
                 )
               case AddResult.EntityExists(_) =>

modules/joex/src/main/scala/docspell/joex/process/LinkProposal.scala

@@ -66,22 +66,38 @@ object LinkProposal {
       case MetaProposalType.CorrOrg =>
         ctx.logger.debug(s"Updating item organization with: ${value.id}") *>
           ctx.store.transact(
-            RItem.updateCorrOrg(itemId, ctx.args.meta.collective, Some(value))
+            RItem.updateCorrOrg(
+              NonEmptyList.of(itemId),
+              ctx.args.meta.collective,
+              Some(value)
+            )
           )
       case MetaProposalType.ConcPerson =>
         ctx.logger.debug(s"Updating item concerning person with: $value") *>
           ctx.store.transact(
-            RItem.updateConcPerson(itemId, ctx.args.meta.collective, Some(value))
+            RItem.updateConcPerson(
+              NonEmptyList.of(itemId),
+              ctx.args.meta.collective,
+              Some(value)
+            )
           )
       case MetaProposalType.CorrPerson =>
         ctx.logger.debug(s"Updating item correspondent person with: $value") *>
           ctx.store.transact(
-            RItem.updateCorrPerson(itemId, ctx.args.meta.collective, Some(value))
+            RItem.updateCorrPerson(
+              NonEmptyList.of(itemId),
+              ctx.args.meta.collective,
+              Some(value)
+            )
           )
       case MetaProposalType.ConcEquip =>
         ctx.logger.debug(s"Updating item concerning equipment with: $value") *>
           ctx.store.transact(
-            RItem.updateConcEquip(itemId, ctx.args.meta.collective, Some(value))
+            RItem.updateConcEquip(
+              NonEmptyList.of(itemId),
+              ctx.args.meta.collective,
+              Some(value)
+            )
           )
       case MetaProposalType.DocDate =>
         MetaProposal.parseDate(value) match {

modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala

@@ -19,7 +19,6 @@ import org.http4s.circe.CirceEntityEncoder._
 import org.http4s.dsl.Http4sDsl
 
 object ItemMultiRoutes {
-//  private[this] val logger = getLogger
 
   def apply[F[_]: Effect](
       backend: BackendApp[F],
@@ -118,33 +117,37 @@ object ItemMultiRoutes {
           resp  <- Ok(Conversions.basicResult(res, "Item due date updated"))
         } yield resp
 
-      // case req @ PUT -> Root / "corrOrg" =>
+      case req @ PUT -> Root / "corrOrg" =>
-      //   for {
+        for {
-      //     idref <- req.as[OptionalId]
+          json  <- req.as[ItemsAndRef]
-      //     res   <- backend.item.setCorrOrg(id, idref.id, user.account.collective)
+          items <- readIds[F](json.items)
-      //     resp  <- Ok(Conversions.basicResult(res, "Correspondent organization updated"))
+          res   <- backend.item.setCorrOrg(items, json.ref, user.account.collective)
-      //   } yield resp
+          resp  <- Ok(Conversions.basicResult(res, "Correspondent organization updated"))
+        } yield resp
 
-      // case req @ PUT -> Root / "corrPerson" =>
+      case req @ PUT -> Root / "corrPerson" =>
-      //   for {
+        for {
-      //     idref <- req.as[OptionalId]
+          json  <- req.as[ItemsAndRef]
-      //     res   <- backend.item.setCorrPerson(id, idref.id, user.account.collective)
+          items <- readIds[F](json.items)
-      //     resp  <- Ok(Conversions.basicResult(res, "Correspondent person updated"))
+          res   <- backend.item.setCorrPerson(items, json.ref, user.account.collective)
-      //   } yield resp
+          resp  <- Ok(Conversions.basicResult(res, "Correspondent person updated"))
+        } yield resp
 
-      // case req @ PUT -> Root / "concPerson" =>
+      case req @ PUT -> Root / "concPerson" =>
-      //   for {
+        for {
-      //     idref <- req.as[OptionalId]
+          json  <- req.as[ItemsAndRef]
-      //     res   <- backend.item.setConcPerson(id, idref.id, user.account.collective)
+          items <- readIds[F](json.items)
-      //     resp  <- Ok(Conversions.basicResult(res, "Concerned person updated"))
+          res   <- backend.item.setConcPerson(items, json.ref, user.account.collective)
-      //   } yield resp
+          resp  <- Ok(Conversions.basicResult(res, "Concerned person updated"))
+        } yield resp
 
-      // case req @ PUT -> Root / "concEquipment" =>
+      case req @ PUT -> Root / "concEquipment" =>
-      //   for {
+        for {
-      //     idref <- req.as[OptionalId]
+          json  <- req.as[ItemsAndRef]
-      //     res   <- backend.item.setConcEquip(id, idref.id, user.account.collective)
+          items <- readIds[F](json.items)
-      //     resp  <- Ok(Conversions.basicResult(res, "Concerned equipment updated"))
+          res   <- backend.item.setConcEquip(items, json.ref, user.account.collective)
-      //   } yield resp
+          resp  <- Ok(Conversions.basicResult(res, "Concerned equipment updated"))
+        } yield resp
 
       // case req @ POST -> Root / "reprocess" =>
       //   for {

modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala

@@ -185,8 +185,12 @@ object ItemRoutes {
       case req @ PUT -> Root / Ident(id) / "corrOrg" =>
         for {
           idref <- req.as[OptionalId]
-          res   <- backend.item.setCorrOrg(id, idref.id, user.account.collective)
+          res <- backend.item.setCorrOrg(
-          resp  <- Ok(Conversions.basicResult(res, "Correspondent organization updated"))
+            NonEmptyList.of(id),
+            idref.id,
+            user.account.collective
+          )
+          resp <- Ok(Conversions.basicResult(res, "Correspondent organization updated"))
         } yield resp
 
       case req @ POST -> Root / Ident(id) / "corrOrg" =>
@@ -200,8 +204,12 @@ object ItemRoutes {
       case req @ PUT -> Root / Ident(id) / "corrPerson" =>
         for {
           idref <- req.as[OptionalId]
-          res   <- backend.item.setCorrPerson(id, idref.id, user.account.collective)
+          res <- backend.item.setCorrPerson(
-          resp  <- Ok(Conversions.basicResult(res, "Correspondent person updated"))
+            NonEmptyList.of(id),
+            idref.id,
+            user.account.collective
+          )
+          resp <- Ok(Conversions.basicResult(res, "Correspondent person updated"))
         } yield resp
 
       case req @ POST -> Root / Ident(id) / "corrPerson" =>
@@ -215,8 +223,12 @@ object ItemRoutes {
       case req @ PUT -> Root / Ident(id) / "concPerson" =>
         for {
           idref <- req.as[OptionalId]
-          res   <- backend.item.setConcPerson(id, idref.id, user.account.collective)
+          res <- backend.item.setConcPerson(
-          resp  <- Ok(Conversions.basicResult(res, "Concerned person updated"))
+            NonEmptyList.of(id),
+            idref.id,
+            user.account.collective
+          )
+          resp <- Ok(Conversions.basicResult(res, "Concerned person updated"))
         } yield resp
 
       case req @ POST -> Root / Ident(id) / "concPerson" =>
@@ -230,8 +242,12 @@ object ItemRoutes {
       case req @ PUT -> Root / Ident(id) / "concEquipment" =>
         for {
           idref <- req.as[OptionalId]
-          res   <- backend.item.setConcEquip(id, idref.id, user.account.collective)
+          res <- backend.item.setConcEquip(
-          resp  <- Ok(Conversions.basicResult(res, "Concerned equipment updated"))
+            NonEmptyList.of(id),
+            idref.id,
+            user.account.collective
+          )
+          resp <- Ok(Conversions.basicResult(res, "Concerned equipment updated"))
         } yield resp
 
       case req @ POST -> Root / Ident(id) / "concEquipment" =>

modules/store/src/main/scala/docspell/store/records/RItem.scala

@@ -159,12 +159,16 @@ object RItem {
       ).update.run
     } yield n
 
-  def updateCorrOrg(itemId: Ident, coll: Ident, org: Option[Ident]): ConnectionIO[Int] =
+  def updateCorrOrg(
+      itemIds: NonEmptyList[Ident],
+      coll: Ident,
+      org: Option[Ident]
+  ): ConnectionIO[Int] =
     for {
       t <- currentTime
       n <- updateRow(
         table,
-        and(id.is(itemId), cid.is(coll)),
+        and(id.isIn(itemIds), cid.is(coll)),
         commas(corrOrg.setTo(org), updated.setTo(t))
       ).update.run
     } yield n
@@ -180,7 +184,7 @@ object RItem {
     } yield n
 
   def updateCorrPerson(
-      itemId: Ident,
+      itemIds: NonEmptyList[Ident],
       coll: Ident,
       person: Option[Ident]
   ): ConnectionIO[Int] =
@@ -188,7 +192,7 @@ object RItem {
       t <- currentTime
       n <- updateRow(
         table,
-        and(id.is(itemId), cid.is(coll)),
+        and(id.isIn(itemIds), cid.is(coll)),
         commas(corrPerson.setTo(person), updated.setTo(t))
       ).update.run
     } yield n
@@ -204,7 +208,7 @@ object RItem {
     } yield n
 
   def updateConcPerson(
-      itemId: Ident,
+      itemIds: NonEmptyList[Ident],
       coll: Ident,
       person: Option[Ident]
   ): ConnectionIO[Int] =
@@ -212,7 +216,7 @@ object RItem {
       t <- currentTime
       n <- updateRow(
         table,
-        and(id.is(itemId), cid.is(coll)),
+        and(id.isIn(itemIds), cid.is(coll)),
         commas(concPerson.setTo(person), updated.setTo(t))
       ).update.run
     } yield n
@@ -228,7 +232,7 @@ object RItem {
     } yield n
 
   def updateConcEquip(
-      itemId: Ident,
+      itemIds: NonEmptyList[Ident],
       coll: Ident,
       equip: Option[Ident]
   ): ConnectionIO[Int] =
@@ -236,7 +240,7 @@ object RItem {
       t <- currentTime
       n <- updateRow(
         table,
-        and(id.is(itemId), cid.is(coll)),
+        and(id.isIn(itemIds), cid.is(coll)),
         commas(concEquipment.setTo(equip), updated.setTo(t))
       ).update.run
     } yield n

modules/webapp/src/main/elm/Api.elm

@@ -77,10 +77,14 @@ module Api exposing
     , setAttachmentName
     , setCollectiveSettings
     , setConcEquip
+    , setConcEquipmentMultiple
     , setConcPerson
+    , setConcPersonMultiple
     , setConfirmed
     , setCorrOrg
+    , setCorrOrgMultiple
     , setCorrPerson
+    , setCorrPersonMultiple
     , setDateMultiple
     , setDirection
     , setDirectionMultiple
@@ -1375,6 +1379,62 @@ setDueDateMultiple flags data receive =
         }
 
 
+setCorrOrgMultiple :
+    Flags
+    -> ItemsAndRef
+    -> (Result Http.Error BasicResult -> msg)
+    -> Cmd msg
+setCorrOrgMultiple flags data receive =
+    Http2.authPut
+        { url = flags.config.baseUrl ++ "/api/v1/sec/items/corrOrg"
+        , account = getAccount flags
+        , body = Http.jsonBody (Api.Model.ItemsAndRef.encode data)
+        , expect = Http.expectJson receive Api.Model.BasicResult.decoder
+        }
+
+
+setCorrPersonMultiple :
+    Flags
+    -> ItemsAndRef
+    -> (Result Http.Error BasicResult -> msg)
+    -> Cmd msg
+setCorrPersonMultiple flags data receive =
+    Http2.authPut
+        { url = flags.config.baseUrl ++ "/api/v1/sec/items/corrPerson"
+        , account = getAccount flags
+        , body = Http.jsonBody (Api.Model.ItemsAndRef.encode data)
+        , expect = Http.expectJson receive Api.Model.BasicResult.decoder
+        }
+
+
+setConcPersonMultiple :
+    Flags
+    -> ItemsAndRef
+    -> (Result Http.Error BasicResult -> msg)
+    -> Cmd msg
+setConcPersonMultiple flags data receive =
+    Http2.authPut
+        { url = flags.config.baseUrl ++ "/api/v1/sec/items/concPerson"
+        , account = getAccount flags
+        , body = Http.jsonBody (Api.Model.ItemsAndRef.encode data)
+        , expect = Http.expectJson receive Api.Model.BasicResult.decoder
+        }
+
+
+setConcEquipmentMultiple :
+    Flags
+    -> ItemsAndRef
+    -> (Result Http.Error BasicResult -> msg)
+    -> Cmd msg
+setConcEquipmentMultiple flags data receive =
+    Http2.authPut
+        { url = flags.config.baseUrl ++ "/api/v1/sec/items/concEquipment"
+        , account = getAccount flags
+        , body = Http.jsonBody (Api.Model.ItemsAndRef.encode data)
+        , expect = Http.expectJson receive Api.Model.BasicResult.decoder
+        }
+
+
 
 --- Item
 

modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm

@@ -86,5 +86,33 @@ multiUpdate flags ids change receive =
             in
             Api.setDueDateMultiple flags data receive
 
+        OrgChange ref ->
+            let
+                data =
+                    ItemsAndRef items (Maybe.map .id ref)
+            in
+            Api.setCorrOrgMultiple flags data receive
+
+        CorrPersonChange ref ->
+            let
+                data =
+                    ItemsAndRef items (Maybe.map .id ref)
+            in
+            Api.setCorrPersonMultiple flags data receive
+
+        ConcPersonChange ref ->
+            let
+                data =
+                    ItemsAndRef items (Maybe.map .id ref)
+            in
+            Api.setConcPersonMultiple flags data receive
+
+        EquipChange ref ->
+            let
+                data =
+                    ItemsAndRef items (Maybe.map .id ref)
+            in
+            Api.setConcEquipmentMultiple flags data receive
+
         _ ->
             Cmd.none