add method to check if event exists for case number & flag

pom.xml

@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.6-SNAPSHOT</version>
+	<version>2.12.7-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

src/main/java/org/opensrp/service/EventService.java

@@ -205,18 +205,6 @@ && getByBaseEntityAndFormSubmissionId(event.getBaseEntityId(), event.getFormSubm
 					"An event already exists with given baseEntity and formSubmission combination. Consider updating");
 		}
 
-		if (event.getEventType() != null
-				&& event.getEventType().equals(EVENT_TYPE_CASE_DETAILS)
-				&& event.getDetails() != null
-				&& StringUtils.isNotBlank(event.getDetails().get(CASE_NUMBER))){
-			String caseNumber = event.getDetails().get(CASE_NUMBER);
-			String flag = event.getDetails().get(FLAG);
-			boolean caseEventExists = checkIfEventExists(caseNumber, flag);
-			if (caseEventExists){
-				throw new DuplicateKeyException("An event already exists with case_number " + caseNumber + ", and flag '" + flag + "'");
-			}
-		}
-
 		event.setDateCreated(DateTime.now());
 		allEvents.add(event);
 		triggerPlanEvaluation(event, username);
@@ -702,8 +690,16 @@ public ExportImagesSummary getImagesMetadataForFlagProblemEvent(String planIdent
 
 	}
 
-	public boolean checkIfEventExists(@NonNull String caseNumber, @NonNull String flag){
-		return allEvents.checkEventExists(caseNumber, flag);
+	public boolean checkIfCaseTriggeredEventExists(@NonNull Event event){
+		if (StringUtils.isNotBlank(event.getEventType())
+				&& event.getEventType().equals(EVENT_TYPE_CASE_DETAILS)
+				&& event.getDetails() != null
+				&& StringUtils.isNotBlank(event.getDetails().get(CASE_NUMBER))) {
+			String caseNumber = event.getDetails().get(CASE_NUMBER);
+			String flag = event.getDetails().get(FLAG);
+			return allEvents.checkEventExists(caseNumber, flag);
+		}
+		return false;
 	}
 
 }

src/main/java/org/opensrp/service/PlanService.java

@@ -293,5 +293,4 @@ public Long countPlansByUsernameAndServerVersion(String username, long serverVer
 		}
 		return 0l;
 	}
-
 }

src/test/java/org/opensrp/domain/LocationTest.java

@@ -0,0 +1,34 @@
+package org.opensrp.domain;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class LocationTest {
+
+	private Location location;
+
+	@Before
+	public void setUp(){
+		location = new Location();
+	}
+
+	@Test
+	public void testGetLocationId() {
+		String id = "cc3386a7-1d58-41e4-9916-7e1f7908416b";
+		location.setLocationId(id);
+
+		assertEquals(id, location.getLocationId());
+	}
+
+	@Test
+	public void testWithLocationId() {
+		String id = "cc3386a7-1d58-41e4-9916-7e1f7908416b";
+		Location location1 = location.withLocationId(id);
+
+		assertEquals(location, location1);
+		assertEquals(id, location1.getLocationId());
+	}
+
+}

src/test/java/org/opensrp/service/EventServiceTest.java

@@ -1,6 +1,7 @@
 package org.opensrp.service;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -172,6 +173,7 @@ public void testAddEvent() {
 		eventService.addEvent(event, username);
 
 		event = eventService.findByFormSubmissionId("gjhg34534 nvbnv3345345__4");
+		assertNotNull(eventService.getById(event.getId()));
 		assertEquals("435534534543", event.getBaseEntityId());
 		assertEquals("Growth Monitoring", event.getEventType());
 		assertEquals(1, event.getObs().size());
@@ -234,8 +236,8 @@ public void testAddEventShouldEvaluatePlan() {
 		verify(taskGenerator, times(1)).processPlanEvaluation(planDefinitionArgumentCaptor.capture(),stringArgumentCaptor.capture(),eventArgumentCaptor.capture());
 	}
 
-	@Test(expected = DuplicateKeyException.class)
-	public void testAddCaseTriggeredEventThrowsExceptionOnDuplicate() {
+	@Test
+	public void testCheckIfCaseTriggeredEventExistsReturnsForCaseTriggeredEvent() {
 		Obs obs = new Obs("concept", "decimal", "1730AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", null, "3.5", null, "weight");
 		Event event = new Event()
 				.withBaseEntityId("4355345345488")
@@ -252,14 +254,29 @@ public void testAddCaseTriggeredEventThrowsExceptionOnDuplicate() {
 		Mockito.doNothing().when(taskGenerator).processPlanEvaluation(any(PlanDefinition.class), anyString(), any(Event.class));
 		eventService.addEvent(event, username);
 
-		Event savedEvent = eventService.findByFormSubmissionId("gjhg34534 nvbnv3345345__16");
-		assertNotNull(savedEvent);
-		assertNotNull(savedEvent.getId());
-		assertNotNull(eventService.getById(savedEvent.getId()));
-
 		// add as duplicate with different FormSubmissionId
 		Event duplicateEvent = event.withFormSubmissionId("gjhg34534 nvbnv3345345__3444556");
-		eventService.addEvent(duplicateEvent, username);
+		assertTrue(eventService.checkIfCaseTriggeredEventExists(duplicateEvent));
+	}
+
+	@Test
+	public void testCheckIfCaseTriggeredEventExists() {
+		Obs obs = new Obs("concept", "decimal", "1730AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", null, "3.5", null, "weight");
+		Event event = new Event()
+				.withBaseEntityId("4355345")
+				.withFormSubmissionId("gjhg34534 nvb__16")
+				.withEventDate(new DateTime())
+				.withObs(obs);
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("identifier");
+
+		when(planRepository.get(anyString())).thenReturn(plan);
+		Mockito.doNothing().when(taskGenerator).processPlanEvaluation(any(PlanDefinition.class), anyString(), any(Event.class));
+		eventService.addEvent(event, username);
+
+		// add as duplicate with different FormSubmissionId
+		Event duplicateEvent = event.withFormSubmissionId("gjhg34534 nvb__16");
+		assertFalse(eventService.checkIfCaseTriggeredEventExists(duplicateEvent));
 	}
 
 	@Test