Update rule check endpoints (#273)

- Backend rule check endpoints has been changed to rule-test
  with a bit different structure to fit REST better.

Author: erik-edling

src/functionaltest/java/com/ericsson/ei/frontend/SeleniumBaseClass.java

@@ -82,7 +82,7 @@ protected void initBaseMocks(CloseableHttpClient mockedHttpClient) throws Client
                 .execute(Mockito.argThat(request -> (request).getURI().toString().contains("/subscriptions")));
 
         Mockito.doReturn(responseData).when(mockedHttpClient).execute(Mockito
-                .argThat(request -> (request).getURI().toString().contains("/rules/rule-check/testRulePageEnabled")));
+                .argThat(request -> (request).getURI().toString().contains("/rule-test")));
 
     }
 

src/functionaltest/java/com/ericsson/ei/frontend/TestRulesFunctionality.java

@@ -87,7 +87,7 @@ public static void tearDownMocks() throws IOException {
 
     private void verifyAggregatedObjectButton() throws IOException {
         String findAggregatedObjectResponse = getJSONStringFromFile(AGGREGATED_OBJECT_FILE_PATH);
-        mockClient.when(request().withMethod("POST").withPath("/rules/rule-check/aggregation"))
+        mockClient.when(request().withMethod("POST").withPath("/rule-test/run-full-aggregation"))
                 .respond(response().withStatusCode(200).withBody(findAggregatedObjectResponse));
 
         testRulesPage.clickFindAggregatedObject();

src/integrationtest/resources/features/rules.feature

@@ -4,15 +4,15 @@ Feature: Rules test
   @RulesPageEnabledScenario
   Scenario: Rules page enabled
     Given frontend is up and running
-    When a 'GET' request is prepared for REST API '/rules/rule-check/testRulePageEnabled'
+    When a 'GET' request is prepared for REST API '/rule-test'
     And request is sent
     Then response code 200 is received
     And response body '{"status":true}' is received
 
   @RulesAggregationScenario
   Scenario: Rules aggregation
     Given frontend is up and running
-    When a 'POST' request is prepared for REST API '/rules/rule-check/aggregation'
+    When a 'POST' request is prepared for REST API '/rule-test/run-full-aggregation'
     And aggregation is prepared with rules file 'listRules.json' and events file 'listEvents.json'
     And request is sent
     Then response code 200 is received

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

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

src/main/resources/static/js/global-variables.js

@@ -19,8 +19,8 @@ var backendEndpoints = {
     DOWNLOAD_SUBSCRIPTIONS_TEMPLATE: "/templates/subscriptions",
     INFORMATION: "/information",
     RULES: "/rules",
-    TEST_RULES_PAGE_ENABLED: "/rules/rule-check/testRulePageEnabled",
-    CHECK_AGGREGATION: "/rules/rule-check/aggregation"
+    TEST_RULES_PAGE_ENABLED: "/rule-test",
+    CHECK_AGGREGATION: "/rule-test/run-full-aggregation"
 };
 
 var PAGES_FOR_STATUS_INDICATION = "subscriptions test-rules ei-info login";

wiki/markdown/curl-examples.md

@@ -305,12 +305,12 @@ Example curl commands to these endpoints [can be found here](https://github.com/
         <td>Get the current rules content</td>
     </tr>
     <tr>
-        <td>/rules/rule-check/testRulePageEnabled</td>
+        <td>/rule-test</td>
         <td>GET</td>
         <td>Check if TestRules is enabled in the back-end</td>
     </tr>
     <tr>
-        <td>/rules/rule-check/aggregation</td>
+        <td>/rule-test/run-full-aggregation</td>
         <td>POST</td>
         <td>Takes rules and events from an object and returns an aggregated object</td>
     </tr>
@@ -319,7 +319,7 @@ Example curl commands to these endpoints [can be found here](https://github.com/
 For these endpoints to be reachable the Eiffel Intelligence back-end [needs to be configured](https://github.com/eiffel-community/eiffel-intelligence/blob/master/src/main/resources/application.properties) with `testaggregated.enabled: true`.
 The below command would result in a json response of `{"status":true}` if this functionality is enabled.
 
-    curl -X GET -H "Content-type: application/json" localhost:8080/rules/rule-check/testRulePageEnabled
+    curl -X GET -H "Content-type: application/json" localhost:8080/rule-test
 
 Example curl commands to these endpoints [can be found here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/running-rules-on-objects.md)
 

wiki/markdown/test-rules.md

@@ -1,7 +1,7 @@
 # Test Rules User Guide
 
 Clicking on the Test Rules element in the navigator window opens an
-interface in the work window and interacts with the `/rules/rule-check`
+interface in the work window and interacts with the `/rule-test/run-single-rule`
 end point of Eiffel Intelligence. This interface can be used to test
 rules on events.
 
@@ -82,7 +82,7 @@ It is possible to use curl to get required information. To get information
 about test rules status, if this functionality is enabled in back-end or
 not, you can execute command below.
 
-    curl -X GET http://<host>:8080/rules/rule-check/testRulePageEnabled?backendurl="http://127.0.0.1:8090/"
+    curl -X GET http://<host>:8080/rule-test?backendurl="http://127.0.0.1:8090/"
 
 To execute rules on specific events with curl, you need to create a JSON
 file with rules and events. File should contain:
@@ -102,7 +102,7 @@ file with rules and events. File should contain:
 
 And then run curl command below.
 
-    curl -X POST -d "@<path to file>" -H "Content-Type: application/json" http://<host>:8080/rules/rule-check/aggregation?backendurl="http://127.0.0.1:8090/"
+    curl -X POST -d "@<path to file>" -H "Content-Type: application/json" http://<host>:8080/rule-test/run-full-aggregation?backendurl="http://127.0.0.1:8090/"
 
 ---
 **_More information about how to write rules can be found [here](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/rules.md)._**