Dependency updates

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 2.7.5
+22f65b437f4885b5058aeca090a7fa46c16cbbee

.scalafmt.conf

@@ -1,6 +1,6 @@
 # Matches the version here
 # https://github.com/wellcomecollection/dockerfiles/blob/master/scalafmt/Dockerfile#L11
-version = "2.0.0"
+version = "2.7.5"
 align.openParenCallSite = false
 continuationIndent.defnSite = 2
 rewrite.rules = [SortImports, RedundantBraces]

common/search/src/main/scala/weco/api/search/config/builders/PipelineElasticClientBuilder.scala

@@ -31,8 +31,10 @@ object PipelineElasticClientBuilder {
           "public_host",
           secretsManagerClientBuilder
             .credentialsProvider(
-              ProfileCredentialsProvider.create("catalogue-developer"))
-            .build())
+              ProfileCredentialsProvider.create("catalogue-developer")
+            )
+            .build()
+        )
       case _ =>
         ("private_host", secretsManagerClientBuilder.build())
     }

common/stacks/src/main/scala/weco/catalogue/source_model/sierra/rules/SierraItemAccess.scala

@@ -2,7 +2,11 @@ package weco.catalogue.source_model.sierra.rules
 
 import grizzled.slf4j.Logging
 import weco.api.stacks.models.{CatalogueAccessMethod, CatalogueLocationType}
-import weco.catalogue.display_model.locations.{CatalogueAccessStatus, DisplayAccessCondition, DisplayLocationType}
+import weco.catalogue.display_model.locations.{
+  CatalogueAccessStatus,
+  DisplayAccessCondition,
+  DisplayLocationType
+}
 import weco.catalogue.source_model.sierra.source.{OpacMsg, Status}
 import weco.sierra.models.SierraQueryOps
 import weco.sierra.models.data.SierraItemData
@@ -22,7 +26,6 @@ import weco.sierra.models.data.SierraItemData
   *
   * We remove rules that would end in a "definitely not requestable" state, because
   * those items should be filtered out by the front end.
-  *
   */
 object SierraItemAccess extends SierraQueryOps with Logging {
   def apply(
@@ -48,10 +51,10 @@ object SierraItemAccess extends SierraQueryOps with Logging {
       //
       // Otherwise, we copy the item note onto the access condition.
       case (Some(ac), Some(displayNote))
-        if ac.note.isDefined && displayNote.isAccessNote =>
+          if ac.note.isDefined && displayNote.isAccessNote =>
         (Some(ac), None)
       case (Some(ac), Some(displayNote))
-        if ac.note.isEmpty && displayNote.isAccessNote =>
+          if ac.note.isEmpty && displayNote.isAccessNote =>
         (Some(ac.copy(note = Some(displayNote))), None)
 
       // If the item note is nothing to do with the access condition, we return it to
@@ -68,18 +71,25 @@ object SierraItemAccess extends SierraQueryOps with Logging {
     locationTypeId: Option[String],
     itemData: SierraItemData
   ): Option[DisplayAccessCondition] =
-    (holdCount, status, opacmsg, rulesForRequestingResult, locationTypeId) match {
+    (
+      holdCount,
+      status,
+      opacmsg,
+      rulesForRequestingResult,
+      locationTypeId
+    ) match {
 
       // Items in the closed stores that aren't prevented from being requested get
       // the "Online request" condition.
       //
       // Example: b18799966 / i17571170
       case (
-        Some(0),
-        Some(Status.Available),
-        Some(OpacMsg.OnlineRequest),
-        None,
-        Some(CatalogueLocationType.ClosedStores)) =>
+            Some(0),
+            Some(Status.Available),
+            Some(OpacMsg.OnlineRequest),
+            None,
+            Some(CatalogueLocationType.ClosedStores)
+          ) =>
         Some(
           DisplayAccessCondition(
             method = CatalogueAccessMethod.OnlineRequest,
@@ -92,11 +102,12 @@ object SierraItemAccess extends SierraQueryOps with Logging {
       //
       // Example: b29459126 / i19023340
       case (
-        Some(0),
-        Some(Status.Available),
-        Some(OpacMsg.Restricted),
-        None,
-        Some(CatalogueLocationType.ClosedStores)) =>
+            Some(0),
+            Some(Status.Available),
+            Some(OpacMsg.Restricted),
+            None,
+            Some(CatalogueLocationType.ClosedStores)
+          ) =>
         Some(
           DisplayAccessCondition(
             method = CatalogueAccessMethod.OnlineRequest,
@@ -118,30 +129,32 @@ object SierraItemAccess extends SierraQueryOps with Logging {
       // for requesting, e.g. some of our long-lived test holds didn't get cleared properly.
       // If an item seems to be stuck on a non-zero hold count, ask somebody to check Sierra.
       case (Some(holdCount), _, _, _, Some(CatalogueLocationType.ClosedStores))
-        if holdCount > 0 =>
+          if holdCount > 0 =>
         Some(
           DisplayAccessCondition(
             method = CatalogueAccessMethod.NotRequestable,
             status = Some(CatalogueAccessStatus.TemporarilyUnavailable),
             note = Some(
-              "Item is in use by another reader. Please ask at Library Enquiry Desk."),
+              "Item is in use by another reader. Please ask at Library Enquiry Desk."
+            ),
             terms = None
           )
         )
 
-
       case (
-        _,
-        _,
-        _,
-        Some(NotRequestable.InUseByAnotherReader(_)),
-        Some(CatalogueLocationType.ClosedStores)) =>
+            _,
+            _,
+            _,
+            Some(NotRequestable.InUseByAnotherReader(_)),
+            Some(CatalogueLocationType.ClosedStores)
+          ) =>
         Some(
           DisplayAccessCondition(
             method = CatalogueAccessMethod.NotRequestable,
             status = Some(CatalogueAccessStatus.TemporarilyUnavailable),
             note = Some(
-              "Item is in use by another reader. Please ask at Library Enquiry Desk."),
+              "Item is in use by another reader. Please ask at Library Enquiry Desk."
+            ),
             terms = None
           )
         )
@@ -160,10 +173,10 @@ object SierraItemAccess extends SierraQueryOps with Logging {
 
   implicit class ItemDataAccessOps(itemData: SierraItemData) {
     def status: Option[String] =
-      itemData.fixedFields.get("88").map { _.value.trim }
+      itemData.fixedFields.get("88").map(_.value.trim)
 
     def opacmsg: Option[String] =
-      itemData.fixedFields.get("108").map { _.value.trim }
+      itemData.fixedFields.get("108").map(_.value.trim)
   }
 
   // The display note field has been used for multiple purposes, in particular:

common/stacks/src/main/scala/weco/catalogue/source_model/sierra/rules/SierraRulesForRequesting.scala

@@ -19,7 +19,6 @@ import weco.sierra.models.data.SierraItemData
   *
   * We remove rules that would end in a "definitely not requestable" state, because
   * those items should be filtered out by the front end.
-  *
   */
 object SierraRulesForRequesting {
   def apply(itemData: SierraItemData): Option[NotRequestable] =
@@ -45,19 +44,20 @@ object SierraRulesForRequesting {
       //      for now.  TODO: Find an example of this.
       //
       case i
-        if i.fixedField("87").getOrElse("0") != "0" || i
-          .fixedField("88")
-          .contains("!") =>
+          if i.fixedField("87").getOrElse("0") != "0" || i
+            .fixedField("88")
+            .contains("!") =>
         Some(
           NotRequestable.InUseByAnotherReader(
-            "Item is in use by another reader. Please ask at Enquiry Desk.")
+            "Item is in use by another reader. Please ask at Enquiry Desk."
+          )
         )
 
       case _ => None
     }
 
   private implicit class ItemDataOps(itemData: SierraItemData) {
     def fixedField(code: String): Option[String] =
-      itemData.fixedFields.get(code).map { _.value.trim }
+      itemData.fixedFields.get(code).map(_.value.trim)
   }
 }

items/src/main/scala/weco/api/items/ItemsApi.scala

@@ -13,11 +13,10 @@ import scala.concurrent.ExecutionContext
 class ItemsApi(
   val itemUpdateService: ItemUpdateService,
   val workLookup: WorkLookup
-)(
-  implicit
+)(implicit
   val ec: ExecutionContext,
-  val apiConfig: ApiConfig
-) extends LookupItemStatus
+  val apiConfig: ApiConfig)
+    extends LookupItemStatus
     with IdentifierDirectives
     with FutureDirectives
     with Tracing {

items/src/main/scala/weco/api/items/config/builders/SierraOauthHttpClientBuilder.scala

@@ -23,7 +23,7 @@ object SierraOauthHttpClientBuilder {
   def build(config: Config, environment: ApiEnvironment = ApiEnvironment.Prod)(
     implicit
     as: ActorSystem,
-    ec: ExecutionContext,
+    ec: ExecutionContext
   ): SierraOauthHttpClient = {
 
     val secretsManagerClientBuilder = SecretsManagerClient.builder()
@@ -32,7 +32,8 @@ object SierraOauthHttpClientBuilder {
       case ApiEnvironment.Dev =>
         secretsManagerClientBuilder
           .credentialsProvider(
-            ProfileCredentialsProvider.create("catalogue-developer"))
+            ProfileCredentialsProvider.create("catalogue-developer")
+          )
           .build()
       case _ =>
         secretsManagerClientBuilder.build()

items/src/main/scala/weco/api/items/services/ItemUpdateService.scala

@@ -37,7 +37,8 @@ class ItemUpdateService(
       // Construct a lookup from SourceIdentifier -> index
       val updatedItemsWithIndex = itemsWithIndex
         .map {
-          case (item, index) => getSrcId(item) -> index
+          case (item, index) =>
+            getSrcId(item) -> index
         }
         .flatMap {
           // Add the correct index for an item by SourceIdentifier
@@ -71,7 +72,8 @@ class ItemUpdateService(
     val items = work.items
 
     val groupedItems = items.zipWithIndex.groupBy {
-      case (item, _) => getSrcId(item).map(_.identifierType.id)
+      case (item, _) =>
+        getSrcId(item).map(_.identifierType.id)
     }
 
     Future.sequence {
@@ -84,18 +86,19 @@ class ItemUpdateService(
                 preservedOrderItemsUpdate(
                   itemsWithIndex = itemsWithIndex,
                   updateFunction = updater.updateItems
-              )
-            )
+              ))
             .getOrElse(Future(itemsWithIndex))
 
         case (None, itemsWithIndex) =>
           Future(itemsWithIndex)
       }
       // unzipWithIndex
     } map (_.flatten.toList.sortBy {
-      case (_, index) => index
+      case (_, index) =>
+        index
     } map {
-      case (item, _) => item
+      case (item, _) =>
+        item
     })
   }
 }

items/src/main/scala/weco/api/items/services/SierraItemUpdater.scala

@@ -25,15 +25,14 @@ import scala.concurrent.{ExecutionContext, Future}
   *  This provides an up to date view on whether a hold
   *  can be placed on an item, and generates a list of dates
   *  when the item can be viewed in the library
-  *
   */
 class SierraItemUpdater(
   sierraSource: SierraSource,
   venuesOpeningTimesLookup: VenuesOpeningTimesLookup,
   venueClock: Clock
-)(
-  implicit executionContext: ExecutionContext
-) extends ItemUpdater
+)(implicit
+  executionContext: ExecutionContext)
+    extends ItemUpdater
     with Logging
     with DisplayItemOps {
 
@@ -45,7 +44,7 @@ class SierraItemUpdater(
   ): Future[Map[SierraItemNumber, SierraItemData]] =
     sierraSource
       .lookupItemEntries(staleItemIds)
-      .map(itemEither => {
+      .map { itemEither =>
         val items = itemEither match {
           case Right(SierraItemDataEntries(_, _, entries)) =>
             entries.map(entry => entry.id -> Some(entry)) toMap
@@ -62,7 +61,7 @@ class SierraItemUpdater(
           case (sierraItemNumber, Some(sierraItemData)) =>
             sierraItemNumber -> sierraItemData
         }
-      })
+      }
 
   private def updateItem(
     item: DisplayItem,
@@ -114,7 +113,9 @@ class SierraItemUpdater(
     item: DisplayItem,
     sierraItemLocation: Option[SierraLocation]
   ): Future[DisplayItem] =
-    if (item.physicalAccessCondition.exists(_.isRequestable) && sierraItemLocation.isDefined) {
+    if (item.physicalAccessCondition.exists(
+          _.isRequestable
+        ) && sierraItemLocation.isDefined) {
       val locationName = sierraItemLocation.get.code match {
         case "harop" => "deepstore"
         case _       => "library"
@@ -148,14 +149,9 @@ class SierraItemUpdater(
       .flatMap(
         venuesList =>
           venuesList
-            .map(
-              venue =>
-                venue.title.toLowerCase() -> venue.openingTimes.map(
-                  openingTime =>
-                    AvailabilitySlot(openingTime.open, openingTime.close)
-            )
-        )
-    ) toMap
+            .map(venue =>
+              venue.title.toLowerCase() -> venue.openingTimes.map(openingTime =>
+                AvailabilitySlot(openingTime.open, openingTime.close)))) toMap
 
   private def libraryItemAvailabilities(
     venuesOpeningTimes: Map[String, List[AvailabilitySlot]]
@@ -186,8 +182,7 @@ class SierraItemUpdater(
         parseISOStringToLocalDate(openingTime.from)
           .isAfter(
             parseISOStringToLocalDate(firstDeepstoreAvailabilitySlot.from)
-        )
-    )
+        ))
     firstDeepstoreAvailabilitySlot :: subsequentLibraryAvailabilitySlots
   }
 
@@ -213,5 +208,6 @@ class SierraItemUpdater(
   private def parseISOStringToLocalDate(isoString: String): LocalDate =
     LocalDate.parse(
       isoString,
-      DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"))
+      DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    )
 }

project/Common.scala

@@ -3,7 +3,7 @@ import sbt._
 
 object Common {
   val settings: Seq[Def.Setting[_]] = Seq(
-    scalaVersion := "2.12.16",
+    scalaVersion := "2.12.19",
     organization := "weco",
     resolvers ++= Seq(
       "Wellcome releases" at "s3://releases.mvn-repo.wellcomecollection.org/"