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

Commit e356ccb

Browse files
lgallgal
lgal
authored and
lgal
committed
SORMAS-Foundation#2624 fixed merge issues
1 parent b515dbd commit e356ccb

15 files changed

Lines changed: 34 additions & 101 deletions

File tree

‎sormas-api/src/main/java/de/symeda/sormas/api/event/EventActionIndexDto.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
import de.symeda.sormas.api.action.ActionPriority;
2424
import de.symeda.sormas.api.action.ActionStatus;
2525
import de.symeda.sormas.api.user.UserReferenceDto;
26-
import de.symeda.sormas.api.utils.jurisdiction.WithJurisdiction;
2726

28-
public class EventActionIndexDto implements WithJurisdiction<EventJurisdictionDto>, Serializable {
27+
public class EventActionIndexDto implements Serializable {
2928

3029
private static final long serialVersionUID = 8231951545991794808L;
3130

@@ -54,7 +53,6 @@ public class EventActionIndexDto implements WithJurisdiction<EventJurisdictionDt
5453
private ActionStatus actionStatus;
5554
private ActionPriority actionPriority;
5655
private UserReferenceDto actionReplyingUser;
57-
private EventJurisdictionDto jurisdiction;
5856

5957
public EventActionIndexDto(
6058
String eventUuid,
@@ -69,12 +67,7 @@ public EventActionIndexDto(
6967
ActionPriority actionPriority,
7068
String actionReplyingUserUuid,
7169
String actionReplyingUserFirstName,
72-
String actionReplyingUserLastName,
73-
String eventRegionUuid,
74-
String eventDistrictUuid,
75-
String eventCommunityUuid,
76-
String eventReportingUserUuid,
77-
String eventSurveillanceOfficerUuid) {
70+
String actionReplyingUserLastName) {
7871

7972
this.eventUuid = eventUuid;
8073
this.eventTitle = eventTitle;
@@ -87,8 +80,6 @@ public EventActionIndexDto(
8780
this.actionStatus = actionStatus;
8881
this.actionPriority = actionPriority;
8982
this.actionReplyingUser = new UserReferenceDto(actionReplyingUserUuid, actionReplyingUserFirstName, actionReplyingUserLastName, null);
90-
this.jurisdiction =
91-
new EventJurisdictionDto(eventReportingUserUuid, eventSurveillanceOfficerUuid, eventRegionUuid, eventDistrictUuid, eventCommunityUuid);
9283
}
9384

9485
public String getEventUuid() {
@@ -178,8 +169,4 @@ public UserReferenceDto getActionReplyingUser() {
178169
public void setActionReplyingUser(UserReferenceDto actionReplyingUser) {
179170
this.actionReplyingUser = actionReplyingUser;
180171
}
181-
182-
public EventJurisdictionDto getJurisdiction() {
183-
return jurisdiction;
184-
}
185172
}

‎sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,8 +866,8 @@ public interface Captions {
866866
String exportSamples = "exportSamples";
867867
String exportSelectSormasData = "exportSelectSormasData";
868868
String exportSormasData = "exportSormasData";
869-
String Facility_archived = "Facility.archived";
870869
String facility = "facility";
870+
String Facility_archived = "Facility.archived";
871871
String Facility_city = "Facility.city";
872872
String Facility_community = "Facility.community";
873873
String Facility_district = "Facility.district";

‎sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,6 @@
1717
*******************************************************************************/
1818
package de.symeda.sormas.api.symptoms;
1919

20-
import de.symeda.sormas.api.ImportIgnore;
21-
import de.symeda.sormas.api.PseudonymizableDto;
22-
import de.symeda.sormas.api.utils.Complication;
23-
import de.symeda.sormas.api.utils.DataHelper;
24-
import de.symeda.sormas.api.utils.DependantOn;
25-
import de.symeda.sormas.api.utils.Diseases;
26-
import de.symeda.sormas.api.utils.HideForCountries;
27-
import de.symeda.sormas.api.utils.HideForCountriesExcept;
28-
import de.symeda.sormas.api.utils.Order;
29-
import de.symeda.sormas.api.utils.Outbreaks;
30-
import de.symeda.sormas.api.utils.SensitiveData;
31-
import de.symeda.sormas.api.utils.YesNoUnknown;
32-
33-
import java.util.Date;
34-
3520
import static de.symeda.sormas.api.Disease.AFP;
3621
import static de.symeda.sormas.api.Disease.ANTHRAX;
3722
import static de.symeda.sormas.api.Disease.CHOLERA;
@@ -53,6 +38,21 @@
5338
import static de.symeda.sormas.api.Disease.UNSPECIFIED_VHF;
5439
import static de.symeda.sormas.api.Disease.YELLOW_FEVER;
5540

41+
import java.util.Date;
42+
43+
import de.symeda.sormas.api.ImportIgnore;
44+
import de.symeda.sormas.api.utils.Complication;
45+
import de.symeda.sormas.api.utils.DataHelper;
46+
import de.symeda.sormas.api.utils.DependantOn;
47+
import de.symeda.sormas.api.utils.Diseases;
48+
import de.symeda.sormas.api.utils.HideForCountries;
49+
import de.symeda.sormas.api.utils.HideForCountriesExcept;
50+
import de.symeda.sormas.api.utils.Order;
51+
import de.symeda.sormas.api.utils.Outbreaks;
52+
import de.symeda.sormas.api.utils.SensitiveData;
53+
import de.symeda.sormas.api.utils.YesNoUnknown;
54+
import de.symeda.sormas.api.utils.pseudonymization.PseudonymizableDto;
55+
5656
public class SymptomsDto extends PseudonymizableDto {
5757

5858
private static final long serialVersionUID = 4146526547904182448L;

‎sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/LocationDialog.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
package de.symeda.sormas.app.component.dialog;
1717

18+
import static de.symeda.sormas.app.core.notification.NotificationType.ERROR;
19+
1820
import java.util.Arrays;
1921
import java.util.List;
2022

@@ -33,7 +35,6 @@
3335
import de.symeda.sormas.api.utils.ValidationException;
3436
import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
3537
import de.symeda.sormas.app.R;
36-
import de.symeda.sormas.app.backend.common.DatabaseHelper;
3738
import de.symeda.sormas.app.backend.config.ConfigProvider;
3839
import de.symeda.sormas.app.backend.location.Location;
3940
import de.symeda.sormas.app.component.Item;
@@ -42,14 +43,10 @@
4243
import de.symeda.sormas.app.core.notification.NotificationHelper;
4344
import de.symeda.sormas.app.core.notification.NotificationType;
4445
import de.symeda.sormas.app.databinding.DialogLocationLayoutBinding;
45-
import de.symeda.sormas.app.epidata.EpiDataBurialDialog;
46-
import de.symeda.sormas.app.util.AppFieldAccessCheckers;
4746
import de.symeda.sormas.app.util.DataUtils;
4847
import de.symeda.sormas.app.util.InfrastructureHelper;
4948
import de.symeda.sormas.app.util.LocationService;
5049

51-
import static de.symeda.sormas.app.core.notification.NotificationType.ERROR;
52-
5350
public class LocationDialog extends FormDialog {
5451

5552
public static final String TAG = LocationDialog.class.getSimpleName();

‎sormas-app/app/src/main/java/de/symeda/sormas/app/person/read/PersonReadFragment.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,18 @@
2525
import de.symeda.sormas.api.person.PersonDto;
2626
import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
2727
import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
28-
import de.symeda.sormas.app.BaseActivity;
2928
import de.symeda.sormas.app.BaseReadFragment;
3029
import de.symeda.sormas.app.R;
3130
import de.symeda.sormas.app.backend.caze.Case;
3231
import de.symeda.sormas.app.backend.common.AbstractDomainObject;
3332
import de.symeda.sormas.app.backend.common.DatabaseHelper;
34-
import de.symeda.sormas.app.backend.config.ConfigProvider;
3533
import de.symeda.sormas.app.backend.contact.Contact;
36-
import de.symeda.sormas.app.backend.contact.ContactEditAuthorization;
37-
import de.symeda.sormas.app.backend.epidata.EpiDataBurial;
3834
import de.symeda.sormas.app.backend.location.Location;
3935
import de.symeda.sormas.app.backend.person.Person;
4036
import de.symeda.sormas.app.component.dialog.InfoDialog;
41-
import de.symeda.sormas.app.component.dialog.LocationDialog;
42-
import de.symeda.sormas.app.core.FieldHelper;
4337
import de.symeda.sormas.app.core.IEntryItemOnClickListener;
4438
import de.symeda.sormas.app.databinding.FragmentPersonReadLayoutBinding;
4539
import de.symeda.sormas.app.person.edit.PersonEditFragment;
46-
import de.symeda.sormas.app.util.AppFieldAccessCheckers;
4740
import de.symeda.sormas.app.util.FieldVisibilityAndAccessHelper;
4841
import de.symeda.sormas.app.util.InfrastructureHelper;
4942

‎sormas-backend/src/main/java/de/symeda/sormas/backend/action/ActionService.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,6 @@ public List<EventActionIndexDto> getEventActionIndexList(EventCriteria criteria,
245245
ActionJoins actionJoins = new ActionJoins(action);
246246
Join<Action, User> replyingUser = actionJoins.getReplyingUser();
247247
Join<Action, Event> event = actionJoins.getEvent(JoinType.INNER);
248-
Join<Event, Location> location = event.join(Event.EVENT_LOCATION, JoinType.LEFT);
249-
Join<Location, Region> region = location.join(Location.REGION, JoinType.LEFT);
250-
Join<Location, District> district = location.join(Location.DISTRICT, JoinType.LEFT);
251-
Join<Location, Community> community = location.join(Location.COMMUNITY, JoinType.LEFT);
252-
Join<Event, User> surveillanceOfficer = event.join(Event.SURVEILLANCE_OFFICER, JoinType.LEFT);
253-
Join<Event, User> reportingUser = event.join(Event.REPORTING_USER, JoinType.LEFT);
254248

255249
// Add filters
256250
Predicate filter = eventService.createUserFilter(cb, cq, event);
@@ -277,12 +271,7 @@ public List<EventActionIndexDto> getEventActionIndexList(EventCriteria criteria,
277271
action.get(Action.PRIORITY),
278272
replyingUser.get(User.UUID),
279273
replyingUser.get(User.FIRST_NAME),
280-
replyingUser.get(User.LAST_NAME),
281-
region.get(Region.UUID),
282-
district.get(District.UUID),
283-
community.get(Community.UUID),
284-
reportingUser.get(User.UUID),
285-
surveillanceOfficer.get(User.UUID));
274+
replyingUser.get(User.LAST_NAME));
286275

287276
if (sortProperties != null && sortProperties.size() > 0) {
288277
List<Order> order = new ArrayList<>(sortProperties.size());

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_BIG;
2121
import static de.symeda.sormas.api.EntityDto.COLUMN_LENGTH_DEFAULT;
2222

23+
import java.util.ArrayList;
2324
import java.util.Date;
2425
import java.util.HashSet;
2526
import java.util.List;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
import de.symeda.sormas.backend.clinicalcourse.ClinicalVisitService;
7373
import de.symeda.sormas.backend.common.AbstractAdoService;
7474
import de.symeda.sormas.backend.common.AbstractCoreAdoService;
75+
import de.symeda.sormas.backend.common.AbstractDomainObject;
7576
import de.symeda.sormas.backend.common.CoreAdo;
7677
import de.symeda.sormas.backend.contact.Contact;
7778
import de.symeda.sormas.backend.contact.ContactService;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ public List<EventParticipantExportDto> getExportList(
382382
samplesList = em.createQuery(samplesCq).setHint(ModelConstants.HINT_HIBERNATE_READ_ONLY, true).getResultList();
383383
samples = samplesList.stream().collect(Collectors.groupingBy(s -> s.getAssociatedEventParticipant().getId()));
384384

385-
Pseudonymizer pseudonymizer = new Pseudonymizer(userService::hasRight, I18nProperties.getCaption(Captions.inaccessibleValue));
386-
385+
Pseudonymizer pseudonymizer = Pseudonymizer.getDefault(userService::hasRight, I18nProperties.getCaption(Captions.inaccessibleValue));
387386
for (EventParticipantExportDto exportDto : eventParticipantResultList) {
388387
final boolean inJurisdiction = eventParticipantJurisdictionChecker.isInJurisdictionOrOwned(exportDto.getJurisdiction());
389388

‎sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasOriginInfoService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public SormasToSormasOriginInfoService() {
3333
}
3434

3535
@Override
36-
public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From<SormasToSormasOriginInfo, SormasToSormasOriginInfo> from) {
36+
public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From<?, SormasToSormasOriginInfo> from) {
37+
// no user filter needed right now
3738
return null;
3839
}
39-
4040
}

0 commit comments

Comments
 (0)