fix: commit history

Author: HarshPatel5940

.DS_Store

@@ -0,0 +1,20 @@
+meta {
+  name: Create an Order
+  type: http
+  seq: 11
+}
+
+post {
+  url: http://localhost:3030/api/v1/order/01F8MECHZX3TBDSZ7XRADM79XE/newitem
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "itemID": "df",
+     "itemName": "Pizza",
+      "quantity": 2,
+    "pricePerUnit": 10
+  }
+}

backend/Bruno/Create an Order.bru

@@ -0,0 +1,22 @@
+meta {
+  name: Get all Order
+  type: http
+  seq: 10
+}
+
+get {
+  url: http://localhost:3030/api/v1/order
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    "id": "01F8MECHZX3TBDSZ7XRADM79XJ",
+    "name": "Pav Bhaji",
+    "description": "This is awesome.",
+    "imageUrl": "https://example.com/image.jpg",
+    "price": 80,
+    "isDeleted": true
+  }
+}

backend/Bruno/Get all Order.bru

@@ -11,10 +11,12 @@
     "mongodb": "^6.13.1",
     "node-cache": "^5.1.2",
     "ulid": "^2.3.0",
+    "ws": "^8.18.1",
     "zod": "^3.24.2"
   },
   "devDependencies": {
     "@types/node": "^20.11.17",
+    "@types/ws": "^8.5.14",
     "tsx": "^4.7.1"
   },
   "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"

backend/package.json

@@ -2,7 +2,6 @@ import type { Context } from "hono";
 import { userSchema, type UserType } from "./user.schema";
 import db from "../../db";
 import { BackendError } from "../../utils/errors";
-import { ObjectId } from "mongodb";
 
 export async function handleCreateUser(c: Context) {
   try {
@@ -34,7 +33,7 @@ export async function handleGetUserDetails(c: Context) {
     const userId = c.req.param("user");
     const user = await (await db())
       .collection<UserType>("users")
-      .findOne({ _id: new ObjectId(userId) });
+      .findOne({ userID: userId });
     if (!user) {
       throw new BackendError("NOT_FOUND", { message: "User not found" });
     }
@@ -51,7 +50,7 @@ export async function handleUpdateUser(c: Context) {
     const user = await userSchema.parseAsync(body);
     const result = await (await db())
       .collection<UserType>("users")
-      .updateOne({ _id: new ObjectId(userId) }, { $set: user });
+      .updateOne({ userID: userId }, { $set: user });
     if (result.matchedCount === 0) {
       throw new BackendError("NOT_FOUND", { message: "User not found" });
     }
@@ -66,7 +65,7 @@ export async function handleDeleteUser(c: Context) {
     const userId = c.req.param("user");
     const result = await (await db())
       .collection<UserType>("users")
-      .deleteOne({ _id: new ObjectId(userId) });
+      .deleteOne({ userID: userId });
     if (result.deletedCount === 0) {
       throw new BackendError("NOT_FOUND", { message: "User not found" });
     }

backend/pnpm-lock.yaml

@@ -1,21 +1,9 @@
 import { z } from "zod";
 
-import { ObjectId } from "mongodb";
-
-const objectIdSchema = z.custom<ObjectId>(
-  (val) => {
-    return ObjectId.isValid(val);
-  },
-  {
-    message: "Invalid ObjectId",
-  },
-);
-
 export const userSchema = z.object({
-  id: objectIdSchema.optional(),
+  id: z.string().ulid().optional(),
   userID: z.string().uuid(),
   userEmail: z.string().email(),
-
   userOrder: z.array(z.string()),
 });
 

backend/src/controller/auth/user.controller.ts

@@ -1,8 +1,8 @@
 import type { Context } from "hono";
-import { orderSchema, type OrderType } from "./order.schema";
+import { itemSchema, orderSchema, type OrderType } from "./order.schema";
 import db from "../../db";
 import { BackendError } from "../../utils/errors";
-import { ObjectId } from "mongodb";
+import { notifyNewOrder } from "../vendor/websocket";
 
 export async function handleCreateOrder(c: Context) {
   try {
@@ -11,12 +11,54 @@ export async function handleCreateOrder(c: Context) {
     const data = await (await db())
       .collection<OrderType>("orders")
       .insertOne(order);
+
+    await notifyNewOrder(order);
+
     return c.json({ success: true, data });
   } catch (error) {
     throw new BackendError("VALIDATION_ERROR", { details: error });
   }
 }
 
+export async function handleNewItem(c: Context) {
+  const orderId = c.req.param("order");
+  const body = await c.req.json();
+  const item = await itemSchema.parseAsync(body);
+
+  const order = await (await db())
+    .collection<OrderType>("orders")
+    .findOne({ orderID: orderId });
+
+  if (!order) {
+    throw new BackendError("NOT_FOUND", { message: "Order not found" });
+  }
+
+  if (!order.orderItems) {
+    order.orderItems = [];
+  }
+
+  const existingItem = order.orderItems.find(
+    (i) => i.itemName === item.itemName,
+  );
+
+  if (existingItem) {
+    existingItem.quantity += item.quantity;
+  } else {
+    order.orderItems.push(item);
+  }
+
+  await (await db())
+    .collection<OrderType>("orders")
+    .updateOne(
+      { orderID: orderId },
+      { $set: { orderItems: order.orderItems } },
+    );
+
+  await notifyNewOrder(order);
+
+  return c.json({ success: true, data: order });
+}
+
 export async function handleGetAllOrders(c: Context) {
   try {
     const orders = await (await db())
@@ -34,7 +76,7 @@ export async function handleGetOrderDetails(c: Context) {
     const orderId = c.req.param("order");
     const order = await (await db())
       .collection<OrderType>("orders")
-      .findOne({ _id: new ObjectId(orderId) });
+      .findOne({ orderID: orderId });
     if (!order) {
       throw new BackendError("NOT_FOUND", { message: "Order not found" });
     }
@@ -51,7 +93,7 @@ export async function handleUpdateOrder(c: Context) {
     const order = await orderSchema.parseAsync(body);
     const result = await (await db())
       .collection<OrderType>("orders")
-      .updateOne({ _id: new ObjectId(orderId) }, { $set: order });
+      .updateOne({ orderID: orderId }, { $set: order });
     if (result.matchedCount === 0) {
       throw new BackendError("NOT_FOUND", { message: "Order not found" });
     }
@@ -66,7 +108,7 @@ export async function handleDeleteOrder(c: Context) {
     const orderId = c.req.param("order");
     const result = await (await db())
       .collection<OrderType>("orders")
-      .deleteOne({ _id: new ObjectId(orderId) });
+      .deleteOne({ orderID: orderId });
     if (result.deletedCount === 0) {
       throw new BackendError("NOT_FOUND", { message: "Order not found" });
     }

backend/src/controller/auth/user.schema.ts

@@ -1,32 +1,22 @@
-import { ObjectId } from "mongodb";
 import { z } from "zod";
 
 export const itemSchema = z.object({
-  itemID: z.string().ulid(),
+  itemID: z.string(),
   itemName: z.string().min(2).max(100),
   quantity: z.number().min(1),
   pricePerUnit: z.number().min(0),
+  note: z.string().optional().default(""),
 });
 
-const objectIdSchema = z.custom<ObjectId>(
-  (val) => {
-    return ObjectId.isValid(val);
-  },
-  {
-    message: "Invalid ObjectId",
-  },
-);
-
 export const orderSchema = z.object({
-  id: objectIdSchema.optional(),
+  id: z.string().ulid().optional(),
+  vendorID: z.string().ulid().optional(),
+  tableID: z.string().uuid(),
   orderID: z.string().ulid(),
   orderItems: z.array(itemSchema).min(1),
-
   isPriceCalculated: z.boolean().default(false),
-  orderPrice: z.number().min(0),
-
+  orderPrice: z.number().min(0).optional().default(0),
   isPaid: z.boolean().default(false),
-
   createdAt: z.date().default(new Date()),
   updatedAt: z.date().default(new Date()),
   deletedAt: z.date().optional().nullable().default(null),

backend/src/controller/orders/order.controller.ts

@@ -6,9 +6,7 @@ import {
 } from "./vendor.schema";
 import db from "../../db";
 import { BackendError } from "../../utils/errors";
-import { ObjectId } from "mongodb";
 import { ZodError } from "zod";
-import type { itemType } from "../orders/order.schema";
 import { ulid } from "ulid";
 
 export async function handleCreateVendor(c: Context) {
@@ -47,7 +45,7 @@ export async function handleGetVendorDetails(c: Context) {
     const vendorId = c.req.param("vendor");
     const vendor = await (await db())
       .collection<VendorType>("vendors")
-      .findOne({ _id: new ObjectId(vendorId), isDeleted: false });
+      .findOne({ id: vendorId, isDeleted: false });
     if (!vendor) {
       throw new BackendError("NOT_FOUND", { message: "Vendor not found" });
     }
@@ -67,7 +65,7 @@ export async function handleUpdateVendor(c: Context) {
     const vendor = await vendorSchema.parseAsync(body);
     const result = await (await db())
       .collection<VendorType>("vendors")
-      .updateOne({ _id: new ObjectId(vendorId) }, { $set: vendor });
+      .updateOne({ id: vendorId }, { $set: vendor });
     if (result.matchedCount === 0) {
       throw new BackendError("NOT_FOUND", { message: "Vendor not found" });
     }
@@ -86,7 +84,7 @@ export async function handleDeleteVendor(c: Context) {
     const result = await (await db())
       .collection<VendorType>("vendors")
       .updateOne(
-        { _id: new ObjectId(vendorId) },
+        { id: vendorId },
         { $set: { isDeleted: true, deletedAt: new Date() } },
       );
     if (result.matchedCount === 0) {
@@ -110,7 +108,7 @@ export async function handleCreateVendorItem(c: Context) {
 
     const vendor = await (await db())
       .collection("vendors")
-      .findOne({ _id: new ObjectId(vendorId), isDeleted: false });
+      .findOne({ id: vendorId, isDeleted: false });
     if (!vendor) {
       throw new BackendError("NOT_FOUND", { message: "Vendor not found" });
     }
@@ -120,10 +118,7 @@ export async function handleCreateVendorItem(c: Context) {
 
     await (await db())
       .collection("vendors")
-      .updateOne(
-        { _id: new ObjectId(vendorId) },
-        { $set: { items: vendorItems } },
-      );
+      .updateOne({ id: vendorId }, { $set: { items: vendorItems } });
 
     return c.json({ success: true, data: item });
   } catch (error) {
@@ -139,7 +134,7 @@ export async function handleGetVendorItems(c: Context) {
     const vendorId = c.req.param("vendor");
     const vendor = await (await db())
       .collection("vendors")
-      .findOne({ _id: new ObjectId(vendorId), isDeleted: false });
+      .findOne({ id: vendorId, isDeleted: false });
     if (!vendor) {
       throw new BackendError("NOT_FOUND", { message: "Vendor not found" });
     }
@@ -157,7 +152,7 @@ export async function handleGetAllVendorItems(c: Context) {
     const vendorId = c.req.param("vendor");
     const vendor = await (await db())
       .collection("vendors")
-      .findOne({ _id: new ObjectId(vendorId), isDeleted: false });
+      .findOne({ id: vendorId, isDeleted: false });
     if (!vendor) {
       throw new BackendError("NOT_FOUND", { message: "Vendor not found" });
     }
@@ -179,7 +174,7 @@ export async function handleUpdateVendorItem(c: Context) {
     const result = await (await db())
       .collection("vendors")
       .updateOne(
-        { _id: new ObjectId(vendorId), "items.id": itemId },
+        { id: vendorId, "items.id": itemId },
         { $set: { "items.$": item } },
       );
     if (result.matchedCount === 0) {