Ini bug cik

Author: A1syy

app/(dashboard)/admin/products/new/page.tsx

@@ -33,6 +33,7 @@ const AddNewProduct = () => {
   const [merchants, setMerchants] = useState<Merchant[]>([]);
   const addProduct = async () => {
     if (
+      !product.merchantId ||
       product.title === "" ||
       product.manufacturer === "" ||
       product.description == "" ||
@@ -59,6 +60,7 @@ const AddNewProduct = () => {
       .then((data) => {
         toast.success("Product added successfully");
         setProduct({
+          merchantId: "",
           title: "",
           price: 0,
           manufacturer: "",
@@ -74,6 +76,20 @@ const AddNewProduct = () => {
       });
   };
 
+  const fetchMerchants = async () => {
+    try {
+      const res = await apiClient.get("/api/merchants");
+      const data: Merchant[] = await res.json();
+      setMerchants(data || []);
+      setProduct((prev) => ({
+      ...prev,
+        merchantId: prev.merchantId || data?.[0]?.id || "",
+      }));
+    } catch (e) {
+      toast.error("Failed to load merchants");
+    }
+  };
+
   const uploadFile = async (file: any) => {
     const formData = new FormData();
     formData.append("uploadedFile", file);
@@ -102,6 +118,7 @@ const AddNewProduct = () => {
       .then((data) => {
         setCategories(data);
         setProduct({
+          merchantId: product.merchantId || "",
           title: "",
           price: 0,
           manufacturer: "",
@@ -116,6 +133,7 @@ const AddNewProduct = () => {
 
   useEffect(() => {
     fetchCategories();
+    fetchMerchants();
   }, []);
 
   return (
@@ -128,14 +146,24 @@ const AddNewProduct = () => {
             <div className="label">
               <span className="label-text">Merchant Info:</span>
             </div>
-            <input
-              type="text"
-              className="input input-bordered w-full max-w-xs"
-              value={product?.title}
+            <select
+              className="select select-bordered"
+              value={product?.merchantId}
               onChange={(e) =>
-                setProduct({ ...product, title: e.target.value })
+                setProduct({ ...product, merchantId: e.target.value })
               }
-            />
+            >
+              {merchants.map((merchant) => (
+                <option key={merchant.id} value={merchant.id}>
+                  {merchant.name}
+                </option>
+              ))}
+            </select>
+            {merchants.length === 0 && (
+              <span className="text-xs text-red-500 mt-1">
+                Please create a merchant first.
+              </span>
+            )}
           </label>
         </div>
 

prisma/schema.prisma

@@ -27,6 +27,9 @@ model Product {
   category       Category                 @relation(fields: [categoryId], references: [id], onDelete: Cascade)
   customerOrders customer_order_product[]
   Wishlist       Wishlist[]
+
+  merchantId     String
+  merchant       Merchant @relation(fields: [merchantId], references: [id])
 }
 
 model Image {
@@ -84,3 +87,18 @@ model Wishlist {
   user      User    @relation(fields: [userId], references: [id], onDelete: Cascade)
   userId    String
 }
+
+model Merchant {
+  id          String   @id @default(uuid())
+  name        String
+  description String?
+  email       String?
+  phone       String?
+  address     String?
+  status      String   @default("ACTIVE")
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+
+  // relasi
+  products Product[]
+}

server/controllers/products.js

@@ -261,6 +261,7 @@ const getAllProductsOld = asyncHandler(async (request, response) => {
 
 const createProduct = asyncHandler(async (request, response) => {
   const {
+    merchantId,
     slug,
     title,
     mainImage,
@@ -271,13 +272,30 @@ const createProduct = asyncHandler(async (request, response) => {
     inStock,
   } = request.body;
 
+  if (!title) {
+    throw new AppError("Missing required field: title", 400);
+  }
+  
   // Basic validation
-  if (!title || !slug || !price || !categoryId) {
-    throw new AppError("Missing required fields: title, slug, price, and categoryId are required", 400);
+  if (!merchantId) {
+    throw new AppError("Missing required field: merchantId", 400);
+  }
+  
+  if (!slug) {
+    throw new AppError("Missing required field: slug", 400);
+  }
+
+  if (!price) {
+    throw new AppError("Missing required field: price", 400);
+  }
+
+  if (!categoryId) {
+    throw new AppError("Missing required field: categoryId", 400);
   }
 
   const product = await prisma.product.create({
     data: {
+      merchantId,
       slug,
       title,
       mainImage,
@@ -296,6 +314,7 @@ const createProduct = asyncHandler(async (request, response) => {
 const updateProduct = asyncHandler(async (request, response) => {
   const { id } = request.params;
   const {
+    merchantId,
     slug,
     title,
     mainImage,
@@ -329,6 +348,7 @@ const updateProduct = asyncHandler(async (request, response) => {
       id,
     },
     data: {
+      merchantId: merchantId,
       title: title,
       mainImage: mainImage,
       slug: slug,