Add support for fetching multiple failed notifications (#385)

* You can now fetch multiple notifications in the same way you do with subscriptions: /failed-notifications?subscriptionName=Sub1,Sub2
* Switched all references from missed- to failed-notifications
* Removed failed notifications database that was separate from the main eiffel intelligence database

Author: Christoffer-Cortes

src/functionaltests/java/com/ericsson/ei/notifications/trigger/SubscriptionNotificationSteps.java

@@ -46,7 +46,7 @@
 
 @Ignore
 @TestPropertySource(properties = { "spring.data.mongodb.database: SubscriptionNotificationSteps",
-        "failed.notification.database-name: SubscriptionNotificationSteps-failedNotifications",
+        "failed.notification.collection-name: SubscriptionNotificationSteps-failedNotifications",
         "rabbitmq.exchange.name: SubscriptionNotificationSteps-exchange",
         "rabbitmq.consumerName: SubscriptionNotificationSteps-consumer" })
 public class SubscriptionNotificationSteps extends FunctionalTestBase {
@@ -75,9 +75,6 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Value("${spring.data.mongodb.database}")
     private String database;
 
-    @Value("${failed.notification.database-name}")
-    private String failedNotificationDatabase;
-
     @Value("${failed.notification.collection-name}")
     private String failedNotificationCollection;
 
@@ -98,7 +95,6 @@ public class SubscriptionNotificationSteps extends FunctionalTestBase {
     @Before()
     public void beforeScenario() {
         mongoDBHandler.dropDatabase(database);
-        mongoDBHandler.dropDatabase(failedNotificationDatabase);
     }
 
     @After()
@@ -204,17 +200,15 @@ public void check_rest_subscriptions_were_triggered() throws Throwable {
         mockClient.reset();
     }
 
-    @Then("Missed notification db should contain (\\d+) objects")
-    public void missed_notification_db_should_contain_x_objects(int maxObjectsInDB) throws Throwable {
+    @Then("Failed notification db should contain (\\d+) objects")
+    public void failed_notification_db_should_contain_x_objects(int maxObjectsInDB) throws Throwable {
         int minWaitTime = 5;
         int maxWaittime = 20;
 
         final MongoCondition condition = MongoCondition.emptyCondition();
-        int missedNotifications = getDbSizeForCondition(minWaitTime, maxWaittime, maxObjectsInDB, condition);
+        int failedNotifications = getDbSizeForCondition(minWaitTime, maxWaittime, maxObjectsInDB, condition);
 
-        assertEquals(missedNotifications, maxObjectsInDB);
-        assertEquals("Number of missed notifications saved in the database: " + missedNotifications, maxObjectsInDB,
-                missedNotifications);
+        assertEquals(maxObjectsInDB, failedNotifications);
     }
 
     @Then("^No subscription is retriggered$")
@@ -443,7 +437,7 @@ private int getDbSizeForCondition(int minWaitTime, int maxWaitTime, int expected
         List<String> queryResult = null;
 
         while (System.currentTimeMillis() < maxTime) {
-            queryResult = mongoDBHandler.find(failedNotificationDatabase,
+            queryResult = mongoDBHandler.find(database,
                     failedNotificationCollection, condition);
 
             if (queryResult.size() == expectedSize) {

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

@@ -47,13 +47,13 @@
         "aggregated.collection.ttlValue:1",
         "notification.failAttempt:1",
         "spring.data.mongodb.database: TestTTLSteps",
-        "failed.notification.database-name: TestTTLSteps-failedNotifications",
+        "failed.notification.collection-name: TestTTLSteps-failedNotifications",
         "rabbitmq.exchange.name: TestTTLSteps-exchange",
         "rabbitmq.consumerName: TestTTLStepsConsumer"})
 public class TestTTLSteps extends FunctionalTestBase {
     private static final Logger LOGGER = LoggerFactory.getLogger(TestTTLSteps.class);
     private static final String BASE_URL = "localhost";
-    private static final String ENDPOINT = "/missed_notification";
+    private static final String INVALID_ENDPOINT = "/invalid-endpoint";
     private static final String SUBSCRIPTION_NAME = "Subscription_1";
 
     private static final String SUBSCRIPTION_NAME_3 = "Subscription_Test_3";
@@ -75,14 +75,11 @@ public class TestTTLSteps extends FunctionalTestBase {
     private MockServerClient mockServerClient;
     private ClientAndServer clientAndServer;
 
-    @Value("${failed.notification.database-name}")
-    private String failedNotificationDatabase;
-
     @Value("${failed.notification.collection-name}")
     private String failedNotificationCollection;
 
     @Value("${spring.data.mongodb.database}")
-    private String dataBase;
+    private String database;
 
     @Value("${aggregated.collection.name}")
     private String collection;
@@ -109,7 +106,7 @@ public void afterScenario() throws IOException {
     public void create_subscription_object() throws IOException, JSONException {
 
         LOGGER.debug("Starting scenario @TestNotificationRetries.");
-        mongoDBHandler.dropCollection(failedNotificationDatabase, failedNotificationCollection);
+        mongoDBHandler.dropCollection(database, failedNotificationCollection);
 
         String subscriptionStr = FileUtils.readFileToString(new File(SUBSCRIPTION_FILE_PATH), "utf-8");
 
@@ -129,7 +126,7 @@ public void inform_subscriber() throws IOException, AuthenticationException {
     @Then("^Verify that request has been retried")
     public void verify_request_has_been_made() throws JSONException {
 
-        String retrievedRequests = mockServerClient.retrieveRecordedRequests(request().withPath(ENDPOINT), Format.JSON);
+        String retrievedRequests = mockServerClient.retrieveRecordedRequests(request().withPath(INVALID_ENDPOINT), Format.JSON);
         JSONArray requests = new JSONArray(retrievedRequests);
 
         // received requests include number of retries
@@ -139,11 +136,11 @@ public void verify_request_has_been_made() throws JSONException {
     @Then("^Check failed notification is in database$")
     public void check_failed_notification_is_in_database() {
         final MongoCondition condition = MongoCondition.subscriptionNameCondition(SUBSCRIPTION_NAME);
-        List<String> result = mongoDBHandler.find(failedNotificationDatabase,
+        List<String> result = mongoDBHandler.find(database,
                 failedNotificationCollection, condition);
 
         assertEquals(1, result.size());
-        assertEquals("Could not find a missed notification matching the condition: " + condition,
+        assertEquals("Could not find a failed notification matching the condition: " + condition,
                 "\"" + SUBSCRIPTION_NAME + "\"", dbManager.getValueFromQuery(result, "subscriptionName", 0));
     }
 
@@ -178,13 +175,13 @@ public void eiffel_events_are_sent() throws Throwable {
     public void aggregated_object_is_created() throws Throwable {
         // verify that aggregated object is created and present in db
         LOGGER.debug("Checking presence of aggregated Object");
-        List<String> allObjects = mongoDBHandler.getAllDocuments(dataBase, collection);
+        List<String> allObjects = mongoDBHandler.getAllDocuments(database, collection);
         assertEquals(1, allObjects.size());
     }
 
     @When("^Failed notification is created$")
     public void a_failed_notification_is_created() throws Throwable {
-        // verifying that missed notification is created and present in db
+        // verifying that failed notification is created and present in db
         int expectedSize = 1;
         final MongoCondition condition = MongoCondition.subscriptionNameCondition(SUBSCRIPTION_NAME_3);
 
@@ -209,7 +206,7 @@ public void the_Aggregated_Object_document_should_be_deleted_from_the_database()
         List<String> allObjects = null;
         // To be sure at least one minute has passed since creation of aggregated object
         TimeUnit.MINUTES.sleep(1);
-        allObjects = mongoDBHandler.getAllDocuments(dataBase, collection);
+        allObjects = mongoDBHandler.getAllDocuments(database, collection);
         assertEquals("Database is not empty.", true, allObjects.isEmpty());
     }
 
@@ -224,7 +221,7 @@ private void setUpMockServer() {
         mockServerClient = new MockServerClient(BASE_URL, port);
 
         // set up expectations on mock server to get calls on this endpoint
-        mockServerClient.when(request().withMethod("POST").withPath(ENDPOINT))
+        mockServerClient.when(request().withMethod("POST").withPath(INVALID_ENDPOINT))
                         .respond(HttpResponse.response().withStatusCode(500));
     }
 
@@ -242,7 +239,7 @@ private int getNotificationForExpectedSize(int expectedSize, MongoCondition cond
         List<String> notificationExist = null;
 
         while (System.currentTimeMillis() < maxTime) {
-            notificationExist = mongoDBHandler.find(failedNotificationDatabase,
+            notificationExist = mongoDBHandler.find(database,
                     failedNotificationCollection,
                     condition);