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

Commit 97c8ded

Browse files
Issue SORMAS-Foundation#3426 Adds person in EventParticipantCriteria
1 parent a66cc5d commit 97c8ded

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/event/EventParticipantCriteria.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.Serializable;
44

55
import de.symeda.sormas.api.BaseCriteria;
6+
import de.symeda.sormas.api.person.PersonReferenceDto;
67
import de.symeda.sormas.api.utils.IgnoreForUrl;
78

89
public class EventParticipantCriteria extends BaseCriteria implements Serializable {
@@ -15,6 +16,7 @@ public class EventParticipantCriteria extends BaseCriteria implements Serializab
1516
public static final String BIRTHDATE_DD = "birthdateDD";
1617

1718
private EventReferenceDto event;
19+
private PersonReferenceDto person;
1820
private String freeText;
1921
private Integer birthdateYYYY;
2022
private Integer birthdateMM;
@@ -30,6 +32,16 @@ public EventParticipantCriteria event(EventReferenceDto event) {
3032
return this;
3133
}
3234

35+
@IgnoreForUrl
36+
public PersonReferenceDto getPerson() {
37+
return person;
38+
}
39+
40+
public EventParticipantCriteria person(PersonReferenceDto person) {
41+
this.person = person;
42+
return this;
43+
}
44+
3345
public EventParticipantCriteria freeText(String freeText) {
3446
this.freeText = freeText;
3547
return this;

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ public Predicate buildCriteriaFilter(EventParticipantCriteria criteria, Criteria
145145
if (criteria.getEvent() != null) {
146146
filter = and(cb, filter, cb.equal(event.get(Event.UUID), criteria.getEvent().getUuid()));
147147
}
148+
if (criteria.getPerson() != null) {
149+
filter = and(cb, filter, cb.equal(person.get(Person.UUID), criteria.getPerson().getUuid()));
150+
}
148151

149152
if (criteria.getFreeText() != null) {
150153
String[] textFilters = criteria.getFreeText().split("\\s+");

0 commit comments

Comments
 (0)