diff --git a/pom.xml b/pom.xml index f60f8870c..48451669a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ opensrp-server-core jar - 3.2.6-SNAPSHOT + 3.2.7-SNAPSHOT opensrp-server-core OpenSRP Server Core module https://github.com/OpenSRP/opensrp-server-core @@ -25,7 +25,7 @@ 1.1.3-SNAPSHOT 2.0.1-SNAPSHOT 1.6.7-SNAPSHOT - 2.12.6 + 2.13.2.1 2.0.5 1.18.12 2.2.13.RELEASE @@ -108,7 +108,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} + 2.12.6 diff --git a/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java index 2f0644bf3..c66e65ee4 100755 --- a/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java +++ b/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java @@ -361,7 +361,7 @@ public void testFindAssignedLocations() { assertEquals("304cbcd4-0850-404a-a8b1-486b02f7b84d", assignedLocations.get(0).getJurisdictionId()); assertEquals("7f2ae03f-9569-5535-918c-9d976b3ae5f8", assignedLocations.get(0).getPlanId()); assertEquals("2019-09-10", dateFormat.format(assignedLocations.get(0).getFromDate())); - assertEquals("2022-09-10", dateFormat.format(assignedLocations.get(0).getToDate())); + assertEquals("2030-09-10", dateFormat.format(assignedLocations.get(0).getToDate())); } @@ -376,7 +376,7 @@ public void testFindAssignedLocationsMutipleIds() { assertEquals("304cbcd4-0850-404a-a8b1-486b02f7b84d", assignedLocations.get(0).getJurisdictionId()); assertEquals("7f2ae03f-9569-5535-918c-9d976b3ae5f8", assignedLocations.get(0).getPlanId()); assertEquals("2019-09-10", dateFormat.format(assignedLocations.get(0).getFromDate())); - assertEquals("2022-09-10", dateFormat.format(assignedLocations.get(0).getToDate())); + assertEquals("2030-09-10", dateFormat.format(assignedLocations.get(0).getToDate())); assignedLocations = organizationRepository.findAssignedLocations(Arrays.asList(1l, 2l), true); assertEquals(3, assignedLocations.size()); diff --git a/src/test/resources/test-scripts/organization.sql b/src/test/resources/test-scripts/organization.sql index e496fcba4..6067b78dc 100644 --- a/src/test/resources/test-scripts/organization.sql +++ b/src/test/resources/test-scripts/organization.sql @@ -24,6 +24,6 @@ INSERT INTO core.plan (identifier, json, date_deleted, server_version, id) VALUE INSERT INTO core.plan (identifier, json, date_deleted, server_version, id) VALUES ('7f2ae03f-9569-5535-918c-9d976b3ae5f8', '{}', null, 1567765433007, 294); -INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (1, 1, 2243, 162, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10')); -INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (2, 1, 2243, 11, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10')); -INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (3, 2, 2243, 294, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10')); +INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (1, 1, 2243, 162, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10')); +INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (2, 1, 2243, 11, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10')); +INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (3, 2, 2243, 294, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10')); \ No newline at end of file