Don't JSON encode the work ID sent by the merger

wellcomecollection · Oct 19, 2020 · d4ecba6 · d4ecba6
1 parent 12ebde0
commit d4ecba6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...e/merger/src/main/scala/uk/ac/wellcome/platform/merger/services/MergerWorkerService.scala b/...e/merger/src/main/scala/uk/ac/wellcome/platform/merger/services/MergerWorkerService.scala
@@ -48,13 +48,20 @@ class MergerWorkerService[WorkDestination, ImageDestination](
         case Right(works) => Future.successful(works)
       }
       (worksFuture, imagesFuture) = (
-        sendMessages(workSender, works.map(_.id)),
+        sendWorks(works),
         sendMessages(imageSender, mergerOutcome.images)
       )
       _ <- worksFuture
       _ <- imagesFuture
     } yield ()
 
+  private def sendWorks(works: Seq[Work[Merged]]): Future[Seq[Unit]] =
+    Future.sequence(
+      works.map { w =>
+        Future.fromTry(workSender.send(w.id))
+      }
+    )
+
   private def sendMessages[Destination, T](
     sender: MessageSender[Destination],
     items: Seq[T])(implicit encoder: Encoder[T]): Future[Seq[Unit]] =

diff --git a/.../merger/src/test/scala/uk/ac/wellcome/platform/merger/fixtures/WorkerServiceFixture.scala b/.../merger/src/test/scala/uk/ac/wellcome/platform/merger/fixtures/WorkerServiceFixture.scala
@@ -57,7 +57,7 @@ trait WorkerServiceFixture extends LocalWorksVhs with SQS with Akka {
     }
 
   def getWorksSent(workSender: MemoryMessageSender): Seq[String] =
-    workSender.getMessages[String]
+    workSender.messages.map { _.body }
 
   def getImagesSent(imageSender: MemoryMessageSender): Seq[MergedImage[DataState.Unidentified]] =
     imageSender.getMessages[MergedImage[DataState.Unidentified]]