Fix endpoints and tests (#274)

Author: Christoffer-Cortes

src/integrationtest/java/com/ericsson/ei/frontend/AggregatedObjectsRunnerIT.java

@@ -0,0 +1,14 @@
+package com.ericsson.ei.frontend;
+
+import org.junit.runner.RunWith;
+
+import cucumber.api.CucumberOptions;
+import cucumber.api.junit.Cucumber;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(features = "src/integrationtest/resources/features/aggregated-objects.feature", glue = {
+        "com.ericsson.ei.frontend" }, plugin = {
+                "html:target/cucumber-reports/AggregatedObjectsRunnerIT" })
+public class AggregatedObjectsRunnerIT {
+
+}

src/integrationtest/java/com/ericsson/ei/frontend/QueryRunnerIT.java renamed to src/integrationtest/java/com/ericsson/ei/frontend/FailedNotificationsRunnerIT.java

@@ -6,9 +6,9 @@
 import cucumber.api.junit.Cucumber;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(features = "src/integrationtest/resources/features/query.feature", glue = {
+@CucumberOptions(features = "src/integrationtest/resources/features/failed-notifications.feature", glue = {
         "com.ericsson.ei.frontend" }, plugin = {
                 "html:target/cucumber-reports/QueryRunnerIT" })
-public class QueryRunnerIT {
+public class FailedNotificationsRunnerIT {
 
-}
+}

src/integrationtest/resources/features/query.feature renamed to src/integrationtest/resources/features/aggregated-objects.feature

@@ -1,29 +1,20 @@
 @QueryFeature
 Feature: Query test
 
-  @QueryMissedNotificationsScenario
-  Scenario: Query missed notifications
-    Given frontend is up and running
-    When a 'GET' request is prepared for REST API '/failed-notifications'
-    And param key 'subscriptionName' with value 'NonExistingSubscription' is added
-    And request is sent
-    Then response code 200 is received
-    And response body '{"queryResponseEntity":{}}' is received
-
   @QueryByIdScenario
   Scenario: Query aggregated object by ID
     Given frontend is up and running
     And an aggregated object is created
-    When a 'GET' request is prepared for REST API '/queryAggregatedObject'
-    And param key 'ID' with value '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43' is added
+    When a 'GET' request is prepared for REST API '/aggregated-objects'
+    And '/6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43' is appended to endpoint
     And request is sent for 30 seconds until response code no longer matches 204
     And response body contains '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43'
 
   @QueryFreestyleScenario
   Scenario: Query aggregated object with freestyle criteria
     Given frontend is up and running
     And an aggregated object is created
-    When a 'POST' request is prepared for REST API '/query'
+    When a 'POST' request is prepared for REST API '/aggregated-objects/query'
     And body is set to file 'queryFreestyle.json'
     And request is sent for 30 seconds until response code no longer matches 204
     And response body contains '6acc3c87-75e0-4b6d-88f5-b1a5d4e62b43'

src/integrationtest/resources/features/failed-notifications.feature

@@ -0,0 +1,11 @@
+@FailedNotificationsFeature
+Feature: Failed notifications test
+
+  @FailedNotificationsScenario
+  Scenario: Query failed notifications
+    Given frontend is up and running
+    When a 'GET' request is prepared for REST API '/failed-notifications'
+    And param key 'subscriptionNames' with value 'NonExistingSubscription' is added
+    And request is sent
+    Then response code 200 is received
+    And response body '[]' is received

src/integrationtest/resources/integration-test.properties

@@ -8,7 +8,8 @@ build.version=
 # port where Eiffel Intelligence will run
 server.port: 8090
 
-# path to files with rules for aggregating objects
+# path to file containing aggregation rules
+# if the path is a url it needs to include the http(s) protocol.
 rules.path: /rules/ArtifactRules-Eiffel-Agen-Version.json
 
 # logging levels can be set with the flag below for the top packages
@@ -45,6 +46,8 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedd
 # Details for connection to mongoDB
 spring.data.mongodb.host: localhost
 spring.data.mongodb.port: 27017
+#spring.data.mongodb.username:
+#spring.data.mongodb.password:
 spring.data.mongodb.database: eiffel_intelligence
 # we cannot have empty username and password property here
 # if these properties are empty, remove or comment them
@@ -87,19 +90,20 @@ threads.corePoolSize: 100
 threads.queueCapacity: 5000
 threads.maxPoolSize: 150
 
-# name of the collection where missed notifications are stored
-missedNotificationCollectionName: Notification
-# name of the database where missed notifications are stored
-missedNotificationDataBaseName: MissedNotification
-# email sender settings for email notifications
-email.sender: noreply@ericsson.com
-email.subject: Email Subscription Notification
+# WaitList-worker and Scheduling task executor thread settings
+scheduled.threadpool.size: 100
 
-# number of retries if a notification fail
+# name of the collection where failed notifications are stored
+failed.notification.collection-name: failed_notification
+# number of retries if a notification fails
 notification.failAttempt: 3
-# time to live in database in seconds for missed notifications
+# time to live in database in seconds for failed notifications
 notification.ttl.value: 600
 
+# email sender settings for email notifications
+email.sender: noreply@ericsson.com
+email.subject: Email Subscription Notification
+
 # email server settings to route email notifications
 # through
 spring.mail.host:
@@ -132,4 +136,4 @@ ldap.server.list: [\
         "password": "YWRtaW4=",\
         "user.filter": "uid={0}"\
     }\
-]\
+]\

src/main/java/com/ericsson/ei/frontend/EIRequestsController.java

@@ -71,7 +71,7 @@ public class EIRequestsController {
     @CrossOrigin
     @RequestMapping(value = { "/subscriptions", "/subscriptions/*",
             "/information", "/templates/*", "/authentication", "/authentication/*",
-            "/queryAggregatedObject", "/failed-notifications", "/query", "/rules", "/status",
+            "/aggregated-objects/*", "/failed-notifications", "/aggregated-objects/query", "/rules", "/status",
             "/rule-test" }, method = RequestMethod.GET)
     public ResponseEntity<String> getRequests(Model model, HttpServletRequest incomingRequest) {
         String eiRequestUrl;
@@ -99,7 +99,7 @@ public ResponseEntity<String> getRequests(Model model, HttpServletRequest incomi
      */
     @CrossOrigin
     @RequestMapping(value = { "/subscriptions", "/rule-test/run-full-aggregation",
-            "/query" }, method = RequestMethod.POST)
+            "/aggregated-objects/query" }, method = RequestMethod.POST)
     public ResponseEntity<String> postRequests(Model model, HttpServletRequest incomingRequest) {
         String eiRequestUrl;
         try {

src/test/java/com/ericsson/ei/frontend/EIRequestControllerUtilsTest.java

@@ -75,10 +75,10 @@ public void testGetEIRequestURL() throws Exception {
         assertEquals("http://NullHost:12345/subscription", url);
 
         // Test name TestName and query string.
-        when(mockedRequest.getServletPath()).thenReturn("/query");
+        when(mockedRequest.getServletPath()).thenReturn("/aggregated-objects/query");
         when(mockedRequest.getQueryString()).thenReturn("someQuery=Something");
         url = eiRequestsControllerUtils.getEIRequestURL(mockedRequest);
-        assertEquals("http://NullHost:12345/query?someQuery=Something", url);
+        assertEquals("http://NullHost:12345/aggregated-objects/query?someQuery=Something", url);
 
         // Test url given in input from request.
         when(mockedRequest.getServletPath()).thenReturn("/subscription");