From cfc41779a6d6b4eecfd443e55b11ef270e1f9ce4 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Sat, 11 Dec 2021 12:46:54 +0300 Subject: [PATCH 1/3] Security updates: Migrate dependencies - Server core to 2.12.17 - Server connector to 2.3.2-SNAPSHOT - Spring security to 5.3.12.RELEASE - log4j-slf4j-impl to 2.15.0 - log4j-jcl to 2.15.0 Bump up artifact version to 2.3.8 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index a9803d655..06a10405c 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ opensrp-server-web war - 2.8.37-SNAPSHOT + 2.8.38-SNAPSHOT opensrp-server-web OpenSRP Server Web Application https://github.com/OpenSRP/opensrp-server-web @@ -17,7 +17,7 @@ 5.4.12.Final UTF-8 5.2.4.RELEASE - 5.3.3.RELEASE + 5.3.12.RELEASE 2.4.0.RELEASE 2.9.2 2.2.4.RELEASE @@ -25,8 +25,8 @@ 5.2.2.RELEASE always 1.5.1 - 2.12.16-SNAPSHOT - 2.3.0-SNAPSHOT + 2.12.17-SNAPSHOT + 2.3.2-SNAPSHOT 2.0.1-SNAPSHOT 2.0.3-SNAPSHOT 2.0.5 @@ -168,7 +168,7 @@ org.slf4j slf4j-log4j12 - 1.6.0 + 1.6.6 org.springframework.security @@ -381,7 +381,7 @@ org.hibernate.validator hibernate-validator - 6.0.18.Final + 6.0.22.Final io.sentry @@ -413,12 +413,12 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.14.1 + 2.15.0 org.apache.logging.log4j log4j-jcl - 2.14.1 + 2.15.0 io.micrometer From 7f5005fe4bb3c42c22ff0b9cd5cf0faa1afa20b1 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Sat, 11 Dec 2021 13:04:31 +0300 Subject: [PATCH 2/3] Bump up spring security version Bump up spring.security.version to v 5.2.13.RELEASE From a22a1d06dd85efbe5fa1a4fcd684e5a7c02ef71b Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Sat, 11 Dec 2021 14:11:45 +0300 Subject: [PATCH 3/3] Fix failing test : PlanResourceTest --- src/main/java/org/opensrp/web/rest/PlanResource.java | 6 +++++- src/test/java/org/opensrp/web/rest/PlanResourceTest.java | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opensrp/web/rest/PlanResource.java b/src/main/java/org/opensrp/web/rest/PlanResource.java index 1cc5276ef..67422f99f 100644 --- a/src/main/java/org/opensrp/web/rest/PlanResource.java +++ b/src/main/java/org/opensrp/web/rest/PlanResource.java @@ -580,6 +580,10 @@ public void generateCaseTriggeredPlans() { } } + public Date getCurrentDate(){ + return new Date(); + } + public PlanDefinition createPlanFromTemplate(String templateString, Event caseDetailsEvent) { // Build map Map valuesMap = new HashMap<>(); @@ -588,7 +592,7 @@ public PlanDefinition createPlanFromTemplate(String templateString, Event caseDe caseDetailsEvent.getDetails().get(Constants.Plan.PLAN_IDENTIFIER) : UUID.randomUUID().toString(); valuesMap.put(Constants.Plan.PLAN_IDENTIFIER, planIdentifier); SimpleDateFormat sdf = new SimpleDateFormat(Constants.Plan.DATE_FORMAT); - Date currentDate = new Date(); + Date currentDate = getCurrentDate(); Date endDate; Calendar c = Calendar.getInstance(); c.setTime(currentDate); diff --git a/src/test/java/org/opensrp/web/rest/PlanResourceTest.java b/src/test/java/org/opensrp/web/rest/PlanResourceTest.java index ea2208ec5..df3fafdb5 100644 --- a/src/test/java/org/opensrp/web/rest/PlanResourceTest.java +++ b/src/test/java/org/opensrp/web/rest/PlanResourceTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -32,8 +33,10 @@ import java.util.Set; import java.util.HashMap; import java.util.Map; +import java.util.Date; import org.apache.commons.lang3.tuple.Pair; +import org.joda.time.DateTime; import org.json.JSONObject; import org.junit.Before; import org.junit.Rule; @@ -1736,7 +1739,11 @@ public void testGenerateCaseTriggeredPlans() { Template template = gson.fromJson(templateString, Template.class); when(templateService.getTemplateByTemplateId(1)).thenReturn(template); - planResource.generateCaseTriggeredPlans(); + PlanResource planResourceSpy = spy(planResource); + Date todayDate = new DateTime(2021, 12, 10, 0, 0, 0, 0).toDate(); + when(planResourceSpy.getCurrentDate()).thenReturn(todayDate); + + planResourceSpy.generateCaseTriggeredPlans(); verify(planService).addPlan(argumentCaptor.capture(), stringArgumentCaptor.capture()); assertEquals(Constants.Plan.PLAN_USER, stringArgumentCaptor.getValue());