Commit 1e9f2de0 authored by Shaphen Pangburn's avatar Shaphen Pangburn

Merge branch 'order-history-display' into 'Dev'

order history displays in reverse chronological order, order service reaches correct OMS endpoint

See merge request !30
parents ee17f19c f3f7ed64
......@@ -102,7 +102,7 @@ public class OrderService {
}
public Flux<Order> getOrderFromOmsAPI(String userId){
return WebClient.create(String.format("%s/api/orders/byCustomer/%s", orderManagementUrl,userId))
return WebClient.create(String.format("%s/api/orders/customer/%s", orderManagementUrl,userId))
.get()
.retrieve()
.bodyToFlux(Order.class);
......
......@@ -8,10 +8,12 @@ spring.data.mongodb.database=e-commerce-db
security.enable-csrf=false
server.port=8080
products.apiUrl=http://13.64.175.185:8080
promos.apiUrl=http://40.118.215.99:8082
orders.apiUrl=http://138.91.251.222:8086
# UNCOMMENT FOR PRODUCTION DEPLOYMENT
#products.apiUrl=http://13.64.175.185:8080
#promos.apiUrl=http://40.118.215.99:8082
#orders.apiUrl=http://138.91.251.222:8086
#products.apiUrl=http://localhost:8083
#promos.apiUrl=http://localhost:8082
#orders.apiUrl=http://localhost:8084
# UNCOMMENT FOR LOCAL TESTING
products.apiUrl=http://localhost:8083
promos.apiUrl=http://localhost:8082
orders.apiUrl=http://localhost:8084
......@@ -29,7 +29,7 @@ const OrderHistory = () => {
<div>Please login to place orders!</div>
) : null}
<div id="orders">
{orderHistory.map((order, ind) => {
{orderHistory.reverse().map((order, ind) => {
return <Order order={order} key={ind} alt={ind}/>;
})}
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment