Skip to content

Commit 50c918d

Browse files
Pa-TouchePa-Touche
committed
Fixing DEMO-comments
1 parent a87522b commit 50c918d

4 files changed

Lines changed: 21 additions & 80 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/hospitalization/HospitalizationDto.java‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@
2929
import de.symeda.sormas.api.ImportIgnore;
3030
import de.symeda.sormas.api.feature.FeatureType;
3131
import de.symeda.sormas.api.i18n.Validations;
32-
import de.symeda.sormas.api.utils.DataHelper;
33-
import de.symeda.sormas.api.utils.DependingOnFeatureType;
34-
import de.symeda.sormas.api.utils.Diseases;
35-
import de.symeda.sormas.api.utils.FieldConstraints;
36-
import de.symeda.sormas.api.utils.Outbreaks;
37-
import de.symeda.sormas.api.utils.YesNoUnknown;
32+
import de.symeda.sormas.api.utils.*;
3833

3934
@DependingOnFeatureType(featureType = FeatureType.CASE_SURVEILANCE)
4035
public class HospitalizationDto extends EntityDto {
@@ -119,8 +114,6 @@ public class HospitalizationDto extends EntityDto {
119114
Disease.CRYPTOSPORIDIOSIS })
120115
private Integer durationOfHospitalization;
121116

122-
private YesNoUnknown oxygenTherapy;
123-
124117
public static HospitalizationDto build() {
125118
HospitalizationDto hospitalization = new HospitalizationDto();
126119
hospitalization.setUuid(DataHelper.createUuid());
@@ -280,12 +273,4 @@ public Integer getDurationOfHospitalization() {
280273
public void setDurationOfHospitalization(Integer durationOfHospitalization) {
281274
this.durationOfHospitalization = durationOfHospitalization;
282275
}
283-
284-
public YesNoUnknown getOxygenTherapy() {
285-
return oxygenTherapy;
286-
}
287-
288-
public void setOxygenTherapy(YesNoUnknown oxygenTherapy) {
289-
this.oxygenTherapy = oxygenTherapy;
290-
}
291276
}

‎sormas-api/src/main/java/de/symeda/sormas/api/person/BirthWeightCategory.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
*/
2424
public enum BirthWeightCategory {
2525

26-
/**
27-
* Normal birth weight
28-
*/
29-
NORMAL,
26+
/**
27+
* Normal birth weight
28+
*/
29+
NORMAL,
3030

31-
/**
32-
* Low birth weight (stunted growth)
33-
*/
34-
LOW_BIRTH_WEIGHT;
31+
/**
32+
* Low birth weight (stunted growth)
33+
*/
34+
LOW_BIRTH_WEIGHT;
3535

36-
@Override
37-
public String toString() {
38-
return I18nProperties.getEnumCaption(this);
39-
}
36+
@Override
37+
public String toString() {
38+
return I18nProperties.getEnumCaption(this);
39+
}
4040
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageFacadeEjb.java‎

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717

1818
import static java.util.stream.Collectors.toList;
1919

20-
import java.util.ArrayList;
21-
import java.util.Collections;
22-
import java.util.Date;
23-
import java.util.List;
24-
import java.util.Objects;
25-
import java.util.Optional;
26-
import java.util.Set;
20+
import java.util.*;
2721
import java.util.concurrent.ExecutionException;
2822
import java.util.stream.Collectors;
2923
import java.util.stream.Stream;
@@ -39,15 +33,7 @@
3933
import javax.persistence.EntityManager;
4034
import javax.persistence.PersistenceContext;
4135
import javax.persistence.Tuple;
42-
import javax.persistence.criteria.CriteriaBuilder;
43-
import javax.persistence.criteria.CriteriaQuery;
44-
import javax.persistence.criteria.Expression;
45-
import javax.persistence.criteria.Join;
46-
import javax.persistence.criteria.JoinType;
47-
import javax.persistence.criteria.Order;
48-
import javax.persistence.criteria.Predicate;
49-
import javax.persistence.criteria.Root;
50-
import javax.persistence.criteria.Selection;
36+
import javax.persistence.criteria.*;
5137
import javax.validation.Valid;
5238
import javax.validation.constraints.NotNull;
5339

@@ -69,17 +55,7 @@
6955
import de.symeda.sormas.api.customizableenum.CustomEnumNotFoundException;
7056
import de.symeda.sormas.api.customizableenum.CustomizableEnumType;
7157
import de.symeda.sormas.api.event.EventParticipantReferenceDto;
72-
import de.symeda.sormas.api.externalmessage.ExternalMessageAdapterFacade;
73-
import de.symeda.sormas.api.externalmessage.ExternalMessageCriteria;
74-
import de.symeda.sormas.api.externalmessage.ExternalMessageDto;
75-
import de.symeda.sormas.api.externalmessage.ExternalMessageFacade;
76-
import de.symeda.sormas.api.externalmessage.ExternalMessageFetchResult;
77-
import de.symeda.sormas.api.externalmessage.ExternalMessageIndexDto;
78-
import de.symeda.sormas.api.externalmessage.ExternalMessageReferenceDto;
79-
import de.symeda.sormas.api.externalmessage.ExternalMessageResult;
80-
import de.symeda.sormas.api.externalmessage.ExternalMessageStatus;
81-
import de.symeda.sormas.api.externalmessage.ExternalMessageType;
82-
import de.symeda.sormas.api.externalmessage.NewMessagesState;
58+
import de.symeda.sormas.api.externalmessage.*;
8359
import de.symeda.sormas.api.externalmessage.labmessage.SampleReportDto;
8460
import de.symeda.sormas.api.externalmessage.processing.ExternalMessageProcessingResult;
8561
import de.symeda.sormas.api.externalmessage.survey.ExternalMessageSurveyResponseRequest;
@@ -92,6 +68,7 @@
9268
import de.symeda.sormas.api.i18n.I18nProperties;
9369
import de.symeda.sormas.api.i18n.Strings;
9470
import de.symeda.sormas.api.i18n.Validations;
71+
import de.symeda.sormas.api.patch.DataReplacementStrategy;
9572
import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse;
9673
import de.symeda.sormas.api.sample.PathogenTestResultType;
9774
import de.symeda.sormas.api.sample.SampleReferenceDto;
@@ -128,11 +105,7 @@
128105
import de.symeda.sormas.backend.systemevent.sync.SyncFacadeEjb;
129106
import de.symeda.sormas.backend.user.User;
130107
import de.symeda.sormas.backend.user.UserService;
131-
import de.symeda.sormas.backend.util.DtoHelper;
132-
import de.symeda.sormas.backend.util.IterableHelper;
133-
import de.symeda.sormas.backend.util.ModelConstants;
134-
import de.symeda.sormas.backend.util.QueryHelper;
135-
import de.symeda.sormas.backend.util.RightsAllowed;
108+
import de.symeda.sormas.backend.util.*;
136109

137110
@Stateless(name = "ExternalMessageFacade")
138111
@RightsAllowed({
@@ -978,11 +951,12 @@ public ExternalMessageDto reprocessSurveyResponse(String uuid, java.util.Map<Str
978951
ExternalMessageDto externalMessage = getByUuid(uuid);
979952
ExternalMessageSurveyResponseRequest latestRequest = externalMessage.getSurveyResponseData().getLatest().getRequest();
980953

954+
logger.info("On reprocessing replacement strategy is set to ALWAYS to allow override values");
981955
ExternalMessageSurveyResponseRequest correctedRequest = new ExternalMessageSurveyResponseRequest().setToken(latestRequest.getToken())
982956
.setExternalSurveyId(latestRequest.getExternalSurveyId())
983957
.setExternalRespondentId(latestRequest.getExternalRespondentId())
984958
.setResponseReceivedDate(latestRequest.getResponseReceivedDate())
985-
.setReplacementStrategy(latestRequest.getReplacementStrategy())
959+
.setReplacementStrategy(DataReplacementStrategy.ALWAYS)
986960
.setEmptyValueBehavior(latestRequest.getEmptyValueBehavior())
987961
.setOrigin(latestRequest.getOrigin())
988962
.setInputLanguages(latestRequest.getInputLanguages())

‎sormas-backend/src/main/java/de/symeda/sormas/backend/hospitalization/Hospitalization.java‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@
2323
import java.util.Date;
2424
import java.util.List;
2525

26-
import javax.persistence.CascadeType;
27-
import javax.persistence.Column;
28-
import javax.persistence.Entity;
29-
import javax.persistence.EnumType;
30-
import javax.persistence.Enumerated;
31-
import javax.persistence.OneToMany;
32-
import javax.persistence.Temporal;
33-
import javax.persistence.TemporalType;
26+
import javax.persistence.*;
3427

3528
import de.symeda.sormas.api.hospitalization.HospitalizationReasonType;
3629
import de.symeda.sormas.api.utils.YesNoUnknown;
@@ -82,9 +75,6 @@ public class Hospitalization extends AbstractDomainObject {
8275
private YesNoUnknown currentlyHospitalized;
8376
private Integer durationOfHospitalization;
8477

85-
// TODO: add-UI + DB
86-
private YesNoUnknown oxygenTherapy;
87-
8878
@Temporal(TemporalType.TIMESTAMP)
8979
public Date getAdmissionDate() {
9080
return admissionDate;
@@ -265,12 +255,4 @@ public Integer getDurationOfHospitalization() {
265255
public void setDurationOfHospitalization(Integer durationOfHospitalization) {
266256
this.durationOfHospitalization = durationOfHospitalization;
267257
}
268-
269-
public YesNoUnknown getOxygenTherapy() {
270-
return oxygenTherapy;
271-
}
272-
273-
public void setOxygenTherapy(YesNoUnknown oxygenTherapy) {
274-
this.oxygenTherapy = oxygenTherapy;
275-
}
276258
}

0 commit comments

Comments
 (0)