Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit cf5d6f9

Browse files
MateStrysewskeMateStrysewske
committed
[GITFLOW]merging 'hotfix-1.49.1' into 'master'
2 parents 6528aff + 402cca6 commit cf5d6f9

15 files changed

Lines changed: 109 additions & 111 deletions

File tree

‎sormas-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>de.symeda.sormas</groupId>
44
<artifactId>sormas-base</artifactId>
5-
<version>1.49.0</version>
5+
<version>1.49.1</version>
66
<relativePath>../sormas-base</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>

‎sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,6 @@ public static LocationDto build() {
253253
}
254254

255255
public static String buildStreetAndHouseNumberCaption(String street, String houseNumber) {
256-
return street + " " + houseNumber;
256+
return DataHelper.toStringNullable(street) + " " + DataHelper.toStringNullable(houseNumber);
257257
}
258258
}

‎sormas-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.49.0</version>
6+
<version>1.49.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎sormas-backend/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>sormas-base</artifactId>
55
<groupId>de.symeda.sormas</groupId>
6-
<version>1.49.0</version>
6+
<version>1.49.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

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

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,6 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.backend.contact;
1919

20-
import static de.symeda.sormas.backend.visit.VisitLogic.getVisitResult;
21-
import static java.time.temporal.ChronoUnit.DAYS;
22-
23-
import java.math.BigInteger;
24-
import java.sql.Timestamp;
25-
import java.time.LocalDate;
26-
import java.time.LocalDateTime;
27-
import java.util.ArrayList;
28-
import java.util.Collections;
29-
import java.util.Comparator;
30-
import java.util.Date;
31-
import java.util.List;
32-
import java.util.Map;
33-
import java.util.Optional;
34-
import java.util.function.Function;
35-
import java.util.stream.Collectors;
36-
import java.util.stream.Stream;
37-
38-
import javax.annotation.security.RolesAllowed;
39-
import javax.ejb.EJB;
40-
import javax.ejb.LocalBean;
41-
import javax.ejb.Stateless;
42-
import javax.ejb.TransactionAttribute;
43-
import javax.ejb.TransactionAttributeType;
44-
import javax.persistence.EntityManager;
45-
import javax.persistence.PersistenceContext;
46-
import javax.persistence.Query;
47-
import javax.persistence.criteria.CriteriaBuilder;
48-
import javax.persistence.criteria.CriteriaQuery;
49-
import javax.persistence.criteria.Expression;
50-
import javax.persistence.criteria.Join;
51-
import javax.persistence.criteria.JoinType;
52-
import javax.persistence.criteria.Order;
53-
import javax.persistence.criteria.Predicate;
54-
import javax.persistence.criteria.Root;
55-
import javax.validation.constraints.NotNull;
56-
57-
import org.apache.commons.collections.CollectionUtils;
58-
import org.slf4j.Logger;
59-
import org.slf4j.LoggerFactory;
60-
61-
import de.symeda.sormas.api.CountryHelper;
6220
import de.symeda.sormas.api.Disease;
6321
import de.symeda.sormas.api.Language;
6422
import de.symeda.sormas.api.caze.CaseReferenceDto;
@@ -153,6 +111,45 @@
153111
import de.symeda.sormas.backend.util.QueryHelper;
154112
import de.symeda.sormas.backend.visit.Visit;
155113
import de.symeda.sormas.backend.visit.VisitService;
114+
import org.apache.commons.collections.CollectionUtils;
115+
import org.slf4j.Logger;
116+
import org.slf4j.LoggerFactory;
117+
118+
import javax.annotation.security.RolesAllowed;
119+
import javax.ejb.EJB;
120+
import javax.ejb.LocalBean;
121+
import javax.ejb.Stateless;
122+
import javax.ejb.TransactionAttribute;
123+
import javax.ejb.TransactionAttributeType;
124+
import javax.persistence.EntityManager;
125+
import javax.persistence.PersistenceContext;
126+
import javax.persistence.Query;
127+
import javax.persistence.criteria.CriteriaBuilder;
128+
import javax.persistence.criteria.CriteriaQuery;
129+
import javax.persistence.criteria.Expression;
130+
import javax.persistence.criteria.Join;
131+
import javax.persistence.criteria.JoinType;
132+
import javax.persistence.criteria.Order;
133+
import javax.persistence.criteria.Predicate;
134+
import javax.persistence.criteria.Root;
135+
import javax.validation.constraints.NotNull;
136+
import java.math.BigInteger;
137+
import java.sql.Timestamp;
138+
import java.time.LocalDate;
139+
import java.time.LocalDateTime;
140+
import java.util.ArrayList;
141+
import java.util.Collections;
142+
import java.util.Comparator;
143+
import java.util.Date;
144+
import java.util.List;
145+
import java.util.Map;
146+
import java.util.Optional;
147+
import java.util.function.Function;
148+
import java.util.stream.Collectors;
149+
import java.util.stream.Stream;
150+
151+
import static de.symeda.sormas.backend.visit.VisitLogic.getVisitResult;
152+
import static java.time.temporal.ChronoUnit.DAYS;
156153

157154
@Stateless(name = "ContactFacade")
158155
public class ContactFacadeEjb implements ContactFacade {
@@ -281,7 +278,9 @@ public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
281278
Contact entity = fromDto(dto);
282279
contactService.ensurePersisted(entity);
283280

284-
createInvestigationTask(entity);
281+
if (existingContact == null) {
282+
createInvestigationTask(entity);
283+
}
285284

286285
if (handleChanges) {
287286
updateContactVisitAssociations(existingContactDto, entity);

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
package de.symeda.sormas.backend.contact;
22

3-
import java.util.ArrayList;
4-
import java.util.Arrays;
5-
import java.util.Collections;
6-
import java.util.List;
7-
import java.util.function.BiFunction;
8-
import java.util.stream.Collectors;
9-
import java.util.stream.Stream;
10-
11-
import javax.ejb.EJB;
12-
import javax.ejb.LocalBean;
13-
import javax.ejb.Stateless;
14-
import javax.persistence.EntityManager;
15-
import javax.persistence.PersistenceContext;
16-
import javax.persistence.criteria.CriteriaBuilder;
17-
import javax.persistence.criteria.CriteriaQuery;
18-
import javax.persistence.criteria.Expression;
19-
import javax.persistence.criteria.Order;
20-
import javax.persistence.criteria.Predicate;
21-
import javax.persistence.criteria.Root;
22-
import javax.persistence.criteria.Selection;
23-
import javax.persistence.criteria.Subquery;
24-
253
import de.symeda.sormas.api.contact.ContactCriteria;
264
import de.symeda.sormas.api.contact.ContactIndexDetailedDto;
275
import de.symeda.sormas.api.contact.ContactIndexDto;
@@ -40,6 +18,27 @@
4018
import de.symeda.sormas.backend.user.User;
4119
import de.symeda.sormas.backend.util.ModelConstants;
4220

21+
import javax.ejb.EJB;
22+
import javax.ejb.LocalBean;
23+
import javax.ejb.Stateless;
24+
import javax.persistence.EntityManager;
25+
import javax.persistence.PersistenceContext;
26+
import javax.persistence.criteria.CriteriaBuilder;
27+
import javax.persistence.criteria.CriteriaQuery;
28+
import javax.persistence.criteria.Expression;
29+
import javax.persistence.criteria.Order;
30+
import javax.persistence.criteria.Predicate;
31+
import javax.persistence.criteria.Root;
32+
import javax.persistence.criteria.Selection;
33+
import javax.persistence.criteria.Subquery;
34+
import java.util.ArrayList;
35+
import java.util.Arrays;
36+
import java.util.Collections;
37+
import java.util.List;
38+
import java.util.function.BiFunction;
39+
import java.util.stream.Collectors;
40+
import java.util.stream.Stream;
41+
4342
@Stateless
4443
@LocalBean
4544
public class ContactListCriteriaBuilder {
@@ -180,9 +179,10 @@ private List<Expression<?>> getIndexDetailOrders(SortProperty sortProperty, Root
180179
case ContactIndexDetailedDto.DISTRICT_NAME:
181180
return Collections.singletonList(joins.getDistrict().get(District.NAME));
182181
case ContactIndexDetailedDto.CITY:
183-
case ContactIndexDetailedDto.ADDRESS:
184182
case ContactIndexDetailedDto.POSTAL_CODE:
185183
return Collections.singletonList(joins.getAddress().get(sortProperty.propertyName));
184+
case ContactIndexDetailedDto.ADDRESS:
185+
return Collections.singletonList(joins.getAddress().get(Location.STREET));
186186
case ContactIndexDetailedDto.REPORTING_USER:
187187
return Arrays.asList(joins.getReportingUser().get(User.FIRST_NAME), joins.getReportingUser().get(User.LAST_NAME));
188188
default:

‎sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,6 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.backend.event;
1919

20-
import java.sql.Timestamp;
21-
import java.time.LocalDate;
22-
import java.util.ArrayList;
23-
import java.util.Collections;
24-
import java.util.Date;
25-
import java.util.List;
26-
import java.util.Map;
27-
import java.util.stream.Collectors;
28-
29-
import javax.ejb.EJB;
30-
import javax.ejb.LocalBean;
31-
import javax.ejb.Stateless;
32-
import javax.ejb.TransactionAttribute;
33-
import javax.ejb.TransactionAttributeType;
34-
import javax.persistence.EntityManager;
35-
import javax.persistence.PersistenceContext;
36-
import javax.persistence.criteria.CriteriaBuilder;
37-
import javax.persistence.criteria.CriteriaQuery;
38-
import javax.persistence.criteria.CriteriaUpdate;
39-
import javax.persistence.criteria.Expression;
40-
import javax.persistence.criteria.Join;
41-
import javax.persistence.criteria.JoinType;
42-
import javax.persistence.criteria.Order;
43-
import javax.persistence.criteria.ParameterExpression;
44-
import javax.persistence.criteria.Predicate;
45-
import javax.persistence.criteria.Root;
46-
import javax.persistence.criteria.Subquery;
47-
import javax.validation.constraints.NotNull;
48-
4920
import de.symeda.sormas.api.Disease;
5021
import de.symeda.sormas.api.event.DashboardEventDto;
5122
import de.symeda.sormas.api.event.EventCriteria;
@@ -57,7 +28,6 @@
5728
import de.symeda.sormas.api.event.EventStatus;
5829
import de.symeda.sormas.api.user.UserRight;
5930
import de.symeda.sormas.api.utils.SortProperty;
60-
import de.symeda.sormas.backend.caze.Case;
6131
import de.symeda.sormas.backend.common.AbstractAdoService;
6232
import de.symeda.sormas.backend.common.AbstractDomainObject;
6333
import de.symeda.sormas.backend.contact.Contact;
@@ -75,6 +45,33 @@
7545
import de.symeda.sormas.backend.util.ModelConstants;
7646
import de.symeda.sormas.backend.util.Pseudonymizer;
7747

48+
import javax.ejb.EJB;
49+
import javax.ejb.LocalBean;
50+
import javax.ejb.Stateless;
51+
import javax.ejb.TransactionAttribute;
52+
import javax.ejb.TransactionAttributeType;
53+
import javax.persistence.EntityManager;
54+
import javax.persistence.PersistenceContext;
55+
import javax.persistence.criteria.CriteriaBuilder;
56+
import javax.persistence.criteria.CriteriaQuery;
57+
import javax.persistence.criteria.CriteriaUpdate;
58+
import javax.persistence.criteria.Expression;
59+
import javax.persistence.criteria.Join;
60+
import javax.persistence.criteria.JoinType;
61+
import javax.persistence.criteria.Order;
62+
import javax.persistence.criteria.Predicate;
63+
import javax.persistence.criteria.Root;
64+
import javax.persistence.criteria.Subquery;
65+
import javax.validation.constraints.NotNull;
66+
import java.sql.Timestamp;
67+
import java.time.LocalDate;
68+
import java.util.ArrayList;
69+
import java.util.Collections;
70+
import java.util.Date;
71+
import java.util.List;
72+
import java.util.Map;
73+
import java.util.stream.Collectors;
74+
7875
@Stateless(name = "EventFacade")
7976
public class EventFacadeEjb implements EventFacade {
8077

@@ -280,6 +277,7 @@ public List<EventIndexDto> getIndexList(EventCriteria eventCriteria, Integer fir
280277
case EventIndexDto.SRC_FIRST_NAME:
281278
case EventIndexDto.SRC_LAST_NAME:
282279
case EventIndexDto.SRC_TEL_NO:
280+
case EventIndexDto.SRC_TYPE:
283281
case EventIndexDto.REPORT_DATE_TIME:
284282
expression = event.get(sortProperty.propertyName);
285283
break;

‎sormas-base/dependencies/serverlibs.pom‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>sormas-base</artifactId>
1010
<groupId>de.symeda.sormas</groupId>
11-
<version>1.49.0</version>
11+
<version>1.49.1</version>
1212
<relativePath>../</relativePath>
1313
</parent>
1414

‎sormas-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.symeda.sormas</groupId>
66
<artifactId>sormas-base</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.49.0</version>
8+
<version>1.49.1</version>
99

1010
<properties>
1111
<slf4j.version>1.7.30</slf4j.version>

‎sormas-cargoserver/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>de.symeda.sormas</groupId>
55
<artifactId>sormas-base</artifactId>
6-
<version>1.49.0</version>
6+
<version>1.49.1</version>
77
<relativePath>../sormas-base</relativePath>
88
</parent>
99

0 commit comments

Comments
 (0)