on undeletion, mark image as archived so it cannot be immediately rereaped

Author: andrew-nowak

common-lib/src/main/scala/com/gu/mediaservice/GridClient.scala

@@ -8,7 +8,7 @@ import com.gu.mediaservice.model.leases.LeasesByMedia
 import com.gu.mediaservice.model.usage.Usage
 import com.typesafe.scalalogging.LazyLogging
 import play.api.http.HeaderNames
-import play.api.libs.json.{JsArray, JsObject, JsValue, Json, Reads}
+import play.api.libs.json.{JsArray, JsObject, JsTrue, JsValue, Json, Reads}
 
 import scala.concurrent.duration.{Duration, DurationInt}
 import scala.concurrent.{ExecutionContext, Future}
@@ -260,6 +260,11 @@ class GridClient(services: Services)(implicit wsClient: WSClient) extends LazyLo
     authorisedRequest.post(Json.obj("data" -> data)).map { response => validateResponse(response, url)}
   }
 
+  def putArchived(mediaId: String, authFn: WSRequest => WSRequest)(implicit ec: ExecutionContext) = {
+    val url = new URL(s"${services.metadataBaseUri}/metadata/$mediaId/archived")
+    val request = authFn(wsClient.url(url.toString))
+    request.put(Json.obj("data" -> JsTrue)).map { response => validateResponse(response, url)}
+  }
 }
 
 class DownstreamApiInBadStateException(message: String, downstreamMessage: String) extends IllegalStateException(message) {

kahuna/public/js/components/gr-undelete-image/gr-un-delete-image.js

@@ -23,6 +23,7 @@ undeleteImage.controller('grUnDeleteImageCtrl', [
             apiPoll(findImage);
         }
 
+        // TODO remove "unusable" banner and recognise that the image is now archived
         ctrl.unDeleteImage = function (image) {
             return mediaApi.undelete(image.data.id)
                 .then(() => pollDeleted(image))

media-api/app/controllers/MediaApi.scala

@@ -403,15 +403,19 @@ class MediaApi(
           && ImageExtras.userMayUndeleteImage(request.user, image, authorisation) =>
         logger.info(logMarker, s"undeleting image $id")
 
-        softDeletedMetadataTable.updateStatus(id, isDeleted = false)
-          .map { _ =>
-            messageSender.publish(
-              UpdateMessage(
-                subject = UnSoftDeleteImage,
-                id = Some(id)
-              )
+        for {
+          // Take an "undeletion" as a marker that the file should be kept and not reaped.
+          // Mark as archived before undeleting, to make sure the reaper doesn't immediately reap it.
+          _ <- gridClient.putArchived(id, auth.getOnBehalfOfPrincipal(request.user))
+          _ <- softDeletedMetadataTable.updateStatus(id, isDeleted = false)
+          _ = messageSender.publish(
+            UpdateMessage(
+              subject = UnSoftDeleteImage,
+              id = Some(id)
             )
-          }.map { _ => Accepted }
+          )
+        } yield Accepted
+
       case Some(image) if isVisibleToAccessor(request.user, image) =>
         logger.info(logMarker, s"user ${request.user.accessor.identity} was not permitted to undelete image $id")
         Future.successful(ImageDeleteForbidden)