#2: Embedding the id in the delivery receipt

softwaremill · Dec 6, 2012 · 8355ed0 · 8355ed0
1 parent 4e567d8
commit 8355ed0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/api/src/main/scala/org/elasticmq/Message.scala b/api/src/main/scala/org/elasticmq/Message.scala
@@ -23,11 +23,15 @@ sealed case class MessageId(id: String) {
 }
 
 sealed case class DeliveryReceipt(receipt: String) {
+  def extractId: MessageId = MessageId(receipt.split(DeliveryReceipt.Separator)(0))
+
   override def toString = receipt
 }
 
 object DeliveryReceipt {
-  def generate = new DeliveryReceipt(UUID.randomUUID().toString)
+  private val Separator = "#"
+
+  def generate(id: MessageId) = new DeliveryReceipt(id + Separator + UUID.randomUUID().toString)
 }
 
 case class MessageBuilder private (content: String, id: Option[MessageId], nextDelivery: NextDelivery) {

diff --git a/api/src/test/scala/org/elasticmq/DeliveryReceiptTest.scala b/api/src/test/scala/org/elasticmq/DeliveryReceiptTest.scala
@@ -0,0 +1,17 @@
+package org.elasticmq
+
+import org.scalatest.matchers.MustMatchers
+import org.scalatest.FunSuite
+
+class DeliveryReceiptTest extends FunSuite with MustMatchers {
+  test("should extract id") {
+    // Given
+    val id = MessageId("123-781-abc-def")
+
+    // When
+    val receipt = DeliveryReceipt.generate(id)
+
+    // Then
+    receipt.extractId must be (id)
+  }
+}
diff --git a/core/src/main/scala/org/elasticmq/storage/inmemory/InMemoryMessagesStorage.scala b/core/src/main/scala/org/elasticmq/storage/inmemory/InMemoryMessagesStorage.scala
@@ -73,13 +73,14 @@ class InMemoryMessagesStorage(queueName: String, statistics: InMemoryMessageStat
             receiveMessage(deliveryTime, newNextDelivery)
           }
           case NextDeliveryUnchanged => {
+            val id = MessageId(message.id)
             if (message.nextDelivery.get() > deliveryTime) {
               // Putting the message back. That's the youngest message, so there is no message that can be received.
               messageQueue.add(message)
               None
-            } else if (messagesById.contains(MessageId(message.id))) {
+            } else if (messagesById.contains(id)) {
               // Putting the message again into the queue, with a new next delivery
-              message.deliveryReceipt.set(Some(DeliveryReceipt.generate.receipt))
+              message.deliveryReceipt.set(Some(DeliveryReceipt.generate(id).receipt))
               message.nextDelivery.set(newNextDelivery.millis)
               messageQueue.add(message)
 

diff --git a/project/Build.scala b/project/Build.scala
@@ -108,7 +108,7 @@ object ElasticMQBuild extends Build {
     "elasticmq-api",
     file("api"),
     settings = buildSettings ++ Seq(libraryDependencies ++= Seq(jodaTime, jodaConvert))
-  )
+  ) dependsOn(commonTest % "test")
 
   lazy val spi: Project = Project(
     "elasticmq-spi",

diff --git a/...-database/src/main/scala/org/elasticmq/storage/squeryl/SquerylMessagesStorageModule.scala b/...-database/src/main/scala/org/elasticmq/storage/squeryl/SquerylMessagesStorageModule.scala
@@ -77,7 +77,7 @@ trait SquerylMessagesStorageModule {
 
     private def updateNextDelivery(message: MessageData, nextDelivery: MillisNextDelivery) = {
       inTransaction {
-        val deliveryReceipt = DeliveryReceipt.generate
+        val deliveryReceipt = DeliveryReceipt.generate(message.id)
 
         val updatedCount = update(messages)(m =>
           where(m.id === message.id.id and m.nextDelivery === message.nextDelivery.millis)