Skip to content

Bugfix external message processing issues #13688

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

Merged
raulbob merged 2 commits into from
Nov 14, 2025
Merged

Bugfix external message processing issues #13688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1816f44
#13676 - Fixed case classification not set for doctor declaration mes…
raulbob Nov 14, 2025
c2a4add
#13677 - Fixed NPE in pathogen test form leading to external message …
raulbob Nov 14, 2025
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
3 changes: 3 additions & 0 deletions ...lmessage/processing/doctordeclaration/AbstractDoctorDeclarationMessageProcessingFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ protected void postBuildCase(CaseDataDto caseDto, ExternalMessageDto externalMes
* The external message containing diagnostic data.
*/
protected void postBuildCaseData(CaseDataDto caseDto, ExternalMessageDto externalMessageDto) {

caseDto.setCaseClassification(
externalMessageDto.getCaseClassification() != null ? externalMessageDto.getCaseClassification() : caseDto.getCaseClassification());
caseDto.setRadiographyCompatibility(externalMessageDto.getRadiographyCompatibility());
caseDto.setOtherDiagnosticCriteria(externalMessageDto.getOtherDiagnosticCriteria());
}
Expand Down
39 changes: 22 additions & 17 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ public void setValue(PathogenTestDto newFieldValue) throws ReadOnlyException, Co
}
typingIdField.setValue(newFieldValue.getTypingId());
specieField.setValue(newFieldValue.getSpecie());
if(!genoTypingCB.isReadOnly()) {
if (!genoTypingCB.isReadOnly()) {
genoTypingCB.setValue(newFieldValue.getGenoTypeResult());
// We only set the genotyping result text if the genotyping result is not read only
if(!genoTypingResultTextTF.isReadOnly()) {
if (!genoTypingResultTextTF.isReadOnly()) {
genoTypingResultTextTF.setValue(newFieldValue.getGenoTypeResultText());
}
}
Expand Down Expand Up @@ -362,22 +362,27 @@ protected void addFields() {
I18nProperties.getPrefixCaption(SampleDto.I18N_PREFIX, SampleDto.SAMPLE_DATE_TIME),
DateFormatHelper.formatDate(getSampleDate()))));
testDateField.addValueChangeListener(e -> {
boolean hasTime = !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(LocalTime.MIDNIGHT);
if (hasTime) {
testDateField.removeAllValidators();
testDateField.addValidator(
new DateComparisonValidator(
testDateField,
this::getSampleDate,
false,
false,
false,
I18nProperties.getValidationError(
Validations.afterDateWithDate,
testDateField.getCaption(),
I18nProperties.getPrefixCaption(SampleDto.I18N_PREFIX, SampleDto.SAMPLE_DATE_TIME),
DateFormatHelper.formatLocalDateTime(getSampleDate()))));
boolean hasTime =
getSampleDate() != null && !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(LocalTime.MIDNIGHT);
Comment on lines +365 to +366

@coderabbitai coderabbitai Bot Nov 14, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

Fix type mismatch: toLocalDate() cannot be compared with LocalTime.MIDNIGHT.

Line 366 calls .toLocalDate() which returns a LocalDate object, then attempts to compare it with LocalTime.MIDNIGHT using .equals(). This is a type mismatch—LocalDate and LocalTime are incompatible types.

Apply this diff to fix the logic:

-		boolean hasTime =
-			getSampleDate() != null && !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(LocalTime.MIDNIGHT);
+		boolean hasTime =
+			getSampleDate() != null && !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalTime().equals(LocalTime.MIDNIGHT);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
boolean hasTime =
getSampleDate() != null && !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(LocalTime.MIDNIGHT);
boolean hasTime =
getSampleDate() != null && !getSampleDate().toInstant().atZone(ZoneId.systemDefault()).toLocalTime().equals(LocalTime.MIDNIGHT);
🤖 Prompt for AI Agents 
In sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
around lines 365-366, the code compares a LocalDate to LocalTime.MIDNIGHT
causing a type mismatch; change the comparison to examine the time component
instead — call toInstant().atZone(ZoneId.systemDefault()).toLocalTime() and
compare that to LocalTime.MIDNIGHT so hasTime becomes true when getSampleDate()
is non-null and its time is not midnight; keep the null check and timezone
conversion intact.


if (!hasTime) {
return;
}

testDateField.removeAllValidators();
testDateField.addValidator(
new DateComparisonValidator(
testDateField,
this::getSampleDate,
false,
false,
false,
I18nProperties.getValidationError(
Validations.afterDateWithDate,
testDateField.getCaption(),
I18nProperties.getPrefixCaption(SampleDto.I18N_PREFIX, SampleDto.SAMPLE_DATE_TIME),
DateFormatHelper.formatLocalDateTime(getSampleDate()))));

});
ComboBox lab = addInfrastructureField(PathogenTestDto.LAB);
lab.addItems(FacadeProvider.getFacilityFacade().getAllActiveLaboratories(true));
Expand Down
Loading