Fixed some of RepeatDBHandling of matched Aggregated Objects ids issues. (#251)

* Fix clean RepeateHandler AggregatedobjectIds log message.

* Fixed RepeatDBHandles storing matched Aggregated Objects ids issues.

Author: tobiasake

src/functionaltests/java/com/ericsson/ei/subscriptions/repeatHandler/SubscriptionRepeatHandlerSteps.java

@@ -144,7 +144,7 @@ public void in_MongoDb_RepeatFlagHandler_collection_the_subscription_has_matched
         processSubscription(subscriptionStrWithTwoMatch, subscriptionWithTwoMatch);
         List<String> resultRepeatFlagHandler = mongoDBHandler.find(dataBaseName, repeatFlagHandlerCollection,
                 subscriptionIdMatchedAggrIdObjQuery);
-        assertEquals(2, resultRepeatFlagHandler.size());
+        assertEquals(1, resultRepeatFlagHandler.size());
         assertEquals("\"" + AGGREGATED_OBJECT_ID + "\"", getAggregatedObjectId(resultRepeatFlagHandler, 0));
         assertEquals("\"" + AGGREGATED_OBJECT_ID + "\"", getAggregatedObjectId(resultRepeatFlagHandler, 1));
     }
@@ -165,7 +165,7 @@ public List<String> getEventNamesToSend() {
      */
     private String getAggregatedObjectId(List<String> resultRepeatFlagHandler, int index) {
         JsonParser parser = new JsonParser();
-        JsonObject jsonObject = parser.parse(resultRepeatFlagHandler.get(index)).getAsJsonObject();
+        JsonObject jsonObject = parser.parse(resultRepeatFlagHandler.get(0)).getAsJsonObject();
         JsonObject requirements = jsonObject.get("requirements").getAsJsonObject();
         return requirements.get(String.valueOf(index)).getAsJsonArray().get(0).toString();
     }

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

@@ -18,7 +18,6 @@
 
 import com.ericsson.ei.jmespath.JmesPathInterface;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 import java.util.Iterator;
@@ -64,19 +63,10 @@ public boolean runSubscriptionOnObject(String aggregatedObject, Iterator<JsonNod
         boolean conditionFulfilled = false;
         int count_condition_fulfillment = 0;
         int count_conditions = 0;
-
         int requirementIndex = 0;
 
         while (requirementIterator.hasNext()) {
 
-            JsonNode aggrObjJsonNode = null;
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                aggrObjJsonNode = objectMapper.readValue(aggregatedObject, JsonNode.class);
-            } catch (Exception e) {
-                LOGGER.error(e.getMessage(), e);
-            }
-
             String subscriptionName = subscriptionJson.get("subscriptionName").asText();
             String subscriptionRepeatFlag = subscriptionJson.get("repeat").asText();
 
@@ -91,7 +81,7 @@ public boolean runSubscriptionOnObject(String aggregatedObject, Iterator<JsonNod
                         + 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());

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

@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,7 +96,6 @@ public void addMatchedAggrObjToSubscriptionId(String subscriptionId, int require
 
         if (!updateExistingMatchedSubscriptionWithAggrObjId(subscriptionId, requirementId, aggrObjId)) {
             LOGGER.error("Couldn't update SubscriptionMathced id.");
-        } else {
             LOGGER.debug(
                     "New Subscription AggrId has not matched, inserting new SubscriptionId and AggrObjId to matched list.");
             BasicDBObject document = new BasicDBObject();
@@ -120,25 +120,33 @@ public void addMatchedAggrObjToSubscriptionId(String subscriptionId, int require
     private boolean updateExistingMatchedSubscriptionWithAggrObjId(String subscriptionId, int requirementId,
             String aggrObjId) throws Exception {
         String subscriptionQuery = "{\"subscriptionId\" : \"" + subscriptionId + "\"}";
-
         JsonNode updateDocJsonNode = mapper.readValue(
                 "{\"$push\" : { \"requirements." + requirementId + "\" : \"" + aggrObjId + "\"}}", JsonNode.class);
-
-        LOGGER.debug("SubscriptionId \"", subscriptionId,
+        LOGGER.debug("SubscriptionId \"", subscriptionId +
                 "\" document will be updated with following requirement update object: "
                         + updateDocJsonNode.toString());
 
         JsonNode queryJsonNode = mapper.readValue(subscriptionQuery, JsonNode.class);
+        
+        Document document = null;
         try {
-            mongoDbHandler.findAndModify(dataBaseName, collectionName, queryJsonNode.toString(),
+            document = mongoDbHandler.findAndModify(dataBaseName, collectionName, queryJsonNode.toString(),
                     updateDocJsonNode.toString());
         } catch (Exception e) {
             LOGGER.debug("Failed to update existing matched SubscriptionId with new AggrId." + "SubscriptionId: "
                     + subscriptionId + "New matched AggrObjId: " + aggrObjId + "RequirementId that have matched: "
                     + requirementId);
             return false;
         }
-        return true;
+        if (document != null && !document.isEmpty()) {
+            LOGGER.debug("Successfully updated Matched Subscription Aggregated Object list:" +
+                         "\nfor subsruptionId: " + subscriptionId +
+                         "\nwith Aggregated Object Id: " + aggrObjId +
+                         "\nwith matched Requirement Id: " + requirementId);
+            
+            return true;
+        }
+        return false;
     }
 
     public boolean checkIfAggrObjIdExistInSubscriptionAggrIdsMatchedList(String subscriptionId, int requirementId,
@@ -153,18 +161,18 @@ public boolean checkIfAggrObjIdExistInSubscriptionAggrIdsMatchedList(String subs
             try {
                 JsonNode jNode = mapper.readTree(objArray.get(0));
                 if (jNode.get("subscriptionId").asText().trim().equals(subscriptionId)) {
-                    LOGGER.debug("SubscriptionId \"", subscriptionId,
+                    LOGGER.debug("SubscriptionId \"" + subscriptionId +
                             "\" , exist in document. Checking if AggrObjId has matched earlier.");
 
                     LOGGER.debug("Subscription requirementId: " + requirementId + " and Requirements content:\n"
                             + jNode.get("requirements").get(new Integer(requirementId).toString()));
 
                     boolean triggered = checkRequirementIdTriggered(jNode, requirementId, aggrObjId);
 
-                    if (!triggered)
+                    if (!triggered) {
                         LOGGER.debug("RequirementId: " + requirementId + " and SubscriptionId: " + subscriptionId
                                 + "\nhas not matched any AggregatedObject.");
-
+                    }
                     return triggered;
                 }
             } catch (Exception e) {
@@ -189,8 +197,7 @@ private boolean checkRequirementIdTriggered(JsonNode jNode, int requirementId, S
             return false;
         }
 
-        String idStr = listAggrObjIds.get(requirementId);
-        if (idStr.equals(aggrObjId)) {
+        if (listAggrObjIds.contains(aggrObjId)) {
             LOGGER.debug("Subscription has matched aggrObjId already: " + aggrObjId);
             return true;
         }