Merge pull request #1 from Repith/testing-workspace

Description & In Stock flow

Author: rabbit-top-dev-212

TODO.txt

@@ -6,11 +6,10 @@
 5. + on dashboard change inStock as sum of products in stock
 
 CHANGES:
-Reseeded Prisma DB with new data
 [ADMIN]
-- added switch from shadcn/ui
-- fixed theme changer
-- fixed toast provider
+- created description in prisma db
 [STORE]
-- created cart-dialog | summary-dialog | cart-item-dialog
-- fixed bug with disabled add-to-cart
+- created description accordion in info components
+- added accordion | table from shadcn/ui
+- minor bug fixes
+- created size-table

ecommerce-admin/app/(dashboard)/[storeId]/(routes)/products/[productId]/components/product-form.tsx

@@ -43,6 +43,8 @@ const formSchema = z.object({
   colorId: z.string().min(1),
   isFeatured: z.boolean().default(false).optional(),
   isArchived: z.boolean().default(false).optional(),
+  description: z.string().min(1),
+  inStock: z.coerce.number().min(1),
 });
 
 type ProductFormValues = z.infer<typeof formSchema>;
@@ -71,7 +73,7 @@ export const ProductForm: React.FC<ProductFormProps> = ({
   const [loading, setLoading] = useState(false);
 
   const title = initialData ? "Edit product" : "Create product";
-  const description = initialData ? "Edit product" : "Add a new product";
+  const subTitle = initialData ? "Edit product" : "Add a new product";
   const toastMessage = initialData ? "Product updated." : "Product created.";
   const action = initialData ? "Save changes" : "Create";
 
@@ -81,6 +83,7 @@ export const ProductForm: React.FC<ProductFormProps> = ({
       ? {
           ...initialData,
           price: parseFloat(String(initialData?.price)),
+          inStock: parseFloat(String(initialData?.inStock)),
         }
       : {
           name: "",
@@ -91,6 +94,8 @@ export const ProductForm: React.FC<ProductFormProps> = ({
           colorId: "",
           isFeatured: false,
           isArchived: false,
+          description: "",
+          inStock: 0,
         },
   });
 
@@ -138,8 +143,10 @@ export const ProductForm: React.FC<ProductFormProps> = ({
         onConfirm={onDelete}
         loading={loading}
       />
+
+      {/* Product delete */}
       <div className="flex items-center justify-between">
-        <Heading title={title} description={description}></Heading>
+        <Heading title={title} description={subTitle}></Heading>
         {initialData && (
           <Button
             variant="destructive"
@@ -157,6 +164,7 @@ export const ProductForm: React.FC<ProductFormProps> = ({
           onSubmit={form.handleSubmit(onSubmit)}
           className="w-full space-y-8"
         >
+          {/* Image(s) upload */}
           <FormField
             control={form.control}
             name="images"
@@ -182,6 +190,7 @@ export const ProductForm: React.FC<ProductFormProps> = ({
             )}
           />
           <div className="grid grid-cols-3 gap-8">
+            {/* Name */}
             <FormField
               control={form.control}
               name="name"
@@ -199,6 +208,8 @@ export const ProductForm: React.FC<ProductFormProps> = ({
                 </FormItem>
               )}
             />
+
+            {/* Price */}
             <FormField
               control={form.control}
               name="price"
@@ -212,6 +223,8 @@ export const ProductForm: React.FC<ProductFormProps> = ({
                 </FormItem>
               )}
             />
+
+            {/* Category */}
             <FormField
               control={form.control}
               name="categoryId"
@@ -244,6 +257,8 @@ export const ProductForm: React.FC<ProductFormProps> = ({
                 </FormItem>
               )}
             />
+
+            {/* Size */}
             <FormField
               control={form.control}
               name="sizeId"
@@ -276,6 +291,8 @@ export const ProductForm: React.FC<ProductFormProps> = ({
                 </FormItem>
               )}
             />
+
+            {/* Color */}
             <FormField
               control={form.control}
               name="colorId"
@@ -314,6 +331,45 @@ export const ProductForm: React.FC<ProductFormProps> = ({
                 </FormItem>
               )}
             />
+            {/* Description */}
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Description</FormLabel>
+                  <FormControl>
+                    <Input
+                      disabled={loading}
+                      placeholder="Product description"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {/* In stock */}
+            <FormField
+              control={form.control}
+              name="inStock"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Description</FormLabel>
+                  <FormControl>
+                    <Input
+                      disabled={loading}
+                      placeholder="In stock"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {/* Is Featured | Is Archived */}
             <FormField
               control={form.control}
               name="isFeatured"

ecommerce-admin/app/(dashboard)/[storeId]/(routes)/products/components/columns.tsx

@@ -14,6 +14,7 @@ export type ProductColumn = {
   isFeatured: boolean;
   isArchived: boolean;
   createdAt: string;
+  inStock: number;
 };
 
 export const columns: ColumnDef<ProductColumn>[] = [
@@ -54,7 +55,10 @@ export const columns: ColumnDef<ProductColumn>[] = [
       </div>
     ),
   },
-
+  {
+    accessorKey: "inStock",
+    header: "In stock",
+  },
   {
     accessorKey: "createdAt",
     header: "Date",

ecommerce-admin/app/(dashboard)/[storeId]/(routes)/products/page.tsx

@@ -30,6 +30,8 @@ const ProductsPage = async ({ params }: { params: { storeId: string } }) => {
     category: item.category.name,
     size: item.size.value,
     color: item.color.value,
+    description: item.description,
+    inStock: item.inStock,
     createdAt: format(item.createdAt, "MMMM do, yyyy"),
   }));
 

ecommerce-admin/app/api/[storeId]/checkout/route.ts

@@ -1,42 +1,41 @@
 import Stripe from "stripe";
 import { NextResponse } from "next/server";
+import { PrismaClient } from "@prisma/client";
 
-import { stripe } from "@/lib/stripe";
-import prismadb from "@/lib/prismadb";
+const prisma = new PrismaClient();
 
 const corsHeaders = {
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
   "Access-Control-Allow-Headers": "Content-Type, Authorization",
 };
 
-export async function OPTIONS() {
-  return NextResponse.json({}, { headers: corsHeaders });
-}
-
 export async function POST(
   req: Request,
   { params }: { params: { storeId: string } }
 ) {
   const { productIds } = await req.json();
 
-  if (!productIds || productIds.length === 0) {
-    return new NextResponse("Product ids are required", { status: 400 });
-  }
+  const quantities = productIds.map((item) => item.quantity);
 
-  const products = await prismadb.product.findMany({
+  const products = await prisma.product.findMany({
     where: {
       id: {
-        in: productIds,
+        in: productIds.map((item) => item.productId),
       },
     },
   });
 
   const line_items: Stripe.Checkout.SessionCreateParams.LineItem[] = [];
 
-  products.forEach((product) => {
+  products.forEach((product, index) => {
+    const quantity = quantities[index];
+    if (quantity <= 0) {
+      throw new Error(`Invalid quantity for product "${product.name}"`);
+    }
+
     line_items.push({
-      quantity: 1,
+      quantity,
       price_data: {
         currency: "USD",
         product_data: {
@@ -47,21 +46,56 @@ export async function POST(
     });
   });
 
-  const order = await prismadb.order.create({
-    data: {
-      storeId: params.storeId,
-      isPaid: false,
-      orderItems: {
-        create: productIds.map((productId: string) => ({
-          product: {
-            connect: {
-              id: productId,
-            },
+  let order;
+  try {
+    await prisma.$transaction(async (prisma) => {
+      order = await prisma.order.create({
+        data: {
+          storeId: params.storeId,
+          isPaid: false,
+          orderItems: {
+            create: productIds.map((item) => ({
+              product: {
+                connect: {
+                  id: item.productId,
+                },
+              },
+              quantity: item.quantity,
+            })),
           },
-        })),
-      },
-    },
-  });
+        },
+      });
+
+      const productIdsToUpdate = productIds.map((item) => item.productId);
+      const productsToUpdate = await prisma.product.findMany({
+        where: {
+          id: {
+            in: productIdsToUpdate,
+          },
+        },
+      });
+
+      for (const productToUpdate of productsToUpdate) {
+        const orderedQuantity =
+          productIds.find((item) => item.productId === productToUpdate.id)
+            ?.quantity || 0;
+
+        await prisma.product.update({
+          where: {
+            id: productToUpdate.id,
+          },
+          data: {
+            isArchived: true,
+            inStock: productToUpdate.inStock - orderedQuantity,
+          },
+        });
+      }
+    });
+  } catch (error) {
+    return new NextResponse(`Error processing order: ${error.message}`, {
+      status: 500,
+    });
+  }
 
   const session = await stripe.checkout.sessions.create({
     line_items,
@@ -77,10 +111,5 @@ export async function POST(
     },
   });
 
-  return NextResponse.json(
-    { url: session.url },
-    {
-      headers: corsHeaders,
-    }
-  );
+  return NextResponse.json({ url: session.url }, { headers: corsHeaders });
 }

ecommerce-admin/app/api/[storeId]/products/[productId]/route.ts

@@ -49,6 +49,8 @@ export async function PATCH(
       sizeId,
       isFeatured,
       isArchived,
+      description,
+      inStock
     } = body;
 
     if (!userId) {
@@ -83,6 +85,14 @@ export async function PATCH(
       return new NextResponse("Size id is required", { status: 400 });
     }
 
+    if (!description) {
+      return new NextResponse("Description is required", { status: 400 });
+    }
+    
+    if (!inStock) {
+      return new NextResponse("Need at least 1 item in stock", { status: 400 });
+    }
+
     const storeByUserId = await prismadb.store.findFirst({
       where: {
         id: params.storeId,
@@ -104,6 +114,8 @@ export async function PATCH(
         categoryId,
         colorId,
         sizeId,
+        description,
+        inStock,
         images: {
           deleteMany: {},
         },

ecommerce-admin/app/api/[storeId]/products/route.ts

@@ -21,6 +21,8 @@ export async function POST(
       images,
       isFeatured,
       isArchived,
+      description,
+      inStock
     } = body;
 
     if (!userId) {
@@ -51,6 +53,14 @@ export async function POST(
       return new NextResponse("Size id is required", { status: 400 });
     }
 
+    if (!description) {
+      return new NextResponse("Description is required", { status: 400 });
+    }
+
+    if (!inStock) {
+      return new NextResponse("Need at least 1 item in stock", { status: 400 });
+    }
+
     if (!params.storeId) {
       return new NextResponse("Store id is required", { status: 400 });
     }
@@ -76,6 +86,8 @@ export async function POST(
         colorId,
         sizeId,
         storeId: params.storeId,
+        description,
+        inStock,
         images: {
           createMany: {
             data: [...images.map((image: { url: string }) => image)],