Add rejections on tag deletion in routes so it gets retried

BlueBrain · Aug 7, 2023 · d6b7663 · d6b7663
1 parent a31dc9f
commit d6b7663
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/ResourcesRoutes.scala
@@ -249,6 +249,7 @@ final class ResourcesRoutes(
                                   .deleteTag(id, ref, schemaOpt, tag, rev)
                                   .tapEval(index(ref, _, mode))
                                   .map(_.void)
+                                  .rejectOn[ResourceNotFound]
                               )
                             }
                           )

diff --git a/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala b/delta/app/src/main/scala/ch/epfl/bluebrain/nexus/delta/routes/SchemasRoutes.scala
@@ -168,7 +168,13 @@ final class SchemasRoutes(
                           ref,
                           Write
                         )) { (tag, rev) =>
-                          emit(schemas.deleteTag(id, ref, tag, rev).tapEval(index(ref, _, mode)).map(_.void))
+                          emit(
+                            schemas
+                              .deleteTag(id, ref, tag, rev)
+                              .tapEval(index(ref, _, mode))
+                              .map(_.void)
+                              .rejectOn[SchemaNotFound]
+                          )
                         }
                       )
                     }

diff --git a/...c/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala b/...c/main/scala/ch/epfl/bluebrain/nexus/delta/plugins/storage/files/routes/FilesRoutes.scala
@@ -170,7 +170,7 @@ final class FilesRoutes(
                           ref,
                           Write
                         )) { (tag, rev) =>
-                          emit(files.deleteTag(id, ref, tag, rev).tapEval(index(ref, _, mode)))
+                          emit(files.deleteTag(id, ref, tag, rev).tapEval(index(ref, _, mode)).rejectOn[FileNotFound])
                         }
                       )
                     }

diff --git a/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ResourcesSpec.scala b/tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/ResourcesSpec.scala
@@ -562,6 +562,13 @@ class ResourcesSpec extends BaseSpec with EitherValuable with CirceEq {
           filterMetadataKeys(json) should equalIgnoreArrayOrder(expected)
       }
     }
+
+    "delete a tag" in {
+      deltaClient
+        .delete[Json](s"/resources/$id1/_/test-resource:1/tags/v1.0.1?rev=6", Rick) { (_, response) =>
+          response.status shouldEqual StatusCodes.OK
+        }
+    }
   }
 
   "check consistency of responses" in {