Update ProductResponse Schema & Display sale price

jll38 · May 7, 2024 · d2f1a9a · d2f1a9a
1 parent 614bca4
commit d2f1a9a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/backend/app/schemas/product_schemas.py b/backend/app/schemas/product_schemas.py
@@ -18,6 +18,7 @@ class ProductBase(BaseModel):
     blurb: Optional[str] = Field(None, example="A short description of the product")
     description: Optional[str] = Field(None, example="A detailed description of the product")
     image_url: Optional[str] = Field(None, example="http://example.com/image.png")
+    sale_price: Optional[float]  = Field(..., gt=0, example=9.99)
 
 class ProductCreate(ProductBase):
     # Here we do not include relationships, assuming that only base product data is needed for creation

diff --git a/backend/app/services/product_service.py b/backend/app/services/product_service.py
@@ -22,7 +22,8 @@ def map_product_to_response(db_product: Product) -> ProductResponse:
         description=db_product.description,
         image_url=db_product.image_url,
         categories=categories,
-        sizes=sizes
+        sizes=sizes,
+        sale_price=db_product.sale_price
     )
 class Product_Service():
 

diff --git a/frontend/src/components/ui/cards/ProductCard/ProductCard.tsx b/frontend/src/components/ui/cards/ProductCard/ProductCard.tsx
@@ -32,7 +32,7 @@ export default function ProductCard({ product }: any) {
           {product.sale_price && (
             <Typography variant="h5" fontSize={16} color="red" component="div">
               {" "}
-              {product.sale_price}
+              SALE ${product.sale_price}
             </Typography>
           )}
         </CardContent>

diff --git a/frontend/src/pages/product/ProductPage.tsx b/frontend/src/pages/product/ProductPage.tsx
@@ -42,7 +42,18 @@ export default function ProductPage() {
                   {productInfo.product_name}
                 </h2>
                 <div>⭐️⭐️⭐️⭐️⭐️</div>
-                <h3 className="text-xl">${productInfo.price}</h3>
+                <h3 className="text-xl">
+                  {productInfo.sale_price ? (
+                    <s>${productInfo.price}</s>
+                  ) : (
+                    `$${productInfo.price}`
+                  )}
+                </h3>
+                {productInfo.sale_price && (
+                  <h3 className="text-xl text-red-500">
+                   SALE ${productInfo.sale_price}
+                  </h3>
+                )}
                 <p className="text-sm text-black/70">
                   Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
                   do eiusmod tempor incididunt ut labore et dolore magna aliqua.
@@ -85,7 +96,12 @@ export default function ProductPage() {
           Hear from our community
         </Typography>
         <div>⭐️⭐️⭐️⭐️⭐️</div>
-        <TextField multiline={true} rows={4} maxRows={4} sx={{width: "100%"}} />
+        <TextField
+          multiline={true}
+          rows={4}
+          maxRows={4}
+          sx={{ width: "100%" }}
+        />
         <Button variant="contained">Post Review</Button>
       </section>
     </main>