Merge branch 'master' into kafka

.gitignore

@@ -33,3 +33,4 @@ build/
 .vscode/
 
 /frontend/node_modules/
+/frontend/src/config/
\ No newline at end of file

README.md

@@ -38,3 +38,6 @@
 - Order status update screen mark orders as fulfilled or cancelled
 - Order search
 - Order information page
+
+#### API Documentation
+https://documenter.getpostman.com/view/7402212/TzRNGATe

frontend/package.json

@@ -9,6 +9,7 @@
     "axios": "^0.21.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-google-login": "^5.2.2",
     "react-icons": "^4.2.0",
     "react-redux": "^7.2.4",
     "react-scripts": "4.0.3",

frontend/src/App.jsx

+import Login from "./components/session/Login";
+import Logout from "./components/session/Logout";
 import Header from "./components/header/Header";
 import Footer from "./components/footer/Footer";
 import OrderIndex from "./components/order/OrderIndex"
@@ -5,6 +7,8 @@ import OrderIndex from "./components/order/OrderIndex"
 const App = () => {
   return (
     <div className="app">
+      <Login />
+      <Logout />
       <Header />
       <OrderIndex />
       <Footer />

frontend/src/actions/order_actions.js

@@ -4,9 +4,9 @@ export const RECEIVE_ORDERS = 'RECEIVE_ORDERS';
 export const RECEIVE_ORDER = 'RECEIVE_ORDER';
 export const UPDATE_ORDER = 'UPDATE_ORDER';
 
-const receiveOrders = (payload) => ({
+const receiveOrders = (orders) => ({
   type: RECEIVE_ORDERS,
-  payload,
+  orders,
 })
 
 const receiveOrder = (order) => ({
@@ -32,8 +32,9 @@ export const createOrder = (order) => (dispatch) =>
       dispatch(receiveOrder(res))
     });
 
-export const editOrder = (order) => (dispatch) =>
+export const editOrder = (order) => (dispatch) => {
   OrderAPIUtil.editOrder(order)
     .then(res => {
       dispatch(updateOrder(res))
     });
+}
\ No newline at end of file

frontend/src/components/order/OrderButtons.jsx

+import React from "react";
+import { connect } from "react-redux";
+import { editOrder } from "../../actions/order_actions";
+
+const OrderButtons = ({ order, editOrder }) => {
+
+  // const { id, orderId, status, orderItems, createdAt, modifiedAt } = order;
+
+  const handleUpdate = (action) => {
+    console.log(action);
+    if (action === "FULFILL") {
+      editOrder({ ...order, status: "FULFILLED"})
+    } else if (action === "CANCEL") {
+      editOrder({ ...order, status: "CANCELLED" });
+    }
+  }
+
+  const fulfill = (
+    <button onClick={() => handleUpdate("FULFILL")}>Fulfill</button>
+  )
+
+  const cancel = (
+    <button onClick={() => handleUpdate("CANCEL")}>Cancel</button>
+  )
+  return (
+    <div>
+      {fulfill} {cancel}
+    </div>
+  );
+};
+const mapStateToProps = (state) => ({});
+
+const mapDispatchToProps = (dispatch) => ({
+  editOrder: (order) => dispatch(editOrder(order)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(OrderButtons);

frontend/src/components/order/OrderIndex.jsx

@@ -23,17 +23,16 @@ const OrderIndex = ({
       <h1>Order Index</h1>
       <button onClick={createOrder}>Create New Order</button>
       <button onClick={editOrder}>Update Order</button>
-      {orders.allIds.map(orderId => {
+
+      <br />
+      <br />
+
+      {orders.allIds.map((orderId) => {
         const order = orders.byId[orderId];
-        return (
-          <OrderIndexItem 
-            key={order.id} 
-            order={order}
-          />
-        )
+        return <OrderIndexItem key={order.id} order={order} />;
       })}
     </div>
-  )
+  );
 
 }
 

frontend/src/components/order/OrderIndexItem.jsx

 import React from 'react';
+import OrderButtons from './OrderButtons';
 
 const OrderIndexItem = ({ order }) => {
 
+  const { 
+    id,
+    orderId, 
+    status, 
+    orderItems, 
+    createdAt, 
+    modifiedAt
+  } = order;
+
+  const actions = ( status === "RECEIVED" ? 
+    <OrderButtons order={order} />
+  : 
+  <div>{status}</div>)
+
   return (
     <div>
-      {order.orderId} {order.status}
+      <div>{`Order #: ${orderId}`}</div>
+      {actions}
+      
     </div>
   )
 };

frontend/src/components/session/Login.jsx

+import React from 'react';
+import { GoogleLogin } from "react-google-login";
+import keys from '../../config/keys_dev'
+
+const clientId = keys.clientId;
+
+const Login = () => {
+
+  const responseGoogle = (response) => {
+    console.log(response);
+  };
+  
+  return (
+    <div>
+      <GoogleLogin
+        clientId={clientId}
+        buttonText="Login with Google"
+        onSuccess={responseGoogle}
+        onFailure={responseGoogle}
+        cookiePolicy={"single_host_origin"}
+        // isSignedIn={true}
+      />
+    </div>
+  );
+}
+
+export default Login;
\ No newline at end of file

frontend/src/components/session/Logout.jsx

+import React from "react";
+import { GoogleLogout } from "react-google-login";
+import keys from "../../config/keys_dev";
+
+const clientId = keys.clientId;
+
+const Logout = () => {
+  
+  const responseGoogle = (response) => {
+    console.log(response);
+  };
+
+  return (
+    <div>
+      <GoogleLogout 
+        clientId={clientId}
+        buttonText="Logout"
+        onLogoutSuccess={responseGoogle}
+        isSignedIn={true}
+      />
+    </div>
+  );
+};
+
+export default Logout;

frontend/src/reducers/entities/orders_reducer.js

@@ -16,10 +16,18 @@ const OrdersReducer = (oldState = initialState, action) => {
   
   switch (action.type) {
     case RECEIVE_ORDERS:
-      return action.payload;
+      const orderState = {
+        byId: {},
+        allIds: [],
+      };
+      Object.keys(action.orders).forEach( wareId => {
+        orderState.allIds.push(wareId);
+        orderState.byId[wareId] = action.orders[wareId];
+      })
+      return orderState;
     case RECEIVE_ORDER:
       newState.byId[order.id] = order;
-      newState.allIds.unshift(order.id);
+      newState.allIds.push(order.id);
       return newState;
     case UPDATE_ORDER:
       newState.byId[order.id] = order;

frontend/src/util/orders_api_util.jsx

 // import axios from 'axios';
 
+const RECEIVED = "RECEIVED";
+// const FULFILLED = "FULFILLED";
+// const CANCELLED = "CANCELLED";
+
 const sampleGetAll = {
-  allIds: ["1", "2", "3"],
-  byId: {
-    "1": {
+  // allIds: ["1", "2", "3"],
+  // byId: {
+  1: {
     id: "1",
     orderId: "o1",
-      status: "unfulfilled",
+    status: RECEIVED,
+    orderItems: [
+      {
+        itemId: "17",
+        itemName: "Item 1",
+        itemQuantity: 4,
+        itemPrice: 17.99,
+        itemSku: 8765309,
+      },
+      {
+        itemId: "18",
+        itemName: "Item 2",
+        itemQuantity: 42,
+        itemPrice: 17.99,
+        itemSku: 8715309,
       },
-    "2": {
+    ],
+  },
+  2: {
     id: "2",
     orderId: "o2",
-      status: "unfulfilled",
+    status: RECEIVED,
+    orderItems: [
+      {
+        itemId: "17",
+        itemName: "Item 1",
+        itemQuantity: 3,
+        itemPrice: 17.99,
+        itemSku: 8765309,
+      },
+      {
+        itemId: "18",
+        itemName: "Item 2",
+        itemQuantity: 41,
+        itemPrice: 17.99,
+        itemSku: 8715309,
       },
-    "3": {
+    ],
+  },
+  3: {
     id: "3",
     orderId: "o3",
-      status: "unfulfilled",
+    status: RECEIVED,
+    orderItems: [
+      {
+        itemId: "17",
+        itemName: "Item 1",
+        itemQuantity: 2,
+        itemPrice: 17.99,
+        itemSku: 8765309,
+      },
+      {
+        itemId: "18",
+        itemName: "Item 2",
+        itemQuantity: 40,
+        itemPrice: 17.99,
+        itemSku: 8715309,
       },
+    ],
   },
+  // },
 };
 
 const sampleNew = {
   id: "4",
   orderId: "o4",
-  status: "unfulfilled",
-};
-
-const sampleUpdateFul = {
-  id: "3",
-  orderId: "o3",
-  status: "fulfilled",
-};
-
-const sampleUpdateCan = {
-  id: "2",
-  orderId: "o2",
-  status: "cancelled",
+  status: RECEIVED,
 };
 
 const getAllPromise = new Promise( (resolve, reject) => {
@@ -45,12 +85,6 @@ const getAllPromise = new Promise( (resolve, reject) => {
 const createNewPromise = new Promise( (resolve, reject) => {
   resolve(sampleNew)
 })
-const updateFulfillPromise = new Promise( (resolve, reject) => {
-  resolve(sampleUpdateFul)
-})
-const updateCancelPromise = new Promise( (resolve, reject) => {
-  resolve(sampleUpdateCan)
-})
 
 export const getOrders = () => {
   return getAllPromise;
@@ -61,7 +95,9 @@ export const createOrder = (order) => {
 }
 
 export const editOrder = (order) => {
-  return updateFulfillPromise;
+  return new Promise( (resolve, reject) => {
+    resolve(order);
+  })
 }
 
 // export const getOrders =() => {

pom.xml

@@ -63,7 +63,17 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency> <groupId>org.mongodb</groupId> <artifactId>mongodb-driver-sync</artifactId> <version>4.0.5</version> </dependency>
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-sync</artifactId>
+			<version>4.0.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/ascendfinalproject/warehouse/controllers/WarehouseController.java

@@ -14,14 +14,28 @@ public class WarehouseController {
   @Autowired
   WarehouseOrderService orderService;
 
+  @CrossOrigin
   @GetMapping(value = "/orders")
   public Flux<WarehouseOrder> getOrders() {
     return orderService.getOrders();
   }
 
+  @CrossOrigin
+  @GetMapping("/orders/{id}")
+  public Mono<WarehouseOrder> findStudent(@PathVariable String id){
+    return orderService.findOrderById(id);
+  }
+
+  @CrossOrigin
   @PostMapping(value = "/orders")
   public Mono<WarehouseOrder> createOrder(@RequestBody WarehouseOrder order) {
     return orderService.createOrder(order);
   }
 
+  @CrossOrigin
+  @PutMapping(value = "/orders/{id}")
+  public Mono<WarehouseOrder> updateOrder(@RequestBody WarehouseOrder order, @PathVariable(value = "id") String id) {
+    return orderService.updateOrder(order, id);
+  }
+
 }

src/main/java/com/ascendfinalproject/warehouse/models/OrderResponse.java

+package com.ascendfinalproject.warehouse.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+@Setter
+public class OrderResponse {
+
+    private List<String> allIds;
+    private HashMap<String, WarehouseOrder> byId;
+
+    public void appendId(String id) {
+        allIds.add(id);
+    }
+
+}

src/main/java/com/ascendfinalproject/warehouse/services/WarehouseOrderService.java

@@ -3,7 +3,6 @@ package com.ascendfinalproject.warehouse.services;
 import com.ascendfinalproject.warehouse.models.WarehouseOrder;
 import com.ascendfinalproject.warehouse.repositories.WarehouseOrderRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -14,12 +13,34 @@ public class WarehouseOrderService {
   @Autowired
   WarehouseOrderRepository orderRepository;
 
+  public Mono<WarehouseOrder> findOrderById(String id) {
+    return orderRepository.findById(id);
+  }
+
   public Flux<WarehouseOrder> getOrders() {
       return orderRepository.findAll();
+//    OrderResponse response = new OrderResponse();
+//    orderRepository.findAll()
+//            .flatMap(order -> {
+//              response.appendId(order.getId());
+//              response.getById().put(order.getId(), order);
+//            });
+//
+//    return response;
   }
 
   public Mono<WarehouseOrder> createOrder(WarehouseOrder order) {
     return orderRepository.save(order);
   }
 
+  public Mono<WarehouseOrder> updateOrder(WarehouseOrder order, String id) {
+    return orderRepository.findById(id)
+            .flatMap(existingOrder -> {
+              existingOrder.setOrderId(order.getOrderId());
+              existingOrder.setStatus(order.getStatus());
+              return orderRepository.save(existingOrder);
+            });
+
+  }
+
 }