[SAH-60]: Implement Order Processing Validation

apps/agent/src/pages/_app.tsx

@@ -6,6 +6,7 @@ import Layout from "@/Layout/layout";
 import { createApolloClient } from "@sahil/lib/graphql";
 
 const graphqlUri = process.env.NEXT_PUBLIC_HASURA_GRAPHQL_ENDPOINT;
+const ws = process.env.NEXT_PUBLIC_HASURA_GRAPHQL_WS;
 
 const httpOptions = {
   headers: {
@@ -17,6 +18,7 @@ const httpOptions = {
 const client = createApolloClient({
   uri: graphqlUri,
   httpOptions,
+  ws: ws as string,
 });
 
 export default function App({

apps/api/src/middleware/zodValidate.ts

@@ -24,6 +24,7 @@ export const validate =
 
       next();
     } catch (error) {
+      console.error(error);
       // @ts-ignore
       return res.status(400).send(error.errors);
     }

apps/api/src/orders/router.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Response, Router, Request } from "express";
 import { pushIntoOrders } from "../enqueue";
-import { object, z } from "zod";
+import { z } from "zod";
 import { logger } from "../lib/winston";
 import { logRequest } from "../middleware/requestLogger";
 import { validate } from "../middleware/zodValidate";
@@ -10,34 +10,29 @@ import { processOrder } from "./operations/processOrder";
 const ordersRouter = Router();
 
 const orderSchema = z.object({
-  orderId: z.string(),
+  customerId: z.string(),
+  order_items: z.object({
+    data: z
+      .object({
+        productId: z.string(),
+        price: z.number(),
+        quantity: z.number(),
+      })
+      .array(),
+  }),
 });
 
 ordersRouter.use(logRequest);
 
-type OrdersActionType = {
-  created_at: Date;
-  customerId: string;
-  destination: string;
-  id: string;
-  orderId: string;
-  origin: string;
-  processedBy: string;
-};
-
-// place an order
 ordersRouter.post(
   "/",
   validate(orderSchema),
-  async (req: Request, res: Response<OrdersActionType>, next: NextFunction) => {
+  async (req: Request, res: Response, next: NextFunction) => {
     try {
-      // @ts-ignore
-      const order = await initOrder(req.locals);
-
-      // push into Queue
-      await pushIntoOrders(req.body);
-      res.send({
-        ...order,
+      const { object } = req.body.input;
+      await pushIntoOrders(object);
+      return res.status(200).json({
+        order: object,
       });
     } catch (error) {
       next(error);

apps/client/src/Products/ProductsCatalogue.tsx

@@ -16,6 +16,7 @@ import {
   HiArrowPath,
   HiSignalSlash,
 } from "react-icons/hi2";
+import { Products } from "@sahil/lib/graphql/__generated__/graphql";
 
 export const ProductsCatalogue = () => {
   const [offset, setOffset] = useState(0);
@@ -38,8 +39,7 @@ export const ProductsCatalogue = () => {
   );
 
   useEffect(() => {
-    // @ts-ignore
-    setProducts(products);
+    setProducts(products as Products[]);
   }, [products, setProducts]);
 
   if (error) {
@@ -100,7 +100,7 @@ export const ProductsCatalogue = () => {
         sizeLabel="Products"
       />
       <List
-        data={products}
+        data={products as Products[]}
         error={error}
         loading={loading}
         cols={4}

apps/client/src/hooks/orders.ts

@@ -1,11 +1,17 @@
-import { useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery, useSubscription } from "@apollo/client";
 import {
   FETCH_ORDERS,
   FETCH_ORDER_BY_PK,
   INSERT_NEW_ORDER,
   FETCH_ORDER_DELIVERIES,
   FETCH_ORDERS_STATS,
+  INIT_ORDER_ACTION,
+  GET_ORDER_VALIDATION,
 } from "@sahil/lib/graphql";
+import {
+  InsertBusinessOrderMutation,
+  InsertBusinessOrderMutationVariables,
+} from "@sahil/lib/graphql/__generated__/graphql";
 
 export const useFetchOrders = () => {
   const { error, data, loading } = useQuery(FETCH_ORDERS);
@@ -27,9 +33,12 @@ export const useFetchOrderByPK = (id: string) => {
 };
 
 export const usePlaceBusinessOrder = () => {
-  const [placeOrder, { data, loading, error }] = useMutation(INSERT_NEW_ORDER);
+  const [placeOrder, { data, loading, error }] = useMutation<
+    InsertBusinessOrderMutation,
+    InsertBusinessOrderMutationVariables
+  >(INSERT_NEW_ORDER);
 
-  return { loading, placeOrder, error };
+  return { data, loading, placeOrder, error };
 };
 
 export const useFetchOrderDeliveriesByPK = (id: string) => {
@@ -46,3 +55,20 @@ export const useGetOrdersStats = () => {
 
   return { error, ordersCount: data?.orders_aggregate?.aggregate, loading };
 };
+
+export const useInitBusinessOrder = () => {
+  const [initOrder, { data, loading, error }] = useMutation(INIT_ORDER_ACTION);
+
+  return { data, loading, error, initOrder };
+};
+
+export const useOrderValidSubscription = (actionId: string) => {
+  const { data, loading, error } = useSubscription(GET_ORDER_VALIDATION, {
+    variables: {
+      id: actionId,
+    },
+    skip: !actionId,
+  });
+
+  return { data, loading, error };
+};

apps/client/src/hooks/products.ts

@@ -6,6 +6,8 @@ import { useRouter } from "next/router";
 import {
   GetProductsByNameQuery,
   GetProductsByNameQueryVariables,
+  GetProductsQuery,
+  GetProductsQueryVariables,
 } from "@sahil/lib/graphql/__generated__/graphql";
 
 export const useFetchProducts = ({
@@ -21,8 +23,8 @@ export const useFetchProducts = ({
   const graphqlQuery = name ? FETCH_PRODUCTS_BY_NAME : FETCH_PRODUCTS;
 
   const { error, data, loading } = useQuery<
-    GetProductsByNameQuery,
-    GetProductsByNameQueryVariables
+    GetProductsQuery | GetProductsByNameQuery,
+    GetProductsQueryVariables | GetProductsByNameQueryVariables
   >(graphqlQuery, {
     variables: {
       offset,

apps/client/src/hooks/useOrderItemsStore.ts

@@ -1,17 +1,13 @@
 import { create } from "zustand";
-
-type OrderItem = {
-  productId: string;
-  quantity: number;
-};
+import { Order_Item, Products } from "@sahil/lib/graphql/__generated__/graphql";
 
 type OrderItemsStore = {
-  orderItems: OrderItem[];
-  products: any[];
-  addOrderItem: (item: OrderItem) => void;
-  removeOrderItem: (item: OrderItem) => void;
-  updateOrderItem: (item: OrderItem) => void;
-  setProducts: (products: any[]) => void;
+  orderItems: Order_Item[];
+  products: Products[];
+  addOrderItem: (item: Order_Item) => void;
+  removeOrderItem: (item: Order_Item) => void;
+  updateOrderItem: (item: Order_Item) => void;
+  setProducts: (products: Products[]) => void;
 };
 
 const INITIAL_STATE = {

apps/client/src/pages/_app.tsx

@@ -5,6 +5,7 @@ import { ApolloProvider } from "@apollo/client";
 import { createApolloClient } from "@sahil/lib/graphql";
 
 const graphqlUri = process.env.NEXT_PUBLIC_HASURA_GRAPHQL_ENDPOINT;
+const ws = process.env.NEXT_PUBLIC_HASURA_GRAPHQL_WS;
 
 const httpOptions = {
   headers: {
@@ -16,6 +17,7 @@ const httpOptions = {
 const client = createApolloClient({
   uri: graphqlUri as string,
   httpOptions,
+  ws: ws as string,
 });
 
 export default function App({ Component, pageProps }: AppProps) {