Skip to content

Commit b399414

Browse files
obinna-h-nobinna-h-n
authored
Merge pull request #13485 from SORMAS-Foundation/13480-unusual-method-in-casedatadto
Code refactoring
2 parents 0bc3ba9 + 36a69e1 commit b399414

File tree

17 files changed

+66
-81
lines changed

17 files changed

+66
-81
lines changed

‎sormas-api/src/main/java/de/symeda/sormas/api/DiseaseHelper.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,13 @@ public static String toString(Disease disease, String diseaseDetails, DiseaseVar
7070
public static String variantInBrackets(DiseaseVariant diseaseVariant) {
7171
return diseaseVariant == null ? StringUtils.EMPTY : String.format("(%s)", diseaseVariant.getCaption());
7272
}
73+
74+
/**
75+
* Checks if the case is an invasive bacterial disease (meningococcal or pneumococcal)
76+
* @return boolean
77+
*/
78+
public static boolean checkDiseaseIsInvasiveBacterialDiseases(Disease disease){
79+
return disease != null && (disease == Disease.INVASIVE_MENINGOCOCCAL_INFECTION ||
80+
disease == Disease.INVASIVE_PNEUMOCOCCAL_INFECTION);
81+
}
7382
}

‎sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseDataDto.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,14 +1840,7 @@ public void setOtherDiagnosticCriteria(String otherDiagnosticCriteria) {
18401840
this.otherDiagnosticCriteria = otherDiagnosticCriteria;
18411841
}
18421842

1843-
/**
1844-
* Checks if the case is an invasive bacterial disease (meningococcal or pneumococcal)
1845-
* @return boolean
1846-
*/
1847-
public boolean checkDiseaseIsInvasiveBacterialDiseases(){
1848-
return disease != null && (disease == Disease.INVASIVE_MENINGOCOCCAL_INFECTION ||
1849-
disease == Disease.INVASIVE_PNEUMOCOCCAL_INFECTION);
1850-
}
1843+
18511844

18521845
@JsonIgnore
18531846
public String i18nPrefix() {

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactCriteria.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
3535
import de.symeda.sormas.api.person.PersonReferenceDto;
3636
import de.symeda.sormas.api.person.SymptomJournalStatus;
37+
import de.symeda.sormas.api.therapy.Drug;
3738
import de.symeda.sormas.api.user.UserReferenceDto;
3839
import de.symeda.sormas.api.user.UserRoleReferenceDto;
3940
import de.symeda.sormas.api.utils.DateFilterOption;
@@ -153,7 +154,7 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
153154
private String caseReferenceNumber;
154155
private Boolean withCase;
155156
private Boolean prophylaxisPrescribed;
156-
private PrescribedDrug prescribedDrug;
157+
private Drug prescribedDrug;
157158
private String prescribedDrugText;
158159

159160
public UserRoleReferenceDto getReportingUserRole() {
@@ -814,19 +815,19 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
814815
this.prophylaxisPrescribed = prophylaxisPrescribed;
815816
}
816817

817-
public PrescribedDrug getPrescribedDrug() {
818-
return prescribedDrug;
819-
}
820-
821-
public void setPrescribedDrug(PrescribedDrug prescribedDrug) {
822-
this.prescribedDrug = prescribedDrug;
823-
}
824-
825818
public String getPrescribedDrugText() {
826819
return prescribedDrugText;
827820
}
828821

829822
public void setPrescribedDrugText(String prescribedDrugText) {
830823
this.prescribedDrugText = prescribedDrugText;
831824
}
825+
826+
public Drug getPrescribedDrug() {
827+
return prescribedDrug;
828+
}
829+
830+
public void setPrescribedDrug(Drug prescribedDrug) {
831+
this.prescribedDrug = prescribedDrug;
832+
}
832833
}

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactDto.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import de.symeda.sormas.api.sormastosormas.S2SIgnoreProperty;
4848
import de.symeda.sormas.api.sormastosormas.SormasToSormasConfig;
4949
import de.symeda.sormas.api.sormastosormas.SormasToSormasShareableDto;
50+
import de.symeda.sormas.api.therapy.Drug;
5051
import de.symeda.sormas.api.user.UserReferenceDto;
5152
import de.symeda.sormas.api.utils.DataHelper;
5253
import de.symeda.sormas.api.utils.DependingOnFeatureType;
@@ -379,7 +380,7 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
379380
@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
380381
@SensitiveData
381382
@Diseases(Disease.INVASIVE_MENINGOCOCCAL_INFECTION)
382-
private PrescribedDrug prescribedDrug;
383+
private Drug prescribedDrug;
383384
@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
384385
@SensitiveData
385386
@Diseases(Disease.INVASIVE_MENINGOCOCCAL_INFECTION)
@@ -1092,11 +1093,11 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
10921093
this.prophylaxisPrescribed = prophylaxisPrescribed;
10931094
}
10941095

1095-
public PrescribedDrug getPrescribedDrug() {
1096+
public Drug getPrescribedDrug() {
10961097
return prescribedDrug;
10971098
}
10981099

1099-
public void setPrescribedDrug(PrescribedDrug prescribedDrug) {
1100+
public void setPrescribedDrug(Drug prescribedDrug) {
11001101
this.prescribedDrug = prescribedDrug;
11011102
}
11021103

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDetailedDto.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import de.symeda.sormas.api.person.ApproximateAgeType;
1010
import de.symeda.sormas.api.person.Sex;
1111
import de.symeda.sormas.api.person.SymptomJournalStatus;
12+
import de.symeda.sormas.api.therapy.Drug;
1213
import de.symeda.sormas.api.user.UserReferenceDto;
1314
import de.symeda.sormas.api.utils.PersonalData;
1415
import de.symeda.sormas.api.utils.SensitiveData;
@@ -74,7 +75,7 @@ public ContactIndexDetailedDto(String uuid, String personUuid, String personFirs
7475
Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
7576
String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
7677
String reportingUserFirstName, String reportingUserLastName, ContactRelation relationToCase, int visitCount,
77-
Boolean prophylaxisPrescribed, PrescribedDrug prescribedDrug, String prescribedDrugText
78+
Boolean prophylaxisPrescribed, Drug prescribedDrug, String prescribedDrugText
7879
) {
7980
//@formatter:on
8081

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactIndexDto.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import de.symeda.sormas.api.caze.VaccinationStatus;
2727
import de.symeda.sormas.api.common.DeletionReason;
2828
import de.symeda.sormas.api.person.SymptomJournalStatus;
29+
import de.symeda.sormas.api.therapy.Drug;
2930
import de.symeda.sormas.api.utils.PersonalData;
3031
import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableIndexDto;
3132
import de.symeda.sormas.api.uuid.HasUuid;
@@ -102,7 +103,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
102103
private DeletionReason deletionReason;
103104
private String otherDeletionReason;
104105
private Boolean prophylaxisPrescribed;
105-
private PrescribedDrug prescribedDrug;
106+
private Drug prescribedDrug;
106107
private String prescribedDrugText;
107108

108109
private ContactJurisdictionFlagsDto contactJurisdictionFlagsDto;
@@ -117,7 +118,7 @@ public ContactIndexDto(String uuid, String personUuid, String personFirstName, S
117118
CaseClassification caseClassification, String caseRegionName, String caseDistrictName,
118119
Date changeDate, // XXX: unused, only here for TypedQuery mapping
119120
String externalID, String externalToken, String internalToken,String caseReferenceNumber, DeletionReason deletionReason, String otherDeletionReason, boolean isInJurisdiction, boolean isCaseInJurisdiction,
120-
int visitCount, Boolean prophylaxisPrescribed, PrescribedDrug prescribedDrug, String prescribedDrugText
121+
int visitCount, Boolean prophylaxisPrescribed, Drug prescribedDrug, String prescribedDrugText
121122
) {
122123
//@formatter:on
123124

@@ -436,11 +437,11 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
436437
this.prophylaxisPrescribed = prophylaxisPrescribed;
437438
}
438439

439-
public PrescribedDrug getPrescribedDrug() {
440+
public Drug getPrescribedDrug() {
440441
return prescribedDrug;
441442
}
442443

443-
public void setPrescribedDrug(PrescribedDrug prescribedDrug) {
444+
public void setPrescribedDrug(Drug prescribedDrug) {
444445
this.prescribedDrug = prescribedDrug;
445446
}
446447

‎sormas-api/src/main/java/de/symeda/sormas/api/contact/PrescribedDrug.java‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2831,6 +2831,7 @@ public interface Captions {
28312831
String Symptoms_coughWithoutSputum = "Symptoms.coughWithoutSputum";
28322832
String Symptoms_coughWithSputum = "Symptoms.coughWithSputum";
28332833
String Symptoms_darkUrine = "Symptoms.darkUrine";
2834+
String Symptoms_dateOfOnsetKnown = "Symptoms.dateOfOnsetKnown";
28342835
String Symptoms_dehydration = "Symptoms.dehydration";
28352836
String Symptoms_delirium = "Symptoms.delirium";
28362837
String Symptoms_developmentalDelay = "Symptoms.developmentalDelay";

‎sormas-api/src/main/java/de/symeda/sormas/api/therapy/Drug.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,61 +20,77 @@
2020
import java.util.List;
2121
import java.util.stream.Collectors;
2222

23+
import de.symeda.sormas.api.Disease;
2324
import de.symeda.sormas.api.i18n.I18nProperties;
25+
import de.symeda.sormas.api.utils.Diseases;
2426
import de.symeda.sormas.api.utils.DrugTypes;
2527

2628
public enum Drug {
2729

2830
@DrugTypes(value = {
2931
TypeOfDrug.ANTIBIOTIC })
32+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
3033
AMIKACIN,
3134
@DrugTypes(value = {
3235
TypeOfDrug.ANTIBIOTIC })
36+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
3337
BEDAQUILINE,
3438
@DrugTypes(value = {
3539
TypeOfDrug.ANTIBIOTIC })
40+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
3641
CAPREOMYCIN,
3742
@DrugTypes(value = {
3843
TypeOfDrug.ANTIBIOTIC })
3944
CIPROFLOXACIN,
4045
@DrugTypes(value = {
4146
TypeOfDrug.ANTIBIOTIC })
47+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
4248
DELAMANID,
4349
@DrugTypes(value = {
4450
TypeOfDrug.ANTIBIOTIC })
51+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
4552
ETHAMBUTOL,
4653
@DrugTypes(value = {
4754
TypeOfDrug.ANTIBIOTIC })
55+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
4856
GATIFLOXACIN,
4957
@DrugTypes(value = {
5058
TypeOfDrug.ANTIBIOTIC })
59+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
5160
ISONIAZID,
5261
@DrugTypes(value = {
5362
TypeOfDrug.ANTIBIOTIC })
63+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
5464
KANAMYCIN,
5565
@DrugTypes(value = {
5666
TypeOfDrug.ANTIBIOTIC })
67+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
5768
LEVOFLOXACIN,
5869
@DrugTypes(value = {
5970
TypeOfDrug.ANTIBIOTIC })
71+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
6072
MOXIFLOXACIN,
6173
@DrugTypes(value = {
6274
TypeOfDrug.ANTIBIOTIC })
75+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
6376
OFLOXACIN,
6477
@DrugTypes(value = {
6578
TypeOfDrug.ANTIBIOTIC })
6679
RIFAMPICIN,
6780
@DrugTypes(value = {
6881
TypeOfDrug.ANTIBIOTIC })
82+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
6983
STREPTOMYCIN,
7084
@DrugTypes(value = {
7185
TypeOfDrug.ANTIBIOTIC })
7286
CEFTRIAXONE,
7387
@DrugTypes(value = {
7488
TypeOfDrug.ANTIBIOTIC })
89+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
7590
PENICILLIN,
7691
@DrugTypes(value = {
7792
TypeOfDrug.ANTIBIOTIC })
93+
@Diseases(value = {Disease.INVASIVE_MENINGOCOCCAL_INFECTION}, hide = true)
7894
ERYTHROMYCIN,
7995
@DrugTypes(value = {
8096
TypeOfDrug.ANTIBIOTIC })

‎sormas-api/src/main/resources/enum.properties‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,12 +1151,6 @@ PresentCondition.BURIED=Buried
11511151
PresentCondition.DEAD=Dead
11521152
PresentCondition.UNKNOWN=Unknown
11531153

1154-
# PrescribedDrug
1155-
PrescribedDrug.CIPROFLOXACIN = Ciprofloxacin
1156-
PrescribedDrug.RIFAMPICIN = Rifampicin
1157-
PrescribedDrug.CEFTRIAXONE = Ceftriaxone
1158-
PrescribedDrug.OTHER = Other
1159-
11601154
# QuarantineType
11611155
QuarantineType.HOME = Home
11621156
QuarantineType.INSTITUTIONELL = Institutional

0 commit comments

Comments
 (0)