Merge remote-tracking branch 'origin/master' into search-spike

src/main/scala/uk/gov/nationalarchives/tdr/api/service/FileMetadataService.scala

@@ -134,6 +134,7 @@ object FileMetadataService {
   val ClientSideFileSize = "ClientSideFileSize"
   val ClosurePeriod = "ClosurePeriod"
   val ClosureStartDate = "ClosureStartDate"
+  val FileUUID = "UUID"
   val Filename = "Filename"
   val FileType = "FileType"
   val FileReference = "FileReference"
@@ -144,7 +145,6 @@ object FileMetadataService {
   val ClosureType = "ClosureType"
   val Description = "description"
   val DescriptionAlternate = "DescriptionAlternate"
-
   val RightsCopyright = "RightsCopyright"
   val LegalStatus = "LegalStatus"
   val HeldBy = "HeldBy"

src/main/scala/uk/gov/nationalarchives/tdr/api/service/FileService.scala

@@ -71,6 +71,7 @@ class FileService(
         )
 
         val commonMetadataRows = List(
+          row(fileId, fileId.toString, FileUUID),
           row(fileId, path, ClientSideOriginalFilepath),
           row(fileId, treeNode.treeNodeType, FileType),
           row(fileId, treeNode.name, Filename),

src/test/resources/application.conf

@@ -39,7 +39,7 @@ featureAccessBlock {
 }
 
 referenceGenerator {
-  referenceGeneratorUrl = "http://localhost:8080"
+  referenceGeneratorUrl = "http://localhost:8008"
   referenceLimit = 2
 }
 

src/test/resources/json/getconsignment_data_all.json

@@ -24,6 +24,10 @@
           "parentReference": null,
           "originalFilePath": null,
           "fileMetadata": [
+            {
+              "name": "UUID",
+              "value": "42910a85-85c3-40c3-888f-32f697bfadb6"
+            },
             {
               "name": "SHA256ServerSideChecksum",
               "value": "Result of FileMetadata processing"

src/test/scala/uk/gov/nationalarchives/tdr/api/routes/FileRouteSpec.scala

@@ -74,7 +74,7 @@ class FileRouteSpec extends TestContainerUtils with Matchers with TestRequest {
     val res = runTestMutationFileMetadata("mutation_alldata_2", validUserToken())
     val distinctDirectoryCount = 3
     val fileCount = 5
-    val expectedCount = ((Filename :: FileType :: FileReference :: ParentReference :: defaultMetadataProperties).size * distinctDirectoryCount) +
+    val expectedCount = ((FileUUID :: Filename :: FileType :: FileReference :: ParentReference :: defaultMetadataProperties).size * distinctDirectoryCount) +
       (defaultMetadataProperties.size * fileCount) +
       (clientSideProperties.size * fileCount) +
       (serverSideProperties.size * fileCount) +
@@ -216,8 +216,8 @@ class FileRouteSpec extends TestContainerUtils with Matchers with TestRequest {
   }
 
   private def getReferencesMockServer(additionalRefs: Int = 0): WireMockServer = {
-    val wiremockServer = new WireMockServer(8080)
-    WireMock.configureFor("localhost", 8080)
+    val wiremockServer = new WireMockServer(8008)
+    WireMock.configureFor("localhost", 8008)
     wiremockServer.start()
     wiremockServer.stubFor(
       WireMock

src/test/scala/uk/gov/nationalarchives/tdr/api/service/FileMetadataServiceSpec.scala

@@ -547,6 +547,7 @@ class FileMetadataServiceSpec extends AnyFlatSpec with MockitoSugar with Matcher
     FileMetadataService.HeldBy shouldEqual "HeldBy"
     FileMetadataService.Language shouldEqual "Language"
     FileMetadataService.FoiExemptionCode shouldEqual "FoiExemptionCode"
+    FileMetadataService.FileUUID shouldEqual "UUID"
   }
 
   private def generateFileStatusRows(fileIds: Seq[UUID]) = {

src/test/scala/uk/gov/nationalarchives/tdr/api/service/FileServiceSpec.scala

@@ -735,7 +735,7 @@ class FileServiceSpec extends AnyFlatSpec with MockitoSugar with Matchers with S
       row.consignmentid should equal(consignmentId)
       row.userid should equal(userId)
     })
-    val expectedSize = 56
+    val expectedSize = 61
     metadataRows.size should equal(expectedSize)
     defaultMetadataProperties.foreach(prop => {
       metadataRows.count(_.propertyname == prop) should equal(5)
@@ -821,7 +821,7 @@ class FileServiceSpec extends AnyFlatSpec with MockitoSugar with Matchers with S
     })
     val file = fileRows.find(_.filereference.contains("ref4"))
     file.get.parentreference should equal(Some("ref2"))
-    val expectedSize = 56
+    val expectedSize = 61
     metadataRows.size should equal(expectedSize)
     defaultMetadataProperties.foreach(prop => {
       metadataRows.count(_.propertyname == prop) should equal(5)
@@ -906,7 +906,7 @@ class FileServiceSpec extends AnyFlatSpec with MockitoSugar with Matchers with S
       row.consignmentid should equal(consignmentId)
       row.userid should equal(userId)
     })
-    val expectedSize = 36
+    val expectedSize = 39
     metadataRows.size should equal(expectedSize)
     defaultMetadataProperties.foreach(prop => {
       metadataRows.count(_.propertyname == prop) should equal(3)

src/test/scala/uk/gov/nationalarchives/tdr/api/utils/TestUtils.scala

@@ -580,7 +580,7 @@ object TestUtils {
   case class Locations(column: Int, line: Int)
 
   val defaultFileId: UUID = UUID.fromString("07a3a4bd-0281-4a6d-a4c1-8fa3239e1313")
-  val serverSideProperties: List[String] = List(FileReference, ParentReference)
+  val serverSideProperties: List[String] = List(FileUUID, FileReference, ParentReference)
   val defaultMetadataProperties: List[String] = List(RightsCopyright, LegalStatus, HeldBy, Language, FoiExemptionCode)
   val defaultCopyright: String = "Crown Copyright"
   val defaultLegalStatus: String = "Public Record"