Skip to content

Commit d9074fa

Browse files
KarnaiahPesulaKarnaiahPesula
committed
Code refactoring
1 parent 7a2498f commit d9074fa

File tree

8 files changed

+56
-61
lines changed

8 files changed

+56
-61
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public class ContactCriteria extends BaseCriteria implements Serializable {
154154
private String caseReferenceNumber;
155155
private Boolean withCase;
156156
private Boolean prophylaxisPrescribed;
157-
private Drug drug;
158-
private String drugText;
157+
private Drug prescribedDrug;
158+
private String prescribedDrugText;
159159

160160
public UserRoleReferenceDto getReportingUserRole() {
161161
return reportingUserRole;
@@ -815,19 +815,19 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
815815
this.prophylaxisPrescribed = prophylaxisPrescribed;
816816
}
817817

818-
public String getDrugText() {
819-
return drugText;
818+
public String getPrescribedDrugText() {
819+
return prescribedDrugText;
820820
}
821821

822-
public void setDrugText(String drugText) {
823-
this.drugText = drugText;
822+
public void setPrescribedDrugText(String prescribedDrugText) {
823+
this.prescribedDrugText = prescribedDrugText;
824824
}
825825

826-
public Drug getDrug() {
827-
return drug;
826+
public Drug getPrescribedDrug() {
827+
return prescribedDrug;
828828
}
829829

830-
public void setDrug(Drug drug) {
831-
this.drug = drug;
830+
public void setPrescribedDrug(Drug prescribedDrug) {
831+
this.prescribedDrug = prescribedDrug;
832832
}
833833
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
152152
public static final String DELETION_REASON = "deletionReason";
153153
public static final String OTHER_DELETION_REASON = "otherDeletionReason";
154154
public static final String PROPHYLAXIS_PRESCRIBED = "prophylaxisPrescribed";
155-
public static final String DRUG = "drug";
156-
public static final String DRUG_TEXT = "drugText";
155+
public static final String DRUG = "prescribedDrug";
156+
public static final String DRUG_TEXT = "prescribedDrugText";
157157

158158
@EmbeddedPersonalData
159159
private CaseReferenceDto caze;
@@ -380,11 +380,11 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
380380
@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
381381
@SensitiveData
382382
@Diseases(Disease.INVASIVE_MENINGOCOCCAL_INFECTION)
383-
private Drug drug;
383+
private Drug prescribedDrug;
384384
@HideForCountriesExcept(countries = {COUNTRY_CODE_LUXEMBOURG})
385385
@SensitiveData
386386
@Diseases(Disease.INVASIVE_MENINGOCOCCAL_INFECTION)
387-
private String drugText;
387+
private String prescribedDrugText;
388388

389389
public static ContactDto build() {
390390
final ContactDto contact = new ContactDto();
@@ -1093,20 +1093,20 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
10931093
this.prophylaxisPrescribed = prophylaxisPrescribed;
10941094
}
10951095

1096-
public Drug getDrug() {
1097-
return drug;
1096+
public Drug getPrescribedDrug() {
1097+
return prescribedDrug;
10981098
}
10991099

1100-
public void setDrug(Drug drug) {
1101-
this.drug = drug;
1100+
public void setPrescribedDrug(Drug prescribedDrug) {
1101+
this.prescribedDrug = prescribedDrug;
11021102
}
11031103

1104-
public String getDrugText() {
1105-
return drugText;
1104+
public String getPrescribedDrugText() {
1105+
return prescribedDrugText;
11061106
}
11071107

1108-
public void setDrugText(String drugText) {
1109-
this.drugText = drugText;
1108+
public void setPrescribedDrugText(String prescribedDrugText) {
1109+
this.prescribedDrugText = prescribedDrugText;
11101110
}
11111111

11121112
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public ContactIndexDetailedDto(String uuid, String personUuid, String personFirs
7575
Sex sex, Integer approximateAge, ApproximateAgeType approximateAgeType,
7676
String city, String street, String houseNumber, String additionalInformation, String postalCode, String phone,
7777
String reportingUserFirstName, String reportingUserLastName, ContactRelation relationToCase, int visitCount,
78-
Boolean prophylaxisPrescribed, Drug drug, String drugText
78+
Boolean prophylaxisPrescribed, Drug prescribedDrug, String prescribedDrugText
7979
) {
8080
//@formatter:on
8181

@@ -84,7 +84,7 @@ public ContactIndexDetailedDto(String uuid, String personUuid, String personFirs
8484
regionName, districtName, lastContactDate, contactCategory, contactProximity, contactClassification, contactStatus,
8585
completeness, followUpStatus, followUpUntil, symptomJournalStatus, vaccinationStatus, contactOfficerUuid, reportingUserUuid, reportDateTime, caseClassification,
8686
caseRegionName, caseDistrictName, changeDate, externalID, externalToken, internalToken, caseReferenceNumber, deletionReason, otherDeleteReason,isInJurisdiction, isCaseInJurisdiction , visitCount,
87-
prophylaxisPrescribed, drug, drugText);
87+
prophylaxisPrescribed, prescribedDrug, prescribedDrugText);
8888

8989
//@formatter:on
9090

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
6464
public static final String DISTRICT_UUID = "districtUuid";
6565
public static final String COMMUNITY_UUID = "communityUuid";
6666
public static final String PROPHYLAXIS_PRESCRIBED = "prophylaxisPrescribed";
67-
public static final String DRUG = "drug";
68-
public static final String DRUG_TEXT = "drugText";
67+
public static final String DRUG = "prescribedDrug";
68+
public static final String DRUG_TEXT = "prescribedDrugText";
6969

7070
private String personUuid;
7171
@PersonalData
@@ -103,8 +103,8 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
103103
private DeletionReason deletionReason;
104104
private String otherDeletionReason;
105105
private Boolean prophylaxisPrescribed;
106-
private Drug drug;
107-
private String drugText;
106+
private Drug prescribedDrug;
107+
private String prescribedDrugText;
108108

109109
private ContactJurisdictionFlagsDto contactJurisdictionFlagsDto;
110110

@@ -118,7 +118,7 @@ public ContactIndexDto(String uuid, String personUuid, String personFirstName, S
118118
CaseClassification caseClassification, String caseRegionName, String caseDistrictName,
119119
Date changeDate, // XXX: unused, only here for TypedQuery mapping
120120
String externalID, String externalToken, String internalToken,String caseReferenceNumber, DeletionReason deletionReason, String otherDeletionReason, boolean isInJurisdiction, boolean isCaseInJurisdiction,
121-
int visitCount, Boolean prophylaxisPrescribed, Drug drug, String drugText
121+
int visitCount, Boolean prophylaxisPrescribed, Drug prescribedDrug, String prescribedDrugText
122122
) {
123123
//@formatter:on
124124

@@ -161,8 +161,8 @@ public ContactIndexDto(String uuid, String personUuid, String personFirstName, S
161161

162162
this.contactJurisdictionFlagsDto = new ContactJurisdictionFlagsDto(isInJurisdiction, isCaseInJurisdiction);
163163
this.prophylaxisPrescribed = prophylaxisPrescribed;
164-
this.drug = drug;
165-
this.drugText = drugText;
164+
this.prescribedDrug = prescribedDrug;
165+
this.prescribedDrugText = prescribedDrugText;
166166
}
167167

168168
public String getPersonUuid() {
@@ -437,20 +437,20 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
437437
this.prophylaxisPrescribed = prophylaxisPrescribed;
438438
}
439439

440-
public Drug getDrug() {
441-
return drug;
440+
public Drug getPrescribedDrug() {
441+
return prescribedDrug;
442442
}
443443

444-
public void setDrug(Drug drug) {
445-
this.drug = drug;
444+
public void setPrescribedDrug(Drug prescribedDrug) {
445+
this.prescribedDrug = prescribedDrug;
446446
}
447447

448-
public String getDrugText() {
449-
return drugText;
448+
public String getPrescribedDrugText() {
449+
return prescribedDrugText;
450450
}
451451

452-
public void setDrugText(String drugText) {
453-
this.drugText = drugText;
452+
public void setPrescribedDrugText(String prescribedDrugText) {
453+
this.prescribedDrugText = prescribedDrugText;
454454
}
455455

456456
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ Contact.changeDate=Date of last change
853853
Contact.creationDate=Creation date
854854
Contact.prophylaxisPrescribed = Prophylaxis Prescribed
855855
Contact.prescribedDrug = Prescribed Drug
856-
Contact.DrugText.IMI = Specify Drug
856+
Contact.prescribedDrugText = Specify Prescribed Drug
857857
# ContactExport
858858
ContactExport.address=Address
859859
ContactExport.addressDistrict=Address District

‎sormas-backend/src/main/java/de/symeda/sormas/backend/contact/Contact.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public class Contact extends CoreAdo implements IsContact, SormasToSormasShareab
170170
public static final String DUPLICATE_OF = "duplicateOf";
171171
public static final String SELF_REPORT ="selfReport";
172172
public static final String PROPHYLAXIS_PRESCRIBED ="prophylaxisPrescribed";
173-
public static final String DRUG ="drug";
174-
public static final String DRUG_TEXT ="drugText";
173+
public static final String DRUG ="prescribedDrug";
174+
public static final String DRUG_TEXT ="prescribedDrugText";
175175

176176
private Date reportDateTime;
177177
private User reportingUser;
@@ -274,8 +274,8 @@ public class Contact extends CoreAdo implements IsContact, SormasToSormasShareab
274274

275275
private List<SelfReport> selfReport;
276276

277-
private Drug drug;
278-
private String drugText;
277+
private Drug prescribedDrug;
278+
private String prescribedDrugText;
279279
private Boolean prophylaxisPrescribed;
280280

281281
@Diseases({
@@ -1120,19 +1120,19 @@ public void setProphylaxisPrescribed(Boolean prophylaxisPrescribed) {
11201120
this.prophylaxisPrescribed = prophylaxisPrescribed;
11211121
}
11221122

1123-
public Drug getDrug() {
1124-
return drug;
1123+
public Drug getPrescribedDrug() {
1124+
return prescribedDrug;
11251125
}
11261126

1127-
public void setDrug(Drug drug) {
1128-
this.drug = drug;
1127+
public void setPrescribedDrug(Drug prescribedDrug) {
1128+
this.prescribedDrug = prescribedDrug;
11291129
}
11301130

1131-
public String getDrugText() {
1132-
return drugText;
1131+
public String getPrescribedDrugText() {
1132+
return prescribedDrugText;
11331133
}
11341134

1135-
public void setDrugText(String drugText) {
1136-
this.drugText = drugText;
1135+
public void setPrescribedDrugText(String prescribedDrugText) {
1136+
this.prescribedDrugText = prescribedDrugText;
11371137
}
11381138
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1627,8 +1627,8 @@ public Contact fillOrBuildEntity(@NotNull ContactDto source, Contact target, boo
16271627
target.setDeletionReason(source.getDeletionReason());
16281628
target.setOtherDeletionReason(source.getOtherDeletionReason());
16291629
target.setProphylaxisPrescribed(source.getProphylaxisPrescribed());
1630-
target.setDrug(source.getDrug());
1631-
target.setDrugText(source.getDrugText());
1630+
target.setPrescribedDrug(source.getPrescribedDrug());
1631+
target.setPrescribedDrugText(source.getPrescribedDrugText());
16321632

16331633
return target;
16341634
}
@@ -1975,8 +1975,8 @@ public static ContactDto toContactDto(Contact source) {
19751975
target.setOtherDeletionReason(source.getOtherDeletionReason());
19761976

19771977
target.setProphylaxisPrescribed(source.getProphylaxisPrescribed());
1978-
target.setDrug(source.getDrug());
1979-
target.setDrugText(source.getDrugText());
1978+
target.setPrescribedDrug(source.getPrescribedDrug());
1979+
target.setPrescribedDrugText(source.getPrescribedDrugText());
19801980
return target;
19811981
}
19821982

‎sormas-backend/src/main/resources/sql/sormas_schema.sql

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14404,9 +14404,4 @@ alter table symptoms add column IF NOT EXISTS nocturnalcough varchar(255);
1440414404

1440514405
INSERT INTO schema_version (version_number, comment) VALUES (577, 'Pertussis missed symptom, #13373');
1440614406

14407-
-- 2025-06-23 Code refactoring to use Drug enum, #13480
14408-
alter table contact RENAME prescribedDrug to drug;
14409-
alter table contact RENAME prescribedDrugText to drugText ;
14410-
14411-
INSERT INTO schema_version (version_number, comment) VALUES (578, 'Code refactoring to use Drug enum, #13480');
1441214407
-- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***

0 commit comments

Comments
 (0)