Double event subscription test (#260)

* update tests for to check that no subscription is triggered again if same event is received again
* update linking for SourceChangeRules flow picture

Author: vasile-baluta

src/functionaltests/java/com/ericsson/ei/subscriptions/trigger/SubscriptionTriggerSteps.java

@@ -153,13 +153,33 @@ public void check_mail_subscriptions_were_triggered() {
 
     @Then("^Rest subscriptions were triggered$")
     public void check_rest_subscriptions_were_triggered() throws Throwable {
+        restSubscriptionsTriggered(1);
+        // clean mock server information about requests
+        mockClient.reset();
+    }
+
+    @When("^I send one previous event again$")
+    public void send_one_previous_event() throws Throwable {
+        List<String> eventNamesToSend = new ArrayList<>();
+        eventNamesToSend.add("event_EiffelArtifactCreatedEvent_3");
+        eventManager.sendEiffelEvents(EIFFEL_EVENTS_JSON_PATH, eventNamesToSend);
+    }
+
+    @When("^No subscription is retriggered$")
+    public void no_subscription_is_retriggered() throws Throwable {
+        restSubscriptionsTriggered(0);
+    }
+
+    private void restSubscriptionsTriggered(int times) throws Throwable {
         LOGGER.debug("Verifying REST requests.");
         List<String> endpointsToCheck = new ArrayList<>(Arrays.asList(REST_ENDPOINT, REST_ENDPOINT_AUTH,
                 REST_ENDPOINT_PARAMS, REST_ENDPOINT_AUTH_PARAMS, REST_ENDPOINT_ROW_BODY));
 
-        assert (allEndpointsGotAtLeastXCalls(endpointsToCheck, 1));
-        for (String endpoint : endpointsToCheck) {
-            assert (requestBodyContainsStatedValues(endpoint));
+        assert (allEndpointsGotAtLeastXCalls(endpointsToCheck, times));
+        if (times > 0) {
+            for (String endpoint : endpointsToCheck) {
+                assert (requestBodyContainsStatedValues(endpoint));
+            }
         }
     }
 
@@ -233,7 +253,8 @@ private boolean allEndpointsGotAtLeastXCalls(final List<String> endpoints, int e
         while (!endpointsToCheck.isEmpty() && stopTime > System.currentTimeMillis()) {
             for (String endpoint : endpoints) {
                 String restBodyData = mockClient.retrieveRecordedRequests(request().withPath(endpoint), Format.JSON);
-                if ((new JSONArray(restBodyData)).length() >= expectedCalls) {
+                int actualRestCalls = new JSONArray(restBodyData).length();
+                if (actualRestCalls >= expectedCalls) {
                     endpointsToCheck.remove(endpoint);
                 }
             }

src/functionaltests/resources/features/subscriptionTrigger.feature

@@ -27,3 +27,5 @@ Feature: Subscription trigger test
     And Wait for EI to aggregate objects and trigger subscriptions
     Then Mail subscriptions were triggered 
     And Rest subscriptions were triggered
+    And I send one previous event again
+    And No subscription is retriggered

src/main/java/com/ericsson/ei/subscriptionhandler/RunSubscription.java

@@ -16,17 +16,17 @@
 */
 package com.ericsson.ei.subscriptionhandler;
 
-import com.ericsson.ei.jmespath.JmesPathInterface;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
 import java.util.Iterator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.ericsson.ei.jmespath.JmesPathInterface;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
 /**
  * This class represents the mechanism to fetch the rule conditions from the
  * Subscription Object and match it with the aggregatedObject to check if it is
@@ -75,13 +75,14 @@ public boolean runSubscriptionOnObject(String aggregatedObject, Iterator<JsonNod
                         "ID has not been passed for given aggregated object. The subscription will be triggered again.");
             }
 
-            if (subscriptionRepeatFlag == "false" && id != null && subscriptionRepeatDbHandler
-                    .checkIfAggrObjIdExistInSubscriptionAggrIdsMatchedList(subscriptionName, requirementIndex, id)) {
+            if (subscriptionRepeatFlag == "false" && id != null
+                    && subscriptionRepeatDbHandler.checkIfAggrObjIdExistInSubscriptionAggrIdsMatchedList(
+                            subscriptionName, requirementIndex, id)) {
                 LOGGER.info("Subscription has already matched with AggregatedObject Id: " + id + "\nSubscriptionName: "
                         + subscriptionName + "\nand has Subscrption Repeat flag set to: " + subscriptionRepeatFlag);
                 break;
             }
-            
+
             JsonNode requirement = requirementIterator.next();
 
             LOGGER.info("The fulfilled requirement which condition will check is : " + requirement.toString());