Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Warnings:

- You are about to drop the column `product_id` on the `cart_items` table. All the data in the column will be lost.
- A unique constraint covering the columns `[cart_id,attribute_value_id]` on the table `cart_items` will be added. If there are existing duplicate values, this will fail.
- Added the required column `attribute_value_id` to the `cart_items` table without a default value. This is not possible if the table is not empty.

*/
-- DropForeignKey
ALTER TABLE "cart_items" DROP CONSTRAINT "cart_items_product_id_fkey";

-- DropIndex
DROP INDEX "cart_items_cart_id_product_id_key";

-- AlterTable
ALTER TABLE "cart_items" DROP COLUMN "product_id",
ADD COLUMN "attribute_value_id" INTEGER NOT NULL;

-- CreateIndex
CREATE UNIQUE INDEX "cart_items_cart_id_attribute_value_id_key" ON "cart_items"("cart_id", "attribute_value_id");

-- AddForeignKey
ALTER TABLE "cart_items" ADD CONSTRAINT "cart_items_attribute_value_id_fkey" FOREIGN KEY ("attribute_value_id") REFERENCES "variants_attributes_values"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 6 additions & 4 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ model Product {
updatedAt DateTime @default(now()) @map("updated_at") @db.Timestamp(0)

category Category? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
cartItems CartItem[]

orderItems OrderItem[]
variantAttributeValues VariantAttributeValue[]

Expand Down Expand Up @@ -92,6 +92,8 @@ model VariantAttributeValue {

variantAttribute VariantAttribute @relation(fields: [attributeId], references: [id])
product Product @relation(fields: [productId], references: [id])

CartItem CartItem[]

@@unique([attributeId, productId, value], name: "unique_attribute_product_value")
@@map("variants_attributes_values")
Expand All @@ -113,15 +115,15 @@ model Cart {
model CartItem {
id Int @id @default(autoincrement())
cartId Int @map("cart_id")
productId Int @map("product_id")
attributeValueId Int @map("attribute_value_id")
quantity Int
createdAt DateTime @default(now()) @map("created_at") @db.Timestamp(0)
updatedAt DateTime @default(now()) @map("updated_at") @db.Timestamp(0)

cart Cart @relation(fields: [cartId], references: [id], onDelete: Cascade)
product Product @relation(fields: [productId], references: [id], onDelete: Cascade)
variantAttributeValue VariantAttributeValue @relation(fields: [attributeValueId], references: [id], onDelete: Cascade)

@@unique([cartId, productId], name: "unique_cart_item")
@@unique([cartId, attributeValueId], name: "unique_cart_item")
@@map("cart_items")
}

Expand Down
1 change: 1 addition & 0 deletions src/models/cart.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export type CartProductInfo = Pick<
export type CartItemWithProduct = {
product: CartProductInfo;
quantity: number;
attributeId: number;
};

// Tipo para el carrito con items y productos incluidos
Expand Down
9 changes: 5 additions & 4 deletions src/routes/category/components/product-card/index.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { Link } from "react-router";

import type { Product } from "@/models/product.model";

interface ProductCardProps {
product: Product;
}

const stickerCategoryId = 3;
const stickerCategoryId = 3; // ID de la categoría "Stickers"

export function ProductCard({ product }: ProductCardProps) {
const isSticker = stickerCategoryId;

const isSticker = product.categoryId === stickerCategoryId;

return (
<>
<Link
Expand Down
2 changes: 1 addition & 1 deletion src/routes/category/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ export async function loader({ params, request }: Route.LoaderArgs) {
if (min) {
return (productPrice||minProductPrice) >= min
}

if (max) {
return (productPrice||maxProductPrice) <= max

}
return true
});
Expand Down
166 changes: 89 additions & 77 deletions src/services/cart.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,52 +18,46 @@ async function getCart(
: undefined;

if (!whereCondition) return null;
try {

const data = await prisma.cart.findFirst({
where: whereCondition,
include: {
items: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
price: true,
isOnSale: true,
const data = await prisma.cart.findFirst({
where: whereCondition,
include: {
items: {
include: {
variantAttributeValue: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
isOnSale: true,
},
},
},
},
orderBy: {
id: "asc",
},
},
},
});

if (!data) return null;

return {
...data,
items: data.items.map((item) => ({
...item,
product: {
...item.product,
price: item.product.price.toNumber(),
orderBy: {
id: "asc",
},
})),
};
}catch(e) {
console.log(e)
return {
error: true,
status: 500,
message: "Error al obtener el carrito. Verifica el modelo Product.",
};
}
},
},
});

if (!data) return null;

return {
...data,
items: data.items.map((item) => ({
...item,
product: {
...item.variantAttributeValue.product,
price: item.variantAttributeValue.price.toNumber(),
},
variantAttributeValue: item.variantAttributeValue,
})),
};
}

export async function getRemoteCart(
Expand Down Expand Up @@ -92,14 +86,17 @@ export async function getOrCreateCart(
include: {
items: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
price: true,
isOnSale: true,
variantAttributeValue: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
isOnSale: true,
},
},
},
},
},
Expand All @@ -114,9 +111,10 @@ export async function getOrCreateCart(
items: newCart.items.map((item) => ({
...item,
product: {
...item.product,
price: item.product.price.toNumber(),
...item.variantAttributeValue.product,
price: item.variantAttributeValue.price.toNumber(),
},
variantAttributeValue: item.variantAttributeValue,
})),
};
}
Expand All @@ -140,7 +138,7 @@ export async function createRemoteItems(
await prisma.cartItem.createMany({
data: items.map((item) => ({
cartId: cart.id,
productId: item.product.id,
attributeValueId: item.attributeId, // modificar
quantity: item.quantity,
})),
});
Expand All @@ -156,12 +154,14 @@ export async function createRemoteItems(
export async function alterQuantityCartItem(
userId: User["id"] | undefined,
sessionCartId: string | undefined,
productId: number,
attributeId: number,
quantity: number = 1
): Promise<CartWithItems> {
const cart = await getOrCreateCart(userId, sessionCartId);

const existingItem = cart.items.find((item) => item.product.id === productId);
const existingItem = cart.items.find(
(item) => item.attributeValueId === attributeId
);

if (existingItem) {
const newQuantity = existingItem.quantity + quantity;
Expand All @@ -180,7 +180,7 @@ export async function alterQuantityCartItem(
await prisma.cartItem.create({
data: {
cartId: cart.id,
productId,
attributeValueId: attributeId,
quantity,
},
});
Expand Down Expand Up @@ -246,14 +246,17 @@ export async function linkCartToUser(
include: {
items: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
price: true,
isOnSale: true,
variantAttributeValue: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
isOnSale: true,
},
},
},
},
},
Expand All @@ -268,9 +271,10 @@ export async function linkCartToUser(
items: updatedCart.items.map((item) => ({
...item,
product: {
...item.product,
price: item.product.price.toNumber(),
...item.variantAttributeValue.product,
price: item.variantAttributeValue.price.toNumber(),
},
variantAttributeValue: item.variantAttributeValue,
})),
};
}
Expand All @@ -295,41 +299,48 @@ export async function mergeGuestCartWithUserCart(
include: {
items: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
price: true,
isOnSale: true,
variantAttributeValue: {
include: {
product: {
select: {
id: true,
title: true,
imgSrc: true,
alt: true,
isOnSale: true,
},
},
},
},
},
},
},
});

return {
...updatedCart,
items: updatedCart.items.map((item) => ({
...item,
product: {
...item.product,
price: item.product.price.toNumber(),
...item.variantAttributeValue.product,
price: item.variantAttributeValue.price.toNumber(),
},
variantAttributeValue: item.variantAttributeValue,
})),
};
}

// Obtener productos duplicados para eliminarlos del carrito del usuario
const guestProductIds = guestCart.items.map((item) => item.productId);
const guestAttributeValueIds = guestCart.items.map(
(item) => item.attributeValueId
);

// Eliminar productos del carrito usuario que también existan en el carrito invitado
await prisma.cartItem.deleteMany({
where: {
cartId: userCart.id,
productId: {
in: guestProductIds,
attributeValueId: {
in: guestAttributeValueIds,
},
},
});
Expand All @@ -338,7 +349,7 @@ export async function mergeGuestCartWithUserCart(
await prisma.cartItem.createMany({
data: guestCart.items.map((item) => ({
cartId: userCart.id,
productId: item.productId,
attributeValueId: item.attributeValueId,
quantity: item.quantity,
})),
});
Expand All @@ -351,3 +362,4 @@ export async function mergeGuestCartWithUserCart(
// Devolver el carrito actualizado del usuario
return await getCart(userId);
}