Skip to content

Commit 9e31f1c

Browse files
KarnaiahPesulaKarnaiahPesula
committed
code refactoring
1 parent 48e76e6 commit 9e31f1c

File tree

4 files changed

+24
-109
lines changed

4 files changed

+24
-109
lines changed

‎sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentReferenceDto.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ public EnvironmentReferenceDto(String uuid, String environmentName) {
2828
this.environmentName = environmentName;
2929
}
3030

31-
/*
32-
* public EnvironmentReferenceDto(String uuid, String environmentName) {
33-
* setUuid(uuid);
34-
* this.environmentName = environmentName;
35-
* }
36-
*/
37-
3831
@Override
3932
public String getCaption() {
4033
return environmentName.trim().length() > 0 ? environmentName : DataHelper.getShortUuid(getUuid());

‎sormas-backend/src/main/java/de/symeda/sormas/backend/environment/EnvironmentJoins.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,10 @@ public class EnvironmentJoins extends QueryJoins<Environment> {
2626
private EnvironmentSampleJoins environmentSampleJoins;
2727
private Join<Environment, Event> events;
2828

29-
// private JoinType eventJoinType;
30-
3129
public EnvironmentJoins(From<?, Environment> root) {
3230
super(root);
3331
}
3432

35-
/*
36-
* public EnvironmentJoins(From<?, Environment> root, JoinType eventJoinType) {
37-
* super(root);
38-
* this.eventJoinType = eventJoinType;
39-
* }
40-
*/
41-
4233
public Join<Environment, Location> getLocation() {
4334
return getOrCreate(location, Environment.LOCATION, JoinType.LEFT, this::setLocation);
4435
}

‎sormas-backend/src/main/java/de/symeda/sormas/backend/environment/EnvironmentService.java

Lines changed: 17 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import javax.persistence.criteria.CriteriaBuilder;
1010
import javax.persistence.criteria.CriteriaQuery;
1111
import javax.persistence.criteria.From;
12-
import javax.persistence.criteria.Join;
13-
import javax.persistence.criteria.JoinType;
1412
import javax.persistence.criteria.Path;
1513
import javax.persistence.criteria.Predicate;
1614
import javax.persistence.criteria.Root;
@@ -23,7 +21,6 @@
2321
import de.symeda.sormas.api.common.DeletableEntityType;
2422
import de.symeda.sormas.api.common.DeletionDetails;
2523
import de.symeda.sormas.api.environment.EnvironmentCriteria;
26-
import de.symeda.sormas.api.environment.EnvironmentIndexDto;
2724
import de.symeda.sormas.api.event.EventCriteria;
2825
import de.symeda.sormas.api.infrastructure.country.CountryReferenceDto;
2926
import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
@@ -37,7 +34,6 @@
3734
import de.symeda.sormas.backend.common.DeletableAdo;
3835
import de.symeda.sormas.backend.environment.environmentsample.EnvironmentSample;
3936
import de.symeda.sormas.backend.environment.environmentsample.EnvironmentSampleService;
40-
import de.symeda.sormas.backend.event.Event;
4137
import de.symeda.sormas.backend.infrastructure.community.Community;
4238
import de.symeda.sormas.backend.infrastructure.country.Country;
4339
import de.symeda.sormas.backend.infrastructure.district.District;
@@ -61,41 +57,23 @@ public EnvironmentService() {
6157
super(Environment.class, DeletableEntityType.ENVIRONMENT);
6258
}
6359

64-
public List<EnvironmentIndexDto> getAllEnvironmentsByEvent(EnvironmentCriteria criteria) {
65-
Predicate filter = null;
66-
CriteriaBuilder cb = em.getCriteriaBuilder();
67-
CriteriaQuery<EnvironmentIndexDto> cq = cb.createQuery(EnvironmentIndexDto.class);
68-
Root<Environment> root = cq.from(Environment.class);
69-
EnvironmentQueryContext queryContext = new EnvironmentQueryContext(cb, cq, root);
70-
EnvironmentJoins joins = queryContext.getJoins();
71-
Join<Environment, Event> eventJoin = joins.getEvents().join(Event.ENVIRONMENTS, JoinType.LEFT);
72-
filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(eventJoin.get(Event.UUID), criteria.getEvent().getUuid()));
73-
74-
if (filter != null) {
75-
cq.where(filter);
76-
}
77-
78-
cq.distinct(true);
79-
return em.createQuery(cq).getResultList();
80-
}
81-
82-
public List<EnvironmentIndexDto> getAllEnvironmentsNotLinkedToEvent(EnvironmentCriteria criteria) {
83-
Predicate filter = null;
84-
CriteriaBuilder cb = em.getCriteriaBuilder();
85-
CriteriaQuery<EnvironmentIndexDto> cq = cb.createQuery(EnvironmentIndexDto.class);
86-
Root<Environment> root = cq.from(Environment.class);
87-
EnvironmentQueryContext queryContext = new EnvironmentQueryContext(cb, cq, root);
88-
EnvironmentJoins joins = queryContext.getJoins();
89-
Join<Environment, Event> eventJoin = joins.getEvents().join(Event.ENVIRONMENTS, JoinType.LEFT);
90-
filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(eventJoin.get(Event.UUID), criteria.getEvent().getUuid()));
91-
92-
if (filter != null) {
93-
cq.where(filter);
94-
}
95-
96-
cq.distinct(true);
97-
return em.createQuery(cq).getResultList();
98-
}
60+
/*
61+
* public List<EnvironmentIndexDto> getAllEnvironmentsByEvent(EnvironmentCriteria criteria) {
62+
* Predicate filter = null;
63+
* CriteriaBuilder cb = em.getCriteriaBuilder();
64+
* CriteriaQuery<EnvironmentIndexDto> cq = cb.createQuery(EnvironmentIndexDto.class);
65+
* Root<Environment> root = cq.from(Environment.class);
66+
* EnvironmentQueryContext queryContext = new EnvironmentQueryContext(cb, cq, root);
67+
* EnvironmentJoins joins = queryContext.getJoins();
68+
* Join<Environment, Event> eventJoin = joins.getEvents().join(Event.ENVIRONMENTS, JoinType.LEFT);
69+
* filter = CriteriaBuilderHelper.and(cb, filter, cb.equal(eventJoin.get(Event.UUID), criteria.getEvent().getUuid()));
70+
* if (filter != null) {
71+
* cq.where(filter);
72+
* }
73+
* cq.distinct(true);
74+
* return em.createQuery(cq).getResultList();
75+
* }
76+
*/
9977

10078
public String getSimilarEnvironmentUuid(EnvironmentCriteria criteria) {
10179

@@ -251,24 +229,6 @@ public static Predicate buildGpsCoordinatesFilter(
251229
return filter;
252230
}
253231

254-
public Predicate buildEventsFilter(EnvironmentCriteria environmentCriteria, EnvironmentQueryContext environmentQueryContext) {
255-
if (environmentCriteria == null) {
256-
return null;
257-
}
258-
259-
CriteriaBuilder cb = environmentQueryContext.getCriteriaBuilder();
260-
From<?, Environment> from = environmentQueryContext.getRoot();
261-
final EnvironmentJoins joins = environmentQueryContext.getJoins();
262-
Join<Environment, Event> eventJoin = joins.getEvents().join(Event.ENVIRONMENTS, JoinType.LEFT);
263-
264-
Predicate filter = null;
265-
266-
if (environmentCriteria.getEvent().getUuid() != null) {
267-
filter = CriteriaBuilderHelper.and(cb, filter, cb.notEqual(eventJoin.get(Event.UUID), environmentCriteria.getEvent().getUuid()));
268-
}
269-
return filter;
270-
}
271-
272232
public Predicate buildCriteriaFilter(EnvironmentCriteria environmentCriteria, EnvironmentQueryContext environmentQueryContext) {
273233

274234
if (environmentCriteria == null) {

‎sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentSelectionField.java

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@ public class EnvironmentSelectionField extends CustomField<EnvironmentIndexDto>
4646
Button applyButton;
4747
HorizontalLayout weekAndDateFilterLayout;
4848

49-
/*
50-
* public EnvironmentSelectionField(String infoPickOrCreateEnvironment, boolean allowCreation, Consumer<EnvironmentCriteria>
51-
* setDefaultFilters) {
52-
* this.infoPickOrCreateEnvironment = infoPickOrCreateEnvironment;
53-
* this.searchField = new TextField();
54-
* this.criteria = new EnvironmentCriteria();
55-
* this.allowCreation = allowCreation;
56-
* this.setDefaultFilters = setDefaultFilters;
57-
* initializeGrid();
58-
* }
59-
*/
60-
6149
public EnvironmentSelectionField(EnvironmentReferenceDto referenceDto) {
6250
this.infoPickOrCreateEnvironment = I18nProperties.getString(Strings.infoPickOrCreateEnvironmentForEvent);
6351
this.searchField = new TextField();
@@ -112,15 +100,15 @@ public void initializeGrid() {
112100
@Override
113101
protected Component initContent() {
114102
mainLayout = new VerticalLayout();
115-
mainLayout.setSpacing(true);
116103
mainLayout.setMargin(false);
104+
mainLayout.setSpacing(true);
117105
mainLayout.setSizeUndefined();
118106
mainLayout.setWidth(100, Unit.PERCENTAGE);
119107
addInfoComponent();
120108

121109
VerticalLayout filterLayout = new VerticalLayout();
122-
filterLayout.setSpacing(false);
123110
filterLayout.setMargin(false);
111+
filterLayout.setSpacing(false);
124112
filterLayout.setWidth(100, Unit.PERCENTAGE);
125113

126114
filterLayout.addComponent(createFilterBar());
@@ -153,15 +141,15 @@ public HorizontalLayout buildWeekAndDateFilter() {
153141
applyButton.addClickListener(e -> {
154142

155143
DateFilterOption dateFilterOption = (DateFilterOption) weekAndDateFilter.getDateFilterOptionFilter().getValue();
156-
Date fromDate = null;
157144
Date toDate = null;
145+
Date fromDate = null;
158146
if (dateFilterOption == DateFilterOption.DATE) {
159-
if (weekAndDateFilter.getDateFromFilter().getValue() != null) {
160-
fromDate = DateHelper.getStartOfDay(weekAndDateFilter.getDateFromFilter().getValue());
161-
}
162147
if (weekAndDateFilter.getDateToFilter().getValue() != null) {
163148
toDate = DateHelper.getEndOfDay(weekAndDateFilter.getDateToFilter().getValue());
164149
}
150+
if (weekAndDateFilter.getDateFromFilter().getValue() != null) {
151+
fromDate = DateHelper.getStartOfDay(weekAndDateFilter.getDateFromFilter().getValue());
152+
}
165153
} else {
166154
fromDate = DateHelper.getEpiWeekStart((EpiWeek) weekAndDateFilter.getWeekFromFilter().getValue());
167155
toDate = DateHelper.getEpiWeekEnd((EpiWeek) weekAndDateFilter.getWeekToFilter().getValue());
@@ -221,8 +209,8 @@ private void addCreateEnvironmentRadioGroup() {
221209
rbCreateEnvironment.addValueChangeListener(e -> {
222210
if (e.getValue() != null) {
223211
rbSelectEnvironment.setValue(null);
224-
environmentGrid.deselectAll();
225212
environmentGrid.setEnabled(false);
213+
environmentGrid.deselectAll();
226214
if (selectionChangeCallback != null) {
227215
selectionChangeCallback.accept(true);
228216
}
@@ -255,23 +243,6 @@ private void addSelectEnvironmentRadioGroup() {
255243
mainLayout.addComponent(rbSelectEnvironment);
256244
}
257245

258-
/*
259-
* public static EnvironmentSelectionField forSelectedEnvironment(EnvironmentDto environmentDto) {
260-
* EnvironmentSelectionField environmentSelectionField =
261-
* new EnvironmentSelectionField(I18nProperties.getString(Strings.infoPickOrCreateEnvironmentForEvent), false, environmentCriteria -> {
262-
* });
263-
* environmentSelectionField.weekAndDateFilter.getDateFromFilter().addValueChangeListener(valueChangeEvent -> {
264-
* Date selectedFromDate = environmentSelectionField.weekAndDateFilter.getDateFromFilter().getValue();
265-
* prepareSubordinateFilters(
266-
* environmentDto,
267-
* environmentSelectionField,
268-
* selectedFromDate,
269-
* environmentSelectionField.weekAndDateFilter.getDateFromFilter());
270-
* });
271-
* return environmentSelectionField;
272-
* }
273-
*/
274-
275246
public void setSelectionChangeCallback(Consumer<Boolean> callback) {
276247
this.selectionChangeCallback = callback;
277248
}

0 commit comments

Comments
 (0)