Feature 12573 automatic lab message processing #12688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
October 13, 2023 11:05
…e not needed file
…automatic_lab_message_processing # Conflicts: # sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/processing/AbstractProcessingFlow.java
…ed FacadeProvide usage in api code
|
SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=12688 |
MateStrysewske
requested changes
Oct 24, 2023
| @@ -20,6 +20,8 @@ public interface ExternalMessageFacade extends PermanentlyDeletableFacade { | |||
|
|
|||
| ExternalMessageDto save(@Valid ExternalMessageDto dto); | |||
|
|
|||
| ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto dto); | |||
There was a problem hiding this comment.
Suggested change
| ExternalMessageDto saveAndProcessLabmessage(@Valid ExternalMessageDto dto); | |
| ExternalMessageDto saveAndProcessExternalMessage(@Valid ExternalMessageDto dto); |
There was a problem hiding this comment.
It processes an external message of type LAB_MESSAGE so I wouldn't add the general name you suggested but instead let's add a safety check inside the method and throw an exception if the external message type is not LAB_MESSAGE
Note that Physician reports are processed in another flow
|
|
||
| private static boolean isLastSample(ExternalMessageDto labMessage, int sampleReportIndex) { | ||
| if (sampleReportIndex >= labMessage.getSampleReportsNullSafe().size()) { | ||
| throw new IllegalArgumentException("The sample report index is out of bounds."); |
There was a problem hiding this comment.
I'd throw an actual IndexOutOfBoundsException here
|
|
||
| if (StringUtils.isBlank(reportId) || StringUtils.isBlank(labSampleId)) | ||
|
|
||
| { |
There was a problem hiding this comment.
Formatting seems off here
| @@ -2079,7 +2072,7 @@ public List<CaseMergeIndexDto[]> getCasesForDuplicateMerging( | |||
| cq.multiselect(root.get(Case.ID), root2.get(Case.ID), root.get(Case.CREATION_DATE)); | |||
| cq.orderBy(cb.desc(root.get(Case.CREATION_DATE))); | |||
|
|
|||
| TypedQuery<Object[]> typedQuery = em.createQuery(cq).setParameter("date_type", "epoch"); | |||
| TypedQuery<Object[]> typedQuery = em.createQuery(cq); | |||
There was a problem hiding this comment.
I remember that this was necessary at some point - what made you remove it?
| ProcessingResult<ExternalMessageProcessingResult> result = automaticLabMessageProcessor.processLabMessage(savedMessage); | ||
|
|
||
| if (result.getStatus().isCanceled()) { | ||
| logger.error("Processing of lab message with UUID {} has benn canceled", savedMessage.getUuid()); |
There was a problem hiding this comment.
Suggested change
| logger.error("Processing of lab message with UUID {} has benn canceled", savedMessage.getUuid()); | |
| logger.error("Processing of lab message with UUID {} has been canceled", savedMessage.getUuid()); |
| @Override | ||
| protected void handlePickOrCreatePerson(PersonDto person, HandlerCallback<EntitySelection<PersonDto>> callback) { | ||
| String nationalHealthId = person.getNationalHealthId(); | ||
| if (nationalHealthId != null) { |
There was a problem hiding this comment.
Do a blank check here instead
| similarCases.get(0).getDisease()); | ||
|
|
||
| if (caseUuid != null) { | ||
| CaseSelectionDto caseToAsiignTo = |
There was a problem hiding this comment.
Suggested change
| CaseSelectionDto caseToAsiignTo = | |
| CaseSelectionDto caseToAssignTo = |
As I've put in the PR description: |
|
Sending this external message leads to an error that does not happen when I use the normal Stack trace: The ReST endpoint returns a 500 internal server error with the following message: "Client'stransactionaborted" |
…stions and fixed save issue after cancel
…automatic_lab_message_processing # Conflicts: # sormas-backend/src/main/resources/sql/sormas_schema.sql
|
SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=12688 |
MateStrysewske
requested changes
Oct 27, 2023
There was a problem hiding this comment.
Lab messages aren't automatically processed for me at all; I've set up my system to use the Luxembourg locale and have submitted an external message with a unique person that should be automatically processable, but that doesn't happen and I still have to do it manually. Anything else I'm missing to make this work outside of unit tests? I'm of course calling the saveAndProcessLabmessage method in the ReST endpoint.
Can you please post the labmessage you're pushing to the adapter? |
…ian Report with option "Share reports" - initial commit
…ian Report with option "Share reports" - initial commit 2
…ian Report with option "Share reports" - initial commit 3
…ian Report with option "Share reports" - initial commit 4
…ian Report with option "Share reports" - added handling for discard popup button
…ian Report with option "Share reports" - refactor 5
…ian Report with option "Share reports" - refactor 6
…ian Report with option "Share reports" - refactor 7
…ian Report with option "Share reports" - refactor 8
#12689) * #12666 Prevent district level users in the web app from editing sending information of environment samples that they have not created * #12666 Prevent district level users in the web app from editing sending information of environment samples that they have not created - disable weather conditions when dispatch fields are disabled --------- Co-authored-by: Levente Gal <[email protected]>
…ian Report with option "Share reports" - dates converted to the same format
…ian Report with option "Share reports" - dates converted to the same format 2
…ian Report with option "Share reports" - added step that close popup
…ian Report with option "Share reports" - added close handling for check step
…d if assigned towards an user" - changed test user role name
…d if assigned towards an user" - -add Tag
…e events of a group" - increased time for waitForPageLoadingSpinnerToDisappear
…athogen test in a sample" - added waiting for element EDIT_REPORT_BUTTON
This reverts commit 5130ac2.
… default infrastructure logic + removed hardcoded sample material and test type
… default infrastructure logic + fixed sample assignment threshold query issue and tests
… default infrastructure logic + fixed failing test
|
SonarCloud analysis: https://sonarcloud.io/dashboard?id=SORMAS-Project&pullRequest=12688 |
MateStrysewske
approved these changes
Nov 3, 2023
MateStrysewske
deleted the
feature-12573-automatic_lab_message_processing
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12573
Will need an eSante ticket for changing the push endpoint to call the
saveAndProcessLabmessagefacade methodThe automaticProcessingPossible seems to be useless in this case