Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Platform/13199/fhir function dynamic message routing #15273

Closed
wants to merge 16 commits into from
Closed

Platform/13199/fhir function dynamic message routing #15273

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
159a3b9
experiment
Jul 18, 2024
af8c30f
two failing tests but I think the tests are at fault
Jul 19, 2024
3e0473b
should be gtg
Jul 20, 2024
5fab6d1
asdf
Jul 20, 2024
a1ceb23
Merge branch 'master' into platform/13199/fhir_function_dynamic_messa…
Jul 20, 2024
3430b31
removes dead line of code
Jul 20, 2024
77ceb20
Merge branch 'master' into platform/13199/fhir_function_dynamic_messa…
Jul 25, 2024
16f757c
Merge branch 'master' into platform/13199/fhir_function_dynamic_messa…
Jul 30, 2024
4ae2e37
refactored queuemessage
Jul 30, 2024
80e887d
nearly there
Jul 31, 2024
2388e1a
done and done
Jul 31, 2024
e48afc1
done and done
Jul 31, 2024
a6b4516
Merge branch 'master' into platform/13199/fhir_function_dynamic_messa…
david-navapbc Jul 31, 2024
6fb126c
pr comment
Aug 6, 2024
9482263
Merge branch 'platform/13199/fhir_function_dynamic_message_routing' o…
Aug 6, 2024
420a057
more review stuff
Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions prime-router/src/main/kotlin/fhirengine/azure/FHIRFunctions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import gov.cdc.prime.router.fhirengine.engine.elrConvertQueueName
import gov.cdc.prime.router.fhirengine.engine.elrDestinationFilterQueueName
import gov.cdc.prime.router.fhirengine.engine.elrReceiverFilterQueueName
import gov.cdc.prime.router.fhirengine.engine.elrRoutingQueueName
import gov.cdc.prime.router.fhirengine.engine.elrSendQueueName
import gov.cdc.prime.router.fhirengine.engine.elrTranslationQueueName
import org.apache.commons.lang3.StringUtils
import org.apache.logging.log4j.kotlin.Logging
Expand Down Expand Up @@ -64,10 +63,7 @@ class FHIRFunctions(
) {
val messagesToDispatch = runFhirEngine(message, dequeueCount, fhirEngine, actionHistory)
messagesToDispatch.forEach {
queueAccess.sendMessage(
elrDestinationFilterQueueName,
it.serialize()
)
it.send(queueAccess)
}
}

Expand Down Expand Up @@ -101,10 +97,7 @@ class FHIRFunctions(
) {
val messagesToDispatch = runFhirEngine(message, dequeueCount, fhirEngine, actionHistory)
messagesToDispatch.forEach {
queueAccess.sendMessage(
elrTranslationQueueName,
it.serialize()
)
it.send(queueAccess)
}
}

Expand Down Expand Up @@ -137,10 +130,7 @@ class FHIRFunctions(
val messagesToDispatch = runFhirEngine(message, dequeueCount, fhirEngine, actionHistory)

messagesToDispatch.forEach {
queueAccess.sendMessage(
elrReceiverFilterQueueName,
it.serialize()
)
it.send(queueAccess)
}
}

Expand Down Expand Up @@ -172,10 +162,7 @@ class FHIRFunctions(
) {
val messagesToDispatch = runFhirEngine(message, dequeueCount, fhirEngine, actionHistory)
messagesToDispatch.forEach {
queueAccess.sendMessage(
elrTranslationQueueName,
it.serialize()
)
it.send(queueAccess)
}
}

Expand Down Expand Up @@ -208,10 +195,7 @@ class FHIRFunctions(
val messagesToDispatch = runFhirEngine(message, dequeueCount, fhirEngine, actionHistory)
// Only dispatches event if Topic.isSendOriginal was true
messagesToDispatch.forEach {
queueAccess.sendMessage(
elrSendQueueName,
it.serialize()
)
it.send(queueAccess)
}
}

Expand Down
42 changes: 42 additions & 0 deletions prime-router/src/main/kotlin/fhirengine/engine/QueueMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import gov.cdc.prime.router.ReportId
import gov.cdc.prime.router.Topic
import gov.cdc.prime.router.azure.BlobAccess
import gov.cdc.prime.router.azure.Event
import gov.cdc.prime.router.azure.QueueAccess
import java.util.Base64
import java.util.UUID

Expand All @@ -35,6 +36,47 @@ private const val MESSAGE_SIZE_LIMIT = 64 * 1000
JsonSubTypes.Type(ReportEventQueueMessage::class, name = "report")
)
abstract class QueueMessage {
fun send(queueAccess: QueueAccess) {
when (this.javaClass) {
FhirConvertQueueMessage::class.java -> {
queueAccess.sendMessage(
elrConvertQueueName,
serialize()
)
}
FhirRouteQueueMessage::class.java -> {
queueAccess.sendMessage(
elrRoutingQueueName,
serialize()
)
}
FhirDestinationFilterQueueMessage::class.java -> {
queueAccess.sendMessage(
elrDestinationFilterQueueName,
serialize()
)
}
FhirReceiverFilterQueueMessage::class.java -> {
queueAccess.sendMessage(
elrReceiverFilterQueueName,
serialize()
)
}
FhirTranslateQueueMessage::class.java -> {
queueAccess.sendMessage(
elrTranslationQueueName,
serialize()
)
}
ReportEventQueueMessage::class.java -> {
queueAccess.sendMessage(
elrSendQueueName,
serialize()
)
}
}
}

fun serialize(): String {
val bytes = mapper.writeValueAsBytes(this)
check(bytes.size < MESSAGE_SIZE_LIMIT) { "Message is too big for the queue." }
Expand Down
7 changes: 4 additions & 3 deletions prime-router/src/test/kotlin/fhirengine/azure/FhirFunctionTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import gov.cdc.prime.router.fhirengine.engine.FHIREngine
import gov.cdc.prime.router.fhirengine.engine.FHIRRouter
import gov.cdc.prime.router.fhirengine.engine.FHIRTranslator
import gov.cdc.prime.router.fhirengine.engine.FhirDestinationFilterQueueMessage
import gov.cdc.prime.router.fhirengine.engine.FhirRouteQueueMessage
import gov.cdc.prime.router.fhirengine.engine.FhirTranslateQueueMessage
import gov.cdc.prime.router.fhirengine.engine.QueueMessage
import gov.cdc.prime.router.fhirengine.engine.elrDestinationFilterQueueName
import gov.cdc.prime.router.fhirengine.engine.elrTranslationQueueName
Expand Down Expand Up @@ -244,12 +244,13 @@ class FhirFunctionTests {
emptyMap(),
emptyList()
)
val message = FhirRouteQueueMessage(
val message = FhirTranslateQueueMessage(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the story here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the test logic wasn't testing what it was supposed to be testing

report.id,
"",
"",
"ignore.ignore-full-elr",
Topic.FULL_ELR
Topic.FULL_ELR,
""
)
every { fhirEngine.doWork(any(), any(), any()) } returns listOf(
FHIREngine.FHIREngineRunResult(
Expand Down