Skip to content

Commit d647594

Browse files
obinna-h-nobinna-h-n
authored
Merge pull request #13586 from SORMAS-Foundation/pre-release-testing-issue-fixes
pre-release issue fixes
2 parents 076b7c8 + 0a1e5a5 commit d647594

15 files changed

Lines changed: 61 additions & 28 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public enum Disease
3535
LASSA(true, true, true, false, true, 21, true, false, false),
3636
MEASLES(true, true, true, false, true, 21, true, true, false),
3737
MONKEYPOX(true, true, true, false, true, 21, true, false, false),
38-
NEW_INFLUENZA(true, true, true, false, true, 17, true, false, false),
38+
NEW_INFLUENZA(false, true, true, false, true, 17, true, false, false),
3939
PLAGUE(true, true, true, false, true, 7, true, false, false),
4040
POLIO(true, true, true, false, false, 0, true, false, false),
4141
UNSPECIFIED_VHF(true, true, true, false, true, 21, true, false, false),
@@ -62,15 +62,15 @@ public enum Disease
6262
LEPROSY(true, false, false, true, false, 0, true, false, false),
6363
LYMPHATIC_FILARIASIS(true, false, false, true, false, 0, true, false, false),
6464
BURULI_ULCER(true, false, false, true, false, 0, true, false, false),
65-
PERTUSSIS(true, false, false, true, false, 0, true, false, false),
65+
PERTUSSIS(true, false, false, true, true, 0, true, false, false),
6666
NEONATAL_TETANUS(true, false, false, true, false, 0, true, false, false),
6767
ONCHOCERCIASIS(true, false, false, true, false, 0, true, false, false),
6868
DIPHTERIA(true, false, false, true, false, 0, true, false, false),
6969
TRACHOMA(true, false, false, true, false, 0, true, false, false),
7070
YAWS_ENDEMIC_SYPHILIS(true, false, false, true, false, 0, true, false, false),
7171
MATERNAL_DEATHS(true, false, false, true, false, 0, true, false, false),
7272
PERINATAL_DEATHS(true, false, false, true, false, 0, true, false, false),
73-
INFLUENZA(true, true, true, false, false, 0, true, false, false),
73+
INFLUENZA(false, true, true, false, false, 0, true, false, false),
7474
INFLUENZA_A(false, false, true, false, false, 0, true, false, false),
7575
INFLUENZA_B(false, false, true, false, false, 0, true, false, false),
7676
H_METAPNEUMOVIRUS(true, false, true, false, false, 0, true, false, false),

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import de.symeda.sormas.api.Disease;
66
import de.symeda.sormas.api.common.DeletionReason;
77
import de.symeda.sormas.api.contact.FollowUpStatus;
8-
import de.symeda.sormas.api.disease.DiseaseVariant;
98
import de.symeda.sormas.api.event.EventStatus;
109
import de.symeda.sormas.api.person.ApproximateAgeType;
1110
import de.symeda.sormas.api.person.PresentCondition;
@@ -74,7 +73,7 @@ public class CaseIndexDetailedDto extends CaseIndexDto {
7473
private UserReferenceDto reportingUser;
7574

7675
//@formatter:off
77-
public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken,String caseReferenceNumber, String personUuid, String personFirstName, String personLastName,
76+
public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken,String caseReferenceNumber, String personUuid, String nationalHealthId, String personFirstName, String personLastName,
7877
Disease disease, String diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
7978
PresentCondition presentCondition, Date reportDate, Date creationDate,
8079
String regionUuid, String districtUuid,
@@ -88,7 +87,7 @@ public CaseIndexDetailedDto(long id, String uuid, String epidNumber, String exte
8887
String reportingUserUuid, String reportingUserFirstName, String reportingUserLastName, Date symptomOnsetDate,
8988
String responsibleRegion, String responsibleCommunity,
9089
int visitCount, long eventCount, Date latestSampleDateTime, long sampleCount) {
91-
super(id, uuid, epidNumber, externalID, externalToken, internalToken, caseReferenceNumber, personUuid, personFirstName, personLastName,
90+
super(id, uuid, epidNumber, externalID, externalToken, internalToken, caseReferenceNumber, personUuid, nationalHealthId, personFirstName, personLastName,
9291
disease, diseaseVariant, diseaseDetails, caseClassification, investigationStatus,
9392
presentCondition, reportDate, creationDate,
9493
regionUuid, districtUuid, healthFacilityUuid,

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class CaseIndexDto extends PseudonymizableIndexDto implements MergeableIn
5353
public static final String INTERNAL_TOKEN = "internalToken";
5454
public static final String CASE_REFERENCE_NUMBER = "caseReferenceNumber";
5555
public static final String PERSON_UUID = "personUuid";
56+
public static final String PERSON_NATIONAL_HEALTH_ID = "nationalHealthId";
5657
public static final String PERSON_FIRST_NAME = "personFirstName";
5758
public static final String PERSON_LAST_NAME = "personLastName";
5859
public static final String DISEASE = "disease";
@@ -91,6 +92,7 @@ public class CaseIndexDto extends PseudonymizableIndexDto implements MergeableIn
9192
private String internalToken;
9293
private String caseReferenceNumber;
9394
private String personUuid;
95+
private String nationalHealthId;
9496
@PersonalData
9597
@SensitiveData
9698
private String personFirstName;
@@ -141,7 +143,7 @@ public class CaseIndexDto extends PseudonymizableIndexDto implements MergeableIn
141143
private Boolean isInJurisdiction;
142144

143145
//@formatter:off
144-
public CaseIndexDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String caseReferenceNumber, String personUuid, String personFirstName, String personLastName, Disease disease,
146+
public CaseIndexDto(long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String caseReferenceNumber, String personUuid, String nationalHealthId, String personFirstName, String personLastName, Disease disease,
145147
String diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
146148
PresentCondition presentCondition, Date reportDate, Date creationDate, String regionUuid,
147149
String districtUuid, String healthFacilityUuid, String healthFacilityName, String healthFacilityDetails,
@@ -164,6 +166,7 @@ public CaseIndexDto(long id, String uuid, String epidNumber, String externalID,
164166
this.internalToken = internalToken;
165167
this.caseReferenceNumber = caseReferenceNumber;
166168
this.personUuid = personUuid;
169+
this.nationalHealthId = nationalHealthId;
167170
this.personFirstName = personFirstName;
168171
this.personLastName = personLastName;
169172
this.disease = disease;
@@ -225,6 +228,14 @@ public void setPersonUuid(String personUuid) {
225228
this.personUuid = personUuid;
226229
}
227230

231+
public String getNationalHealthId() {
232+
return nationalHealthId;
233+
}
234+
235+
public void setNationalHealthId(String nationalHealthId) {
236+
this.nationalHealthId = nationalHealthId;
237+
}
238+
228239
public String getPersonFirstName() {
229240
return personFirstName;
230241
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import de.symeda.sormas.api.Disease;
66
import de.symeda.sormas.api.common.DeletionReason;
77
import de.symeda.sormas.api.contact.FollowUpStatus;
8-
import de.symeda.sormas.api.disease.DiseaseVariant;
98
import de.symeda.sormas.api.person.ApproximateAgeType;
109
import de.symeda.sormas.api.person.PresentCondition;
1110
import de.symeda.sormas.api.person.Sex;
@@ -20,7 +19,7 @@ public class CaseMergeIndexDto extends CaseIndexDto {
2019

2120
//@formatter:off
2221
public CaseMergeIndexDto(
23-
long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String caseReferenceNumber, String personUuid, String personFirstName, String personLastName, Disease disease,
22+
long id, String uuid, String epidNumber, String externalID, String externalToken, String internalToken, String caseReferenceNumber, String personUuid, String nationalHealthId, String personFirstName, String personLastName, Disease disease,
2423
String diseaseVariant, String diseaseDetails, CaseClassification caseClassification, InvestigationStatus investigationStatus,
2524
PresentCondition presentCondition, Date reportDate, Date creationDate, String regionUuid,
2625
String districtUuid, String healthFacilityUuid, String healthFacilityName, String healthFacilityDetails,
@@ -39,6 +38,7 @@ public CaseMergeIndexDto(
3938
internalToken,
4039
caseReferenceNumber,
4140
personUuid,
41+
nationalHealthId,
4242
personFirstName,
4343
personLastName,
4444
disease,

‎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
@@ -61,7 +61,7 @@ public class ContactIndexDetailedDto extends ContactIndexDto {
6161
private ContactRelation relationToCase;
6262

6363
//@formatter:off
64-
public ContactIndexDetailedDto(String uuid, String personUuid, String personFirstName, String personLastName,
64+
public ContactIndexDetailedDto(String uuid, String personUuid, String nationalHealthId, String personFirstName, String personLastName,
6565
String cazeUuid,
6666
Disease disease, String diseaseDetails, String caseFirstName, String caseLastName, String regionName,
6767
String districtName, Date lastContactDate, ContactCategory contactCategory,
@@ -80,7 +80,7 @@ public ContactIndexDetailedDto(String uuid, String personUuid, String personFirs
8080
//@formatter:on
8181

8282
//@formatter:off
83-
super(uuid, personUuid, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName,
83+
super(uuid, personUuid, nationalHealthId, personFirstName, personLastName, cazeUuid, disease, diseaseDetails, caseFirstName, caseLastName,
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,

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
4040
public static final String UUID = "uuid";
4141
public static final String REPORT_DATE_TIME = "reportDateTime";
4242
public static final String PERSON_UUID = "personUuid";
43+
public static final String PERSON_NATIONAL_HEALTH_ID = "nationalHealthId";
4344
public static final String PERSON_FIRST_NAME = "firstName";
4445
public static final String PERSON_LAST_NAME = "lastName";
4546
public static final String CAZE = "caze";
@@ -68,6 +69,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
6869
public static final String PRESCRIBED_DRUG_TEXT = "prescribedDrugText";
6970

7071
private String personUuid;
72+
private String nationalHealthId;
7173
@PersonalData
7274
private String firstName;
7375
@PersonalData
@@ -109,7 +111,7 @@ public class ContactIndexDto extends PseudonymizableIndexDto implements IsContac
109111
private ContactJurisdictionFlagsDto contactJurisdictionFlagsDto;
110112

111113
//@formatter:off
112-
public ContactIndexDto(String uuid, String personUuid, String personFirstName, String personLastName, String cazeUuid,
114+
public ContactIndexDto(String uuid, String personUuid, String nationalHealthId, String personFirstName, String personLastName, String cazeUuid,
113115
Disease disease, String diseaseDetails, String caseFirstName, String caseLastName, String regionName,
114116
String districtName, Date lastContactDate, ContactCategory contactCategory,
115117
ContactProximity contactProximity, ContactClassification contactClassification, ContactStatus contactStatus, Float completeness,
@@ -124,6 +126,7 @@ public ContactIndexDto(String uuid, String personUuid, String personFirstName, S
124126

125127
super(uuid);
126128
this.personUuid = personUuid;
129+
this.nationalHealthId = nationalHealthId;
127130
this.firstName = personFirstName;
128131
this.lastName = personLastName;
129132

@@ -173,6 +176,14 @@ public void setPersonUuid(String personUuid) {
173176
this.personUuid = personUuid;
174177
}
175178

179+
public String getNationalHealthId() {
180+
return nationalHealthId;
181+
}
182+
183+
public void setNationalHealthId(String nationalHealthId) {
184+
this.nationalHealthId = nationalHealthId;
185+
}
186+
176187
public String getFirstName() {
177188
return firstName;
178189
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseIndexDetailedDtoResultTransformer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import de.symeda.sormas.api.caze.VaccinationStatus;
2929
import de.symeda.sormas.api.common.DeletionReason;
3030
import de.symeda.sormas.api.contact.FollowUpStatus;
31-
import de.symeda.sormas.api.disease.DiseaseVariant;
3231
import de.symeda.sormas.api.person.ApproximateAgeType;
3332
import de.symeda.sormas.api.person.PresentCondition;
3433
import de.symeda.sormas.api.person.Sex;
@@ -44,7 +43,7 @@ public CaseIndexDetailedDto transformTuple(Object[] tuple, String[] aliases) {
4443
int index = -1;
4544

4645
//@formatter:off
47-
return new CaseIndexDetailedDto((Long)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (Disease)tuple[++index],
46+
return new CaseIndexDetailedDto((Long)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (Disease)tuple[++index],
4847
(String) tuple[++index], (String)tuple[++index], (CaseClassification)tuple[++index], (InvestigationStatus)tuple[++index],
4948
(PresentCondition)tuple[++index], (Date)tuple[++index], (Date)tuple[++index], (String)tuple[++index],
5049
(String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index],

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseIndexDtoResultTransformer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import de.symeda.sormas.api.caze.VaccinationStatus;
2929
import de.symeda.sormas.api.common.DeletionReason;
3030
import de.symeda.sormas.api.contact.FollowUpStatus;
31-
import de.symeda.sormas.api.disease.DiseaseVariant;
3231
import de.symeda.sormas.api.person.ApproximateAgeType;
3332
import de.symeda.sormas.api.person.PresentCondition;
3433
import de.symeda.sormas.api.person.Sex;
@@ -43,7 +42,7 @@ public CaseIndexDto transformTuple(Object[] tuple, String[] aliases) {
4342
int index = -1;
4443

4544
//@formatter:off
46-
return new CaseIndexDto((Long)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (Disease)tuple[++index],
45+
return new CaseIndexDto((Long)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (Disease)tuple[++index],
4746
(String) tuple[++index], (String)tuple[++index], (CaseClassification)tuple[++index], (InvestigationStatus)tuple[++index],
4847
(PresentCondition)tuple[++index], (Date)tuple[++index], (Date)tuple[++index], (String)tuple[++index],
4948
(String)tuple[++index], (String)tuple[++index], (String)tuple[++index], (String)tuple[++index],

‎sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseListCriteriaBuilder.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ public List<Selection<?>> getCaseIndexSelections(From<?, Case> root, CaseQueryCo
216216
root.get(Case.INTERNAL_TOKEN),
217217
root.get(Case.CASE_REFERENCE_NUMBER),
218218
joins.getPerson().get(Person.UUID),
219+
joins.getPerson().get(Person.NATIONAL_HEALTH_ID),
219220
joins.getPerson().get(Person.FIRST_NAME),
220221
joins.getPerson().get(Person.LAST_NAME),
221222
root.get(Case.DISEASE),
@@ -286,6 +287,8 @@ private List<Expression<?>> getIndexOrders(SortProperty sortProperty, Root<Case>
286287
case CaseIndexDto.CASE_REFERENCE_NUMBER:
287288
case CaseIndexDto.DISEASE_DETAILS:
288289
return Collections.singletonList(cb.lower(caze.get(sortProperty.propertyName)));
290+
case CaseIndexDto.PERSON_NATIONAL_HEALTH_ID:
291+
return Collections.singletonList(cb.lower(joins.getPerson().get(Person.NATIONAL_HEALTH_ID)));
289292
case CaseIndexDto.PERSON_FIRST_NAME:
290293
return Collections.singletonList(cb.lower(joins.getPerson().get(Person.FIRST_NAME)));
291294
case CaseIndexDto.PERSON_LAST_NAME:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.Date;
1919
import java.util.List;
2020

21-
import de.symeda.sormas.api.therapy.Drug;
2221
import org.hibernate.transform.ResultTransformer;
2322

2423
import de.symeda.sormas.api.Disease;
@@ -35,6 +34,7 @@
3534
import de.symeda.sormas.api.person.ApproximateAgeType;
3635
import de.symeda.sormas.api.person.Sex;
3736
import de.symeda.sormas.api.person.SymptomJournalStatus;
37+
import de.symeda.sormas.api.therapy.Drug;
3838

3939
public class ContactIndexDetailedDtoResultTransformer implements ResultTransformer {
4040

@@ -46,7 +46,7 @@ public ContactIndexDetailedDto transformTuple(Object[] tuple, String[] aliases)
4646

4747
//@formatter:off
4848
return new ContactIndexDetailedDto(
49-
(String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index],
49+
(String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index],
5050
(Disease) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index], (String) tuple[++index],
5151
(String) tuple[++index], (Date) tuple[++index], (ContactCategory) tuple[++index],
5252
(ContactProximity) tuple[++index], (ContactClassification) tuple[++index], (ContactStatus) tuple[++index], (Float) tuple[++index],

0 commit comments

Comments
 (0)