From 769af6759ed6dca02d6c8732f2627e11e5f66a48 Mon Sep 17 00:00:00 2001
From: Steven van Beelen <steven.vanbeelen@axoniq.io>
Date: Thu, 27 Dec 2018 10:39:42 +0100
Subject: [PATCH] BAEL-2435 Introduce Query message logic

Introduce a FindAllOrderedProductsQuery query message, which is
published on the QueryGateway through the OrderRestEndpoint and handled
by the OrderedProductsEventHandler
---
 .../queries/FindAllOrderedProductsQuery.java     |  5 +++++
 .../com/baeldung/axon/gui/OrderRestEndpoint.java | 16 +++++++++++++++-
 .../querymodel/OrderedProductsEventHandler.java  | 11 ++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 axon/src/main/java/com/baeldung/axon/coreapi/queries/FindAllOrderedProductsQuery.java

diff --git a/axon/src/main/java/com/baeldung/axon/coreapi/queries/FindAllOrderedProductsQuery.java b/axon/src/main/java/com/baeldung/axon/coreapi/queries/FindAllOrderedProductsQuery.java
new file mode 100644
index 0000000000..9d6ca2cfb2
--- /dev/null
+++ b/axon/src/main/java/com/baeldung/axon/coreapi/queries/FindAllOrderedProductsQuery.java
@@ -0,0 +1,5 @@
+package com.baeldung.axon.coreapi.queries;
+
+public class FindAllOrderedProductsQuery {
+
+}
diff --git a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
index 3c86f9c3b1..3b8be0bc46 100644
--- a/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
+++ b/axon/src/main/java/com/baeldung/axon/gui/OrderRestEndpoint.java
@@ -1,14 +1,20 @@
 package com.baeldung.axon.gui;
 
+import java.util.List;
 import java.util.UUID;
 
 import org.axonframework.commandhandling.gateway.CommandGateway;
+import org.axonframework.messaging.responsetypes.ResponseTypes;
+import org.axonframework.queryhandling.QueryGateway;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.baeldung.axon.coreapi.commands.ConfirmOrderCommand;
 import com.baeldung.axon.coreapi.commands.PlaceOrderCommand;
 import com.baeldung.axon.coreapi.commands.ShipOrderCommand;
+import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
+import com.baeldung.axon.coreapi.queries.OrderedProduct;
 
 @RestController
 public class OrderRestEndpoint {
@@ -16,9 +22,11 @@ public class OrderRestEndpoint {
     private static final String DEFAULT_PRODUCT = "Deluxe Chair";
 
     private final CommandGateway commandGateway;
+    private final QueryGateway queryGateway;
 
-    public OrderRestEndpoint(CommandGateway commandGateway) {
+    public OrderRestEndpoint(CommandGateway commandGateway, QueryGateway queryGateway) {
         this.commandGateway = commandGateway;
+        this.queryGateway = queryGateway;
     }
 
     @PostMapping("/ship-order")
@@ -37,4 +45,10 @@ public class OrderRestEndpoint {
         commandGateway.send(new ShipOrderCommand(orderId));
     }
 
+    @GetMapping("/all-orders")
+    public List<OrderedProduct> findAllOrderedProducts() {
+        return queryGateway.query(new FindAllOrderedProductsQuery(), ResponseTypes.multipleInstancesOf(OrderedProduct.class))
+            .join();
+    }
+
 }
diff --git a/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java b/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
index 7bcdb27af7..c2bf48614b 100644
--- a/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
+++ b/axon/src/main/java/com/baeldung/axon/querymodel/OrderedProductsEventHandler.java
@@ -1,15 +1,19 @@
 package com.baeldung.axon.querymodel;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Service;
 
-import com.baeldung.axon.coreapi.queries.OrderedProduct;
 import com.baeldung.axon.coreapi.events.OrderConfirmedEvent;
 import com.baeldung.axon.coreapi.events.OrderPlacedEvent;
 import com.baeldung.axon.coreapi.events.OrderShippedEvent;
+import com.baeldung.axon.coreapi.queries.FindAllOrderedProductsQuery;
+import com.baeldung.axon.coreapi.queries.OrderedProduct;
 
 @Service
 public class OrderedProductsEventHandler {
@@ -39,4 +43,9 @@ public class OrderedProductsEventHandler {
         });
     }
 
+    @QueryHandler
+    public List<OrderedProduct> handle(FindAllOrderedProductsQuery query) {
+        return new ArrayList<>(orderedProducts.values());
+    }
+
 }
\ No newline at end of file