Code refactoring

Author: KarnaiahPesula

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

@@ -152,8 +152,8 @@ public class ContactDto extends SormasToSormasShareableDto implements IsContact
 	public static final String DELETION_REASON = "deletionReason";
 	public static final String OTHER_DELETION_REASON = "otherDeletionReason";
 	public static final String PROPHYLAXIS_PRESCRIBED = "prophylaxisPrescribed";
-	public static final String DRUG = "prescribedDrug";
-	public static final String DRUG_TEXT = "prescribedDrugText";
+	public static final String PRESCRIBED_DRUG = "prescribedDrug";
+	public static final String PRESCRIBED_DRUG_TEXT = "prescribedDrugText";
 
 	@EmbeddedPersonalData
 	private CaseReferenceDto caze;

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

@@ -64,8 +64,8 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
 	public static final String DISTRICT_UUID = "districtUuid";
 	public static final String COMMUNITY_UUID = "communityUuid";
 	public static final String PROPHYLAXIS_PRESCRIBED = "prophylaxisPrescribed";
-	public static final String DRUG = "prescribedDrug";
-	public static final String DRUG_TEXT = "prescribedDrugText";
+	public static final String PRESCRIBED_DRUG = "prescribedDrug";
+	public static final String PRESCRIBED_DRUG_TEXT = "prescribedDrugText";
 
 	private String personUuid;
 	@PersonalData

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

@@ -170,8 +170,8 @@ public class Contact extends CoreAdo implements IsContact, SormasToSormasShareab
 	public static final String DUPLICATE_OF = "duplicateOf";
 	public static final String SELF_REPORT ="selfReport";
 	public static final String PROPHYLAXIS_PRESCRIBED ="prophylaxisPrescribed";
-	public static final String DRUG ="prescribedDrug";
-	public static final String DRUG_TEXT ="prescribedDrugText";
+	public static final String PRESCRIBED_DRUG ="prescribedDrug";
+	public static final String PRESCRIBED_DRUG_TEXT ="prescribedDrugText";
 
 	private Date reportDateTime;
 	private User reportingUser;

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactListCriteriaBuilder.java

@@ -193,8 +193,8 @@ private List<Expression<?>> getIndexOrders(SortProperty sortProperty, Root<Conta
 		case ContactIndexDto.CASE_CLASSIFICATION:
 		case ContactIndexDto.VACCINATION_STATUS:
 		case ContactIndexDto.PROPHYLAXIS_PRESCRIBED:
-		case ContactIndexDto.DRUG:
-		case ContactIndexDto.DRUG_TEXT:
+		case ContactIndexDto.PRESCRIBED_DRUG:
+		case ContactIndexDto.PRESCRIBED_DRUG_TEXT:
 			expressions.add(contact.get(sortProperty.propertyName));
 			break;
 		case ContactIndexDto.EXTERNAL_ID:
@@ -326,8 +326,8 @@ private <T> CriteriaQuery<T> buildIndexCriteria(
 			selections.addAll(selectionProvider.apply(contact, contactQueryContext));
 			selections.add(cb.size(contact.get(Contact.VISITS)));
 			selections.add(contact.get(Contact.PROPHYLAXIS_PRESCRIBED));
-			selections.add(contact.get(Contact.DRUG));
-			selections.add(contact.get(Contact.DRUG_TEXT));
+			selections.add(contact.get(Contact.PRESCRIBED_DRUG));
+			selections.add(contact.get(Contact.PRESCRIBED_DRUG_TEXT));
 			// This is needed in selection because of the combination of distinct and orderBy clauses - every operator in the orderBy has to be part of the select IF distinct is used
 		}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/AbstractContactGrid.java

@@ -219,7 +219,7 @@ protected Stream<String> getColumnList() {
 					ContactIndexDto.FOLLOW_UP_UNTIL,
 					ContactIndexDto.SYMPTOM_JOURNAL_STATUS,
 					ContactIndexDto.VACCINATION_STATUS,
-					NUMBER_OF_VISITS, ContactIndexDto.PROPHYLAXIS_PRESCRIBED, ContactIndexDto.DRUG),
+					NUMBER_OF_VISITS, ContactIndexDto.PROPHYLAXIS_PRESCRIBED, ContactIndexDto.PRESCRIBED_DRUG),
 				Stream.of(NUMBER_OF_PENDING_TASKS).filter(column -> UiUtil.permitted(FeatureType.TASK_MANAGEMENT, UserRight.TASK_VIEW)),
 				Stream.of(COLUMN_COMPLETENESS),
 				Stream.of(DELETE_REASON_COLUMN))

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java

@@ -141,7 +141,7 @@ public class ContactDataForm extends AbstractEditForm<ContactDto> {
                     fluidRowLocs(ContactDto.RELATION_DESCRIPTION) +
 					fluidRowLocs(ContactDto.DESCRIPTION) +
 					loc(PROPHYLAXIS_LOC)+
-					fluidRowLocs(4,ContactDto.PROPHYLAXIS_PRESCRIBED, 4, ContactDto.DRUG, 4, ContactDto.DRUG_TEXT) +
+					fluidRowLocs(4,ContactDto.PROPHYLAXIS_PRESCRIBED, 4, ContactDto.PRESCRIBED_DRUG, 4, ContactDto.PRESCRIBED_DRUG_TEXT) +
 					fluidRowLocs(6, ContactDto.PROHIBITION_TO_WORK, 3, ContactDto.PROHIBITION_TO_WORK_FROM, 3, ContactDto.PROHIBITION_TO_WORK_UNTIL) +
                     fluidRowLocs(4, ContactDto.QUARANTINE_HOME_POSSIBLE, 8, ContactDto.QUARANTINE_HOME_POSSIBLE_COMMENT) +
                     fluidRowLocs(4, ContactDto.QUARANTINE_HOME_SUPPLY_ENSURED, 8, ContactDto.QUARANTINE_HOME_SUPPLY_ENSURED_COMMENT) +
@@ -487,7 +487,7 @@ protected void addFields() {
 		contactOfficerField.setEnabled(true);
 		contactOfficerField.setParentPseudonymizedSupplier(() -> getValue().isPseudonymized());
 
-		addField(ContactDto.DRUG, ComboBox.class);
+		addField(ContactDto.PRESCRIBED_DRUG, ComboBox.class);
 		region = addInfrastructureField(ContactDto.REGION);
 		region.setDescription(I18nProperties.getPrefixDescription(ContactDto.I18N_PREFIX, ContactDto.REGION));
 		district = addInfrastructureField(ContactDto.DISTRICT);
@@ -716,24 +716,24 @@ public String getFormattedHtmlMessage() {
 		CheckBox prophylaxisPrescribed = addField(ContactDto.PROPHYLAXIS_PRESCRIBED, CheckBox.class);
 		prophylaxisPrescribed.setCaption(I18nProperties.getCaption(Captions.Contact_prophylaxisPrescribed));
 
-		addField(ContactDto.DRUG_TEXT, TextField.class);
+		addField(ContactDto.PRESCRIBED_DRUG_TEXT, TextField.class);
 		FieldHelper.setVisibleWhen(
 			getFieldGroup(),
-			ContactDto.DRUG,
+			ContactDto.PRESCRIBED_DRUG,
 			ContactDto.PROPHYLAXIS_PRESCRIBED,
 			Collections.singletonList(Boolean.TRUE),
 			true);
-		FieldHelper.setRequiredWhenNotNull(getFieldGroup(), ContactDto.PROPHYLAXIS_PRESCRIBED, ContactDto.DRUG);
+		FieldHelper.setRequiredWhenNotNull(getFieldGroup(), ContactDto.PROPHYLAXIS_PRESCRIBED, ContactDto.PRESCRIBED_DRUG);
 		FieldHelper.setVisibleWhen(
 			getFieldGroup(),
-			ContactDto.DRUG_TEXT,
-			ContactDto.DRUG,
+			ContactDto.PRESCRIBED_DRUG_TEXT,
+			ContactDto.PRESCRIBED_DRUG,
 			Collections.singletonList(Drug.OTHER),
 			true);
 		FieldHelper.setRequiredWhen(
 			getFieldGroup(),
-			ContactDto.DRUG,
-			Arrays.asList(ContactDto.DRUG_TEXT),
+			ContactDto.PRESCRIBED_DRUG,
+			Arrays.asList(ContactDto.PRESCRIBED_DRUG_TEXT),
 			Arrays.asList(Drug.OTHER));
 	}