Pivotal ID # 184278951: Publishing Message Is Being Sent Twice (#672)

* Pivotal ID # 184278951: Publishing Message Is Being Sent Twice Remove duplicated message publishing
EBIBioStudies · Jan 20, 2023 · d187e25 · d187e25
1 parent 84aa412
commit d187e25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/...ion-handlers/src/main/kotlin/ac/uk/ebi/biostd/handlers/listeners/LogSubmissionListener.kt b/...ion-handlers/src/main/kotlin/ac/uk/ebi/biostd/handlers/listeners/LogSubmissionListener.kt
@@ -10,6 +10,6 @@ private val logger = KotlinLogging.logger {}
 class LogSubmissionListener {
     @RabbitListener(queues = [LOG_QUEUE])
     fun receiveMessage(submission: SubmissionMessage) {
-        logger.info { "received message for submission ${submission.accNo}" }
+        logger.info { "Received message for submission ${submission.accNo}" }
     }
 }
diff --git a/...app/src/main/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionStagesHandler.kt b/...app/src/main/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionStagesHandler.kt
@@ -34,7 +34,7 @@ class SubmissionStagesHandler(
     @RabbitHandler
     fun loadRequest(rqt: RequestIndexed) {
         processSafely(rqt) {
-            logger.info { "$accNo, received Created message for submission $accNo, version: $version" }
+            logger.info { "$accNo, Received Created message for submission $accNo, version: $version" }
             submissionSubmitter.loadRequest(rqt)
             eventsPublisherService.requestLoaded(rqt.accNo, rqt.version)
         }
@@ -71,8 +71,7 @@ class SubmissionStagesHandler(
     fun saveSubmission(rqt: RequestCheckedReleased) {
         processSafely(rqt) {
             logger.info { "$accNo, Received check released message for submission $accNo, version: $version" }
-            val submission = submissionSubmitter.saveRequest(rqt)
-            eventsPublisherService.submissionSubmitted(submission.accNo, submission.owner)
+            submissionSubmitter.saveRequest(rqt)
         }
     }
 

diff --git a/...src/test/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionStagesHandlerTest.kt b/...src/test/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionStagesHandlerTest.kt
@@ -112,13 +112,10 @@ class SubmissionStagesHandlerTest(
         every { submission.accNo } returns "S-BSST0"
         every { submission.owner } returns "owner@test.org"
         every { submissionSubmitter.saveRequest(request) } returns submission
-        every { eventsPublisherService.submissionSubmitted("S-BSST0", "owner@test.org") } answers { nothing }
 
         testInstance.saveSubmission(request)
 
-        verify(exactly = 1) {
-            submissionSubmitter.saveRequest(request)
-            eventsPublisherService.submissionSubmitted("S-BSST0", "owner@test.org")
-        }
+        verify(exactly = 1) { submissionSubmitter.saveRequest(request) }
+        verify(exactly = 0) { eventsPublisherService.submissionSubmitted(any(), any()) }
     }
 }