From 184764c88e10a11edaad800a5b4154d84af53598 Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Mon, 11 Jul 2022 10:28:16 +0200 Subject: [PATCH 1/4] [GITFLOW]updating poms for 1.73.2 branch with snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-cargoserver/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-keycloak-service-provider/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index b84b77954d8..eab03b21a11 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index f8d7645c9a1..5db1cb55fbe 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index c8068ba68a8..bfcccbe6723 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 48d70a69ded..4961d2e2afc 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 3b3831f308f..bec3ece71b9 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.73.1 + 1.73.2-SNAPSHOT 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 368eaaf4ff7..db74bafe7c0 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index 09834b5d54e..ead793fe1f2 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 77532c08e35..7ac73fcbe77 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 803dee16f00..37b539927d5 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index ba2d35bbb83..352f2790aab 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index c046d468a1a..6b47af80ccc 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.1 + 1.73.2-SNAPSHOT ../sormas-base 4.0.0 From 7c0968c61b02e01a627923e1fdd5f93c11090adc Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Fri, 8 Jul 2022 13:05:19 +0200 Subject: [PATCH 2/4] #9779 Unit test extended to trigger regional filter for samples --- .../sormas/backend/sample/SampleFacadeEjbTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/sample/SampleFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/sample/SampleFacadeEjbTest.java index 7f71a1043c5..042cb2e5f5e 100644 --- a/sormas-backend/src/test/java/de/symeda/sormas/backend/sample/SampleFacadeEjbTest.java +++ b/sormas-backend/src/test/java/de/symeda/sormas/backend/sample/SampleFacadeEjbTest.java @@ -17,6 +17,7 @@ *******************************************************************************/ package de.symeda.sormas.backend.sample; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; @@ -25,7 +26,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.text.SimpleDateFormat; @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; import de.symeda.sormas.api.common.DeletionReason; import org.hamcrest.MatcherAssert; @@ -126,6 +127,13 @@ public void testGetIndexList() { assertEquals(PathogenTestType.CQ_VALUE_DETECTION, sampleIndexDtos.get(1).getTypeOfLastTest()); assertTrue(sampleIndexDtos.get(1).getLastTestCqValue().equals(1.5F)); + + // Referenced user has to find his samples + loginWith(user); + List result = getSampleFacade().getIndexList(new SampleCriteria(), 0, 100, null); + assertThat( + result.stream().map(e -> e.getUuid()).collect(Collectors.toList()), + containsInAnyOrder(sample.getUuid(), referredSample.getUuid())); } @Test From 8637564ab37765e45f4a1bde2eeeefdc2c7753da Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Fri, 8 Jul 2022 13:09:59 +0200 Subject: [PATCH 3/4] #9779 Avoid circular EP joins when filtering is done based on Event --- .../de/symeda/sormas/backend/event/EventParticipantJoins.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantJoins.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantJoins.java index 7fe6570de32..04626d9fb58 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantJoins.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventParticipantJoins.java @@ -189,7 +189,7 @@ private void setPersonJoins(PersonJoins personJoins) { } public EventJoins getEventJoins() { - return getOrCreate(eventJoins, () -> new EventJoins(getEvent()), this::setEventJoins); + return getOrCreate(eventJoins, () -> new EventJoins(getRoot(), getEvent()), this::setEventJoins); } private void setEventJoins(EventJoins eventJoins) { From f67c3298ee83f256531326b74a7f112fb3fc5e82 Mon Sep 17 00:00:00 2001 From: Stefan Kock Date: Tue, 12 Jul 2022 11:01:51 +0200 Subject: [PATCH 4/4] [GITFLOW]updating poms for branch'hotfix-1.73.2' with non-snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-cargoserver/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-keycloak-service-provider/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index eab03b21a11..4f4acaaf4d5 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 5db1cb55fbe..f5552a1794a 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index bfcccbe6723..d58a5dd3a85 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 4961d2e2afc..4b683411423 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index bec3ece71b9..825eb0115ae 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.73.2-SNAPSHOT + 1.73.2 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index db74bafe7c0..d7654c04bb1 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index ead793fe1f2..b5b868f3cf0 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 7ac73fcbe77..48490950fd2 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index 37b539927d5..110655b743a 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 352f2790aab..7081b224b6f 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 6b47af80ccc..d9fe7574b5c 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.73.2-SNAPSHOT + 1.73.2 ../sormas-base 4.0.0