Updating the domainMetadata to allow introduction of 'key' field to allow search link to be included. Addition of force soft delete endpoint for use with Capture.

Author: AndyKilmory

common-lib/src/main/scala/com/gu/mediaservice/lib/config/CommonConfig.scala

@@ -91,6 +91,7 @@ abstract class CommonConfig(resources: GridConfigResources) extends AwsClientV1B
    *         {
    *           name = "field-a"
    *           label = "Field A"
+   *           key = "Search field key for A" (optional)
    *           type = "string" # type can either be string, integer, select or datetime
    *         }
    *         {

common-lib/src/main/scala/com/gu/mediaservice/lib/config/DomainMetadataSpec.scala

@@ -8,6 +8,7 @@ import scala.jdk.CollectionConverters._
 case class DomainMetadataField(
   name: String,
   label: String,
+  key: Option[String] = None,
   fieldType: String,
   options: Option[List[String]] = None
 )
@@ -32,10 +33,12 @@ object DomainMetadataSpec {
         val description = if (config.hasPath("description")) Some(config.getString("description")) else None
         val fields = config.getConfigList("fields").asScala.map(config => {
           val fieldOptions = if (config.hasPath("options")) Some(config.getStringList("options").asScala.toList) else None
+          val key = if (config.hasPath("key")) Some(config.getString("key")) else None
 
           DomainMetadataField(
             config.getString("name"),
             config.getString("label"),
+            key,
             config.getString("type"),
             fieldOptions
           )

kahuna/public/js/components/gr-image-metadata/gr-image-metadata.html

@@ -804,7 +804,16 @@
                                   e:form="domainMetadataEditForm">
 
                                 <span ng-if="specField.value">
-                                    {{specField.value}}
+                                    <span ng-if="specField.key">
+                                        <a ui-sref="search.results({query: specField.value, nonFree: ctrl.srefNonfree()})"
+                                           ng-click="ctrl.searchWithModifiers($event, specField.key , specField.value)"
+                                           aria-label="Search images with '{{specField.value}}'">
+                                            {{specField.value}}
+                                        </a>
+                                    </span>
+                                    <span ng-if="!specField.key">
+                                        {{specField.value}}
+                                    </span>
                                 </span>
                                 <span class="editable-empty" ng-if="! specField.value && ctrl.userCanEdit">
                                     Unknown (click ✎ to add)

media-api/app/controllers/MediaApi.scala

@@ -313,6 +313,34 @@ class MediaApi(
     }
   }
 
+  def forceDeleteImage(id: String) = auth.async { request =>
+    implicit val r: Request[AnyContent] = request
+    elasticSearch.getImageById(id) map {
+      case Some(image) if hasPermission(request.user, image) =>
+        val canDelete = authorisation.isUploaderOrHasPermission(request.user, image.uploadedBy, DeleteImagePermission)
+        if(canDelete){
+          val imageStatusRecord = ImageStatusRecord(id, request.user.accessor.identity, DateTime.now(DateTimeZone.UTC).toString, true)
+          softDeletedMetadataTable.setStatus(imageStatusRecord)
+            .map { _ =>
+              messageSender.publish(
+                UpdateMessage(
+                  subject = SoftDeleteImage,
+                  id = Some(id),
+                  softDeletedMetadata = Some(SoftDeletedMetadata(
+                    deleteTime = DateTime.now(DateTimeZone.UTC),
+                    deletedBy = request.user.accessor.identity
+                  ))
+                )
+              )
+            }
+          Accepted
+        } else {
+          ImageDeleteForbidden
+        }
+      case _ => ImageNotFound(id)
+    }
+  }
+
   def unSoftDeleteImage(id: String) = auth.async { request =>
     implicit val r: Request[AnyContent] = request
     elasticSearch.getImageById(id) map {

media-api/conf/routes

@@ -25,6 +25,7 @@ GET     /images/:imageId/download                                   controllers.
 GET     /images/:imageId/downloadOptimised                          controllers.MediaApi.downloadOptimisedImage(imageId: String, width: Int, height: Int, quality: Int)
 POST    /images/:id/:partnerName/:startPending/syndicateImage       controllers.MediaApi.syndicateImage(id: String, partnerName: String, startPending:String)
 DELETE  /images/:id                                                 controllers.MediaApi.deleteImage(id: String)
+DELETE  /images/:id/force-delete                                    controllers.MediaApi.forceDeleteImage(id: String)
 DELETE  /images/:id/hard-delete                                     controllers.MediaApi.hardDeleteImage(id: String)
 PUT     /images/:id/undelete                                        controllers.MediaApi.unSoftDeleteImage(id: String)
 GET     /images                                                     controllers.MediaApi.imageSearch()