Provider has no label

wellcomecollection · Nov 2, 2018 · a5927cb · a5927cb
1 parent 542e8e9
commit a5927cb
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 20 deletions.
diff --git a/...common/src/main/scala/uk/ac/wellcome/platform/archive/common/models/DisplayProvider.scala b/...common/src/main/scala/uk/ac/wellcome/platform/archive/common/models/DisplayProvider.scala
@@ -4,9 +4,8 @@ import io.circe.generic.extras.JsonKey
 import uk.ac.wellcome.platform.archive.common.progress.models.StorageProvider
 
 case class DisplayProvider(id: String,
-                           label: String,
                            @JsonKey("type") ontologyType: String = "Provider")
 object DisplayProvider {
   def apply(provider: StorageProvider): DisplayProvider =
-    DisplayProvider(id = provider.id, label = provider.label)
+    DisplayProvider(id = provider.id)
 }
diff --git a/...c/main/scala/uk/ac/wellcome/platform/archive/common/progress/models/StorageLocation.scala b/...c/main/scala/uk/ac/wellcome/platform/archive/common/progress/models/StorageLocation.scala
@@ -8,7 +8,7 @@ object StorageLocation {
     StorageLocation(StorageProvider(displayLocation.provider), ObjectLocation(displayLocation.bucket, displayLocation.path))
 }
 
-case class StorageProvider(id: String, label: String)
+case class StorageProvider(id: String)
 object StorageProvider {
-  def apply(displayProvider: DisplayProvider): StorageProvider = StorageProvider(displayProvider.id, displayProvider.label)
+  def apply(displayProvider: DisplayProvider): StorageProvider = StorageProvider(displayProvider.id)
 }
diff --git a/...mmon/src/test/scala/uk/ac/wellcome/platform/archive/common/models/DisplayIngestTest.scala b/...mmon/src/test/scala/uk/ac/wellcome/platform/archive/common/models/DisplayIngestTest.scala
@@ -24,7 +24,7 @@ class DisplayIngestTest extends FunSpec with Matchers with RandomThings {
     val bagId = randomBagId
     val progress: Progress = Progress(
       id,
-      StorageLocation(StorageProvider("s3", "Amazon S3"), ObjectLocation("bukkit", "key.txt")),
+      StorageLocation(StorageProvider("s3"), ObjectLocation("bukkit", "key.txt")),
       Namespace(spaceId),
       Some(Callback(new URI(callbackUrl))),
       Progress.Processing,

diff --git a/...t/scala/uk/ac/wellcome/platform/archive/common/progress/fixtures/ProgressGenerators.scala b/...t/scala/uk/ac/wellcome/platform/archive/common/progress/fixtures/ProgressGenerators.scala
@@ -12,7 +12,7 @@ import uk.ac.wellcome.storage.ObjectLocation
 trait ProgressGenerators extends RandomThings {
 
   val storageLocation = StorageLocation(
-    StorageProvider(randomAlphanumeric(), randomAlphanumeric()),
+    StorageProvider(randomAlphanumeric()),
     ObjectLocation(randomAlphanumeric(), randomAlphanumeric()))
 
   def createProgress(): Progress = createProgressWith()

diff --git a/.../src/test/scala/uk/ac/wellcome/platform/archive/common/progress/models/ProgressTest.scala b/.../src/test/scala/uk/ac/wellcome/platform/archive/common/progress/models/ProgressTest.scala
@@ -40,7 +40,7 @@ class ProgressTest
 
     progress.id shouldBe a[UUID]
     progress.sourceLocation shouldBe StorageLocation(
-      StorageProvider(displayProvider.id, displayProvider.label),
+      StorageProvider(displayProvider.id),
       ObjectLocation(bucket, path))
     progress.callback shouldBe Some(
       Callback(URI.create(progressCreateRequest.callback.get.url)))

diff --git a/...otifier/src/test/scala/uk/ac/wellcome/platform/archive/notifier/NotifierFeatureTest.scala b/...otifier/src/test/scala/uk/ac/wellcome/platform/archive/notifier/NotifierFeatureTest.scala
@@ -77,7 +77,7 @@ class NotifierFeatureTest
                   .withRequestBody(equalToJson(toJson(ResponseDisplayIngest(
                     progress.id,
                     DisplayLocation(
-                      DisplayProvider(progress.sourceLocation.provider.id, progress.sourceLocation.provider.label),
+                      DisplayProvider(progress.sourceLocation.provider.id),
                       progress.sourceLocation.location.namespace,
                       progress.sourceLocation.location.key),
                     progress.callback.map(DisplayCallback(_)),
@@ -136,7 +136,7 @@ class NotifierFeatureTest
                   .withRequestBody(equalToJson(toJson(ResponseDisplayIngest(
                     progress.id,
                     DisplayLocation(
-                      DisplayProvider(progress.sourceLocation.provider.id, progress.sourceLocation.provider.label),
+                      DisplayProvider(progress.sourceLocation.provider.id),
                       progress.sourceLocation.location.namespace,
                       progress.sourceLocation.location.key),
                     progress.callback.map(DisplayCallback(_)),

diff --git a/...rc/test/scala/uk/ac/wellcome/platform/archive/progress_http/ProgressHttpFeatureTest.scala b/...rc/test/scala/uk/ac/wellcome/platform/archive/progress_http/ProgressHttpFeatureTest.scala
@@ -53,7 +53,7 @@ class ProgressHttpFeatureTest
                     getT[ResponseDisplayIngest](result.entity) shouldBe ResponseDisplayIngest(
                       progress.id,
                       DisplayLocation(
-                        DisplayProvider(progress.sourceLocation.provider.id, progress.sourceLocation.provider.label),
+                        DisplayProvider(progress.sourceLocation.provider.id),
                         progress.sourceLocation.location.namespace, progress.sourceLocation.location.key),
                       progress.callback.map(DisplayCallback(_)),
                       DisplayIngestType("create"),
@@ -204,7 +204,7 @@ class ProgressHttpFeatureTest
                       assertTableOnlyHasItem(
                         Progress(
                           id,
-                          StorageLocation(StorageProvider("s3", "Amazon S3"), ObjectLocation("bucket", "key.txt")),
+                          StorageLocation(StorageProvider("s3"), ObjectLocation("bucket", "key.txt")),
                           Namespace(storageSpace.id),
                           Some(Callback(testCallbackUri, Callback.Pending)),
                           Progress.Initialised,

diff --git a/...la/uk/ac/wellcome/platform/archive/registrar/async/factories/StorageManifestFactory.scala b/...la/uk/ac/wellcome/platform/archive/registrar/async/factories/StorageManifestFactory.scala
@@ -37,7 +37,7 @@ object StorageManifestFactory extends Logging {
         info = bagInfo,
         manifest = fileManifest,
         accessLocation = StorageLocation(
-          StorageProvider("aws-s3-ia", "AWS S3 - Infrequent Access"),
+          StorageProvider("aws-s3-ia"),
           ObjectLocation(
             archiveComplete.bagLocation.storageNamespace,
             s"${archiveComplete.bagLocation.storagePath}/${archiveComplete.bagLocation.bagPath.value}")

diff --git a/.../uk/ac/wellcome/platform/archive/registrar/async/fixtures/StorageManifestAssertions.scala b/.../uk/ac/wellcome/platform/archive/registrar/async/fixtures/StorageManifestAssertions.scala
@@ -28,8 +28,7 @@ trait StorageManifestAssertions extends Inside with Matchers {
         bagDigestFiles should have size filesNumber
 
         provider shouldBe StorageProvider(
-          id = "aws-s3-ia",
-          label = "AWS S3 - Infrequent Access")
+          id = "aws-s3-ia")
 
         actualNamespace shouldBe expectedNamespace
         actualPath shouldBe expectedPath

diff --git a/.../test/scala/uk/ac/wellcome/platform/archive/registrar/http/RegistrarHttpFeatureTest.scala b/.../test/scala/uk/ac/wellcome/platform/archive/registrar/http/RegistrarHttpFeatureTest.scala
@@ -49,14 +49,13 @@ class RegistrarHttpFeatureTest
               val path = "path"
               val bucket = "bucket"
               val providerId = "provider-id"
-              val providerLabel = "provider label"
               val storageManifest = StorageManifest(
                 space = space,
                 info = bagInfo,
                 manifest =
                   FileManifest(ChecksumAlgorithm(checksumAlgorithm), Nil),
                 StorageLocation(
-                  StorageProvider(providerId, providerLabel),
+                  StorageProvider(providerId),
                   ObjectLocation(bucket, path)),
                 Instant.now
               )
@@ -93,7 +92,6 @@ class RegistrarHttpFeatureTest
                         DisplayLocation(
                           DisplayProvider(
                             actualProviderId,
-                            actualProviderLabel,
                             "Provider"),
                           actualBucket,
                           actualPath,
@@ -110,7 +108,6 @@ class RegistrarHttpFeatureTest
 
                       actualChecksumAlgorithm shouldBe checksumAlgorithm
                       actualProviderId shouldBe providerId
-                      actualProviderLabel shouldBe providerLabel
                       actualBucket shouldBe bucket
                       actualPath shouldBe path
 
@@ -137,14 +134,13 @@ class RegistrarHttpFeatureTest
               val path = "path"
               val bucket = "bucket"
               val providerId = "provider-id"
-              val providerLabel = "provider label"
               val storageManifest = StorageManifest(
                 space = space,
                 info = bagInfo,
                 manifest =
                   FileManifest(ChecksumAlgorithm(checksumAlgorithm), Nil),
                 StorageLocation(
-                  StorageProvider(providerId, providerLabel),
+                  StorageProvider(providerId),
                   ObjectLocation(bucket, path)),
                 Instant.now
               )