Merge pull request #5 from btison/incidents

incident priority also returns total number of incidents in session
Emergency-Response-Demo · May 4, 2019 · 9ffe938 · 9ffe938
2 parents b454af5 + a724c15
commit 9ffe938
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/com/redhat/cajun/navy/incident/priority/MessageConsumerVerticle.java b/src/main/java/com/redhat/cajun/navy/incident/priority/MessageConsumerVerticle.java
@@ -56,7 +56,7 @@ private void handleMessage(KafkaConsumerRecord<String, String> msg) {
                 log.warn("Message of type '" + "' has unexpected structure: " + message.toString());
             }
             String incidentId = message.getJsonObject("body").getString("incidentId");
-            log.info("Consumed '" + messageType + "' message for incident '" + incidentId + "'. Topic: " + msg.topic()
+            log.debug("Consumed '" + messageType + "' message for incident '" + incidentId + "'. Topic: " + msg.topic()
                     + " ,  partition: " + msg.partition() + ", offset: " + msg.offset());
 
             vertx.eventBus().send("incident-assignment-event", body);

diff --git a/src/main/java/com/redhat/cajun/navy/incident/priority/RulesVerticle.java b/src/main/java/com/redhat/cajun/navy/incident/priority/RulesVerticle.java
@@ -96,8 +96,10 @@ private void incidentPriority(Message<JsonObject> message) {
         } else {
             average = ((AveragePriority)row.get("averagePriority")).getAveragePriority();
         }
+
+        results = ksession.getQueryResults("incidents");
         JsonObject jsonObject = new JsonObject().put("incidentId", incidentId).put("priority", priority)
-                .put("average", average);
+                .put("average", average).put("incidents", results.size());
         message.reply(jsonObject);
     }
 

diff --git a/src/main/resources/com/redhat/cajun/navy/incident/priority/rules/priority_rules.drl b/src/main/resources/com/redhat/cajun/navy/incident/priority/rules/priority_rules.drl
@@ -86,4 +86,8 @@ end
 
 query "averagePriority"
    averagePriority : AveragePriority( )
+end
+
+query "incidents"
+   incidentPriority: IncidentPriority()
 end
diff --git a/src/test/java/com/redhat/cajun/navy/incident/priority/rules/PriorityRulesTest.java b/src/test/java/com/redhat/cajun/navy/incident/priority/rules/PriorityRulesTest.java
@@ -76,6 +76,8 @@ public void testIncreaseIncidentPriority() {
         assertThat(row.get("incidentPriority"), notNullValue());
         assertThat(row.get("incidentPriority"), is(instanceOf(IncidentPriority.class)));
         assertThat(((IncidentPriority)row.get("incidentPriority")).getPriority(), equalTo(1));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(1));
     }
 
     @Test
@@ -86,6 +88,8 @@ public void testRetractIncidentPriority() {
         session.fireAllRules();
         QueryResults results = session.getQueryResults("incidentPriority", "incident123");
         assertThat(results.size(), equalTo(0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(0));
     }
 
     @Test
@@ -99,6 +103,8 @@ public void testAveragePriority1() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(1.0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(1));
     }
 
     @Test
@@ -112,6 +118,8 @@ public void testAveragePriority2() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(1.0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(1));
     }
 
     @Test
@@ -127,6 +135,8 @@ public void testAveragePriority3() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(0.0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(0));
     }
 
     @Test
@@ -142,6 +152,8 @@ public void testAveragePriority4() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(1.0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(2));
     }
 
     @Test
@@ -159,6 +171,8 @@ public void testAveragePriority5() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(1.5));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(2));
     }
 
     @Test
@@ -178,6 +192,8 @@ public void testAveragePriority6() {
         assertThat(row.get("averagePriority"), notNullValue());
         assertThat(row.get("averagePriority"), is(instanceOf(AveragePriority.class)));
         assertThat(((AveragePriority)row.get("averagePriority")).getAveragePriority(), equalTo(2.0));
+        QueryResults incidents = session.getQueryResults("incidents");
+        assertThat(incidents.size(), equalTo(1));
     }
 
     private static KieBase setupKieBase(String... resources) {