From d440247857780b08207f5d93fff34f52048553d2 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 9 Jun 2020 23:20:58 +0200 Subject: [PATCH] Change modify item routes to use http put --- .../src/main/resources/docspell-openapi.yml | 20 +++++++++---------- .../restserver/routes/ItemRoutes.scala | 20 +++++++++---------- modules/webapp/src/main/elm/Api.elm | 20 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index bd85e136..25abffca 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -1060,7 +1060,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/tags: - post: + put: tags: [ Item ] summary: Set new set of tags. description: | @@ -1082,7 +1082,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/direction: - post: + put: tags: [ Item ] summary: Set the direction of an item. description: | @@ -1104,7 +1104,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/corrOrg: - post: + put: tags: [ Item ] summary: Set the correspondent organization of an item. description: | @@ -1126,7 +1126,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/corrPerson: - post: + put: tags: [ Item ] summary: Set the correspondent person of an item. description: | @@ -1148,7 +1148,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/concPerson: - post: + put: tags: [ Item ] summary: Set the concerning person of an item. description: | @@ -1170,7 +1170,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/concEquipment: - post: + put: tags: [ Item ] summary: Set the concering equipment of an item. description: | @@ -1192,7 +1192,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/notes: - post: + put: tags: [ Item ] summary: Set notes of an item. description: | @@ -1214,7 +1214,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/name: - post: + put: tags: [ Item ] summary: Set the name of an item. description: | @@ -1272,7 +1272,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/date: - post: + put: tags: [ Item ] summary: Sets the item date. description: | @@ -1294,7 +1294,7 @@ paths: schema: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/duedate: - post: + put: tags: [ Item ] summary: Sets the items due date. description: | diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala index e2070046..f2511f2e 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala @@ -71,56 +71,56 @@ object ItemRoutes { resp <- Ok(Conversions.basicResult(res, "Item back to created.")) } yield resp - case req @ POST -> Root / Ident(id) / "tags" => + case req @ PUT -> Root / Ident(id) / "tags" => for { tags <- req.as[ReferenceList].map(_.items) res <- backend.item.setTags(id, tags.map(_.id), user.account.collective) resp <- Ok(Conversions.basicResult(res, "Tags updated")) } yield resp - case req @ POST -> Root / Ident(id) / "direction" => + case req @ PUT -> Root / Ident(id) / "direction" => for { dir <- req.as[DirectionValue] res <- backend.item.setDirection(id, dir.direction, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Direction updated")) } yield resp - case req @ POST -> Root / Ident(id) / "corrOrg" => + case req @ PUT -> Root / Ident(id) / "corrOrg" => for { idref <- req.as[OptionalId] res <- backend.item.setCorrOrg(id, idref.id, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Correspondent organization updated")) } yield resp - case req @ POST -> Root / Ident(id) / "corrPerson" => + case req @ PUT -> Root / Ident(id) / "corrPerson" => for { idref <- req.as[OptionalId] res <- backend.item.setCorrPerson(id, idref.id, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Correspondent person updated")) } yield resp - case req @ POST -> Root / Ident(id) / "concPerson" => + case req @ PUT -> Root / Ident(id) / "concPerson" => for { idref <- req.as[OptionalId] res <- backend.item.setConcPerson(id, idref.id, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Concerned person updated")) } yield resp - case req @ POST -> Root / Ident(id) / "concEquipment" => + case req @ PUT -> Root / Ident(id) / "concEquipment" => for { idref <- req.as[OptionalId] res <- backend.item.setConcEquip(id, idref.id, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Concerned equipment updated")) } yield resp - case req @ POST -> Root / Ident(id) / "notes" => + case req @ PUT -> Root / Ident(id) / "notes" => for { text <- req.as[OptionalText] res <- backend.item.setNotes(id, text.text.notEmpty, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Notes updated")) } yield resp - case req @ POST -> Root / Ident(id) / "name" => + case req @ PUT -> Root / Ident(id) / "name" => for { text <- req.as[OptionalText] res <- backend.item.setName( @@ -131,7 +131,7 @@ object ItemRoutes { resp <- Ok(Conversions.basicResult(res, "Name updated")) } yield resp - case req @ POST -> Root / Ident(id) / "duedate" => + case req @ PUT -> Root / Ident(id) / "duedate" => for { date <- req.as[OptionalDate] _ <- logger.fdebug(s"Setting item due date to ${date.date}") @@ -139,7 +139,7 @@ object ItemRoutes { resp <- Ok(Conversions.basicResult(res, "Item due date updated")) } yield resp - case req @ POST -> Root / Ident(id) / "date" => + case req @ PUT -> Root / Ident(id) / "date" => for { date <- req.as[OptionalDate] _ <- logger.fdebug(s"Setting item date to ${date.date}") diff --git a/modules/webapp/src/main/elm/Api.elm b/modules/webapp/src/main/elm/Api.elm index f0d51946..760b3324 100644 --- a/modules/webapp/src/main/elm/Api.elm +++ b/modules/webapp/src/main/elm/Api.elm @@ -1047,7 +1047,7 @@ itemDetail flags id receive = setTags : Flags -> String -> ReferenceList -> (Result Http.Error BasicResult -> msg) -> Cmd msg setTags flags item tags receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/tags" , account = getAccount flags , body = Http.jsonBody (Api.Model.ReferenceList.encode tags) @@ -1057,7 +1057,7 @@ setTags flags item tags receive = setDirection : Flags -> String -> DirectionValue -> (Result Http.Error BasicResult -> msg) -> Cmd msg setDirection flags item dir receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/direction" , account = getAccount flags , body = Http.jsonBody (Api.Model.DirectionValue.encode dir) @@ -1067,7 +1067,7 @@ setDirection flags item dir receive = setCorrOrg : Flags -> String -> OptionalId -> (Result Http.Error BasicResult -> msg) -> Cmd msg setCorrOrg flags item id receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/corrOrg" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalId.encode id) @@ -1077,7 +1077,7 @@ setCorrOrg flags item id receive = setCorrPerson : Flags -> String -> OptionalId -> (Result Http.Error BasicResult -> msg) -> Cmd msg setCorrPerson flags item id receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/corrPerson" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalId.encode id) @@ -1087,7 +1087,7 @@ setCorrPerson flags item id receive = setConcPerson : Flags -> String -> OptionalId -> (Result Http.Error BasicResult -> msg) -> Cmd msg setConcPerson flags item id receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/concPerson" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalId.encode id) @@ -1097,7 +1097,7 @@ setConcPerson flags item id receive = setConcEquip : Flags -> String -> OptionalId -> (Result Http.Error BasicResult -> msg) -> Cmd msg setConcEquip flags item id receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/concEquipment" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalId.encode id) @@ -1107,7 +1107,7 @@ setConcEquip flags item id receive = setItemName : Flags -> String -> OptionalText -> (Result Http.Error BasicResult -> msg) -> Cmd msg setItemName flags item text receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/name" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalText.encode text) @@ -1117,7 +1117,7 @@ setItemName flags item text receive = setItemNotes : Flags -> String -> OptionalText -> (Result Http.Error BasicResult -> msg) -> Cmd msg setItemNotes flags item text receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/notes" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalText.encode text) @@ -1127,7 +1127,7 @@ setItemNotes flags item text receive = setItemDate : Flags -> String -> OptionalDate -> (Result Http.Error BasicResult -> msg) -> Cmd msg setItemDate flags item date receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/date" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalDate.encode date) @@ -1137,7 +1137,7 @@ setItemDate flags item date receive = setItemDueDate : Flags -> String -> OptionalDate -> (Result Http.Error BasicResult -> msg) -> Cmd msg setItemDueDate flags item date receive = - Http2.authPost + Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/duedate" , account = getAccount flags , body = Http.jsonBody (Api.Model.OptionalDate.encode date)