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

#4770 - Manually triggered calculation of case classification - addit… #5805

Merged
merged 1 commit into from
Jun 16, 2021
Merged

#4770 - Manually triggered calculation of case classification - addit… #5805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 8 additions & 29 deletions ...n/java/de/symeda/sormas/api/caze/classification/ClassificationAllSymptomsCriteriaDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.lang.reflect.Field;
import java.util.List;

import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
import org.apache.commons.lang3.ArrayUtils;

import de.symeda.sormas.api.Disease;
Expand All @@ -22,31 +23,22 @@
public class ClassificationAllSymptomsCriteriaDto extends ClassificationCriteriaDto {

private SymptomState symptomState;
private Disease disease;
private FieldVisibilityCheckers fieldVisibilityCheckers;

public ClassificationAllSymptomsCriteriaDto(SymptomState symptomState, Disease disease) {
public ClassificationAllSymptomsCriteriaDto(SymptomState symptomState, Disease disease, String countryLocale) {
this.symptomState = symptomState;
this.disease = disease;
fieldVisibilityCheckers = FieldVisibilityCheckers.withDisease(disease).andWithCountry(countryLocale);
}

@Override
public boolean eval(CaseDataDto caze, PersonDto person, List<PathogenTestDto> pathogenTests, List<EventDto> events) {

Disease caseDisease = caze.getDisease();

for (Field field : SymptomsDto.class.getDeclaredFields()) {
Diseases annotation = field.getAnnotation(Diseases.class);
HideForCountries hideForCountriesAnnotation = field.getAnnotation(HideForCountries.class);
HideForCountriesExcept hideForCountriesExceptAnnotation = field.getAnnotation(HideForCountriesExcept.class);

SymptomsDto symptomsDto = caze.getSymptoms();
if (field.getType() == SymptomState.class
&& annotation != null
&& ArrayUtils.contains(annotation.value(), caseDisease)
&& (hideForCountriesAnnotation == null || !ArrayUtils.contains(hideForCountriesAnnotation.countries(), getCountryLocale()))
&& (hideForCountriesExceptAnnotation == null
|| ArrayUtils.contains(hideForCountriesExceptAnnotation.countries(), getCountryLocale()))) {

&& fieldVisibilityCheckers.isVisible(SymptomsDto.class, field.getName()))
{
field.setAccessible(true);
try {
boolean matchedFieldState = field.get(symptomsDto) == symptomState;
Expand Down Expand Up @@ -76,24 +68,11 @@ public String buildDescription() {
}

for (Field field : SymptomsDto.class.getDeclaredFields()) {
Diseases annotation = field.getAnnotation(Diseases.class);
HideForCountries hideForCountriesAnnotation = field.getAnnotation(HideForCountries.class);
HideForCountriesExcept hideForCountriesExceptAnnotation = field.getAnnotation(HideForCountriesExcept.class);

if (field.getType() == SymptomState.class
&& annotation != null
&& ArrayUtils.contains(annotation.value(), disease)
&& (hideForCountriesAnnotation == null || !ArrayUtils.contains(hideForCountriesAnnotation.countries(), getCountryLocale()))
&& (hideForCountriesExceptAnnotation == null
|| ArrayUtils.contains(hideForCountriesExceptAnnotation.countries(), getCountryLocale()))) {

stringBuilder.append(field.getName()).append("; ");
&& fieldVisibilityCheckers.isVisible(SymptomsDto.class, field.getName())) {
stringBuilder.append(I18nProperties.getPrefixCaption( SymptomsDto.I18N_PREFIX,field.getName())).append("; ");
}
}
return stringBuilder.toString();
}

private String getCountryLocale() {
return FacadeProvider.getConfigFacade().getCountryLocale();
}
}
5 changes: 3 additions & 2 deletions ...api/src/main/java/de/symeda/sormas/api/utils/fieldvisibility/FieldVisibilityCheckers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*******************************************************************************/
package de.symeda.sormas.api.utils.fieldvisibility;

import java.io.Serializable;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.util.ArrayList;
Expand All @@ -28,7 +29,7 @@
import de.symeda.sormas.api.utils.fieldvisibility.checkers.DiseaseFieldVisibilityChecker;
import de.symeda.sormas.api.utils.fieldvisibility.checkers.FeatureTypeFieldVisibilityChecker;

public class FieldVisibilityCheckers {
public class FieldVisibilityCheckers implements Serializable {

private List<FieldNameBaseChecker> fieldNameBasedCheckers = new ArrayList<>();
private List<FieldBasedChecker> fieldBasedCheckers = new ArrayList<>();
Expand Down Expand Up @@ -125,7 +126,7 @@ public static FieldVisibilityCheckers withCheckers(Checker... checkers) {
return ret;
}

interface Checker {
interface Checker extends Serializable {

}

Expand Down
7 changes: 6 additions & 1 deletion sormas-app/app/src/main/java/de/symeda/sormas/app/rest/RetroProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
import androidx.fragment.app.FragmentActivity;

import de.symeda.sormas.api.caze.classification.ClassificationAllOfCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationAllSymptomsCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationCaseCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationEpiDataCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationEventClusterCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationExposureCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationNoneOfCriteriaDto;
import de.symeda.sormas.api.caze.classification.ClassificationNotInStartDateRangeCriteriaDto;
Expand Down Expand Up @@ -149,7 +151,10 @@ private RetroProvider(Context context) throws ServerConnectionException, ServerC
.registerSubtype(ClassificationExposureCriteriaDto.class, "ClassificationExposureCriteriaDto")
.registerSubtype(ClassificationXOfCriteriaDto.ClassificationXOfSubCriteriaDto.class, "ClassificationXOfSubCriteriaDto")
.registerSubtype(ClassificationXOfCriteriaDto.ClassificationOneOfCompactCriteriaDto.class, "ClassificationOneOfCompactCriteriaDto")
.registerSubtype(ClassificationAllOfCriteriaDto.ClassificationAllOfCompactCriteriaDto.class, "ClassificationAllOfCompactCriteriaDto");
.registerSubtype(ClassificationAllOfCriteriaDto.ClassificationAllOfCompactCriteriaDto.class, "ClassificationAllOfCompactCriteriaDto")
.registerSubtype(ClassificationEventClusterCriteriaDto.class, "ClassificationEventClusterCriteriaDto")
.registerSubtype(ClassificationAllSymptomsCriteriaDto.class, "ClassificationAllSymptomsCriteriaDto");


Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, (JsonDeserializer<Date>) (json, typeOfT, context1) -> {
if (json.isJsonNull()) {
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/de/symeda/sormas/backend/caze/classification/CaseClassificationFacadeEjb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ private ClassificationPersonAgeBetweenYearsCriteriaDto personAgeBetweenYears(Int
}

private ClassificationAllSymptomsCriteriaDto allOfSymptoms(SymptomState symptomState, Disease disease) {
return new ClassificationAllSymptomsCriteriaDto(symptomState, disease);
return new ClassificationAllSymptomsCriteriaDto(symptomState, disease, configFacade.getCountryLocale());
}

private ClassificationEventClusterCriteriaDto partOfEventCluster() {
Expand Down