Merge pull request #1093 from overthq/validation-and-polish

Start adding validation
overthq · Dec 4, 2024 · 9a3a65b · 9a3a65b
2 parents 468c3ef + 669decd
commit 9a3a65b
Show file tree

Hide file tree

Showing 100 changed files with 1,336 additions and 674 deletions.
diff --git a/api/package.json b/api/package.json
@@ -12,7 +12,7 @@
 	"dependencies": {
 		"@apollo/server": "^4.10.4",
 		"@graphql-tools/schema": "^10.0.0",
-		"@prisma/client": "^5.13.0",
+		"@prisma/client": "^6.0.0",
 		"@sentry/cli": "^2.31.0",
 		"@sentry/node": "^7.109.0",
 		"@sentry/profiling-node": "^7.109.0",
@@ -45,7 +45,7 @@
 		"@types/lodash": "^4.14.198",
 		"@types/nodemailer": "^6.4.15",
 		"nodemon": "^3.1.7",
-		"prisma": "^5.13.0",
+		"prisma": "^6.0.0",
 		"ts-node": "^10.9.2",
 		"tsx": "^4.11.0",
 		"typescript": "^5.3.3"

diff --git a/api/pnpm-lock.yaml b/api/pnpm-lock.yaml
diff --git a/api/prisma/schema.prisma b/api/prisma/schema.prisma
@@ -1,6 +1,6 @@
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["fullTextSearch"]
+  previewFeatures = ["fullTextSearchPostgres"]
 }
 
 datasource db {

diff --git a/api/src/collections/card/mutations.ts b/api/src/collections/card/mutations.ts
@@ -7,6 +7,10 @@ interface DeleteCardArgs {
 const deleteCard: Resolver<DeleteCardArgs> = async (_, { id }, ctx) => {
 	const card = await ctx.prisma.card.findUnique({ where: { id } });
 
+	if (!card) {
+		throw new Error('Card not found');
+	}
+
 	if (card.userId === ctx.user.id) {
 		return ctx.prisma.card.delete({ where: { id } });
 	} else {

diff --git a/api/src/collections/cart-product/mutations.ts b/api/src/collections/cart-product/mutations.ts
@@ -44,13 +44,13 @@ const removeFromCart: Resolver<RemoveProductArgs> = async (
 	{ cartId, productId },
 	ctx
 ) => {
-	const { userId } = await ctx.prisma.cart.findUnique({
-		where: {
-			id: cartId
-		}
-	});
+	const cart = await ctx.prisma.cart.findUnique({ where: { id: cartId } });
+
+	if (!cart) {
+		throw new Error('Cart not found');
+	}
 
-	if (userId === ctx.user.id) {
+	if (cart.userId === ctx.user.id) {
 		const product = await ctx.prisma.cartProduct.delete({
 			where: { cartId_productId: { cartId, productId } }
 		});
@@ -75,12 +75,8 @@ const updateCartProduct: Resolver<UpdateCartProductArgs> = (
 	ctx
 ) => {
 	return ctx.prisma.cartProduct.update({
-		where: {
-			cartId_productId: { cartId, productId }
-		},
-		data: {
-			quantity
-		}
+		where: { cartId_productId: { cartId, productId } },
+		data: { quantity }
 	});
 };
 

diff --git a/api/src/collections/cart/queries.ts b/api/src/collections/cart/queries.ts
@@ -29,6 +29,10 @@ const total: Resolver = async (parent, _, ctx) => {
 		.findUnique({ where: { id: parent.id } })
 		.products({ include: { product: true } });
 
+	if (!fetchedProducts) {
+		throw new Error('Cart not found');
+	}
+
 	const computedTotal = fetchedProducts.reduce((acc, p) => {
 		return acc + p.product.unitPrice * p.quantity;
 	}, 0);

diff --git a/api/src/collections/image/mutations.ts b/api/src/collections/image/mutations.ts
@@ -1,4 +1,5 @@
 import cloudinary from 'cloudinary';
+
 import { Resolver } from '../../types/resolvers';
 
 interface DeleteImageArgs {

diff --git a/api/src/collections/order/mutations.ts b/api/src/collections/order/mutations.ts
@@ -26,6 +26,10 @@ const createOrder: Resolver<CreateOrderArgs> = async (
 		}
 	});
 
+	if (!cart) {
+		throw new Error('Cart not found');
+	}
+
 	let total = 0;
 
 	const orderData = cart.products.map(p => {

diff --git a/api/src/collections/order/queries.ts b/api/src/collections/order/queries.ts
@@ -25,6 +25,10 @@ const total: Resolver = async (parent, _, ctx) => {
 		.findUnique({ where: { id: parent.id } })
 		.products();
 
+	if (!fetchedProducts) {
+		throw new Error('Order not found');
+	}
+
 	const computedTotal = fetchedProducts.reduce((acc, product) => {
 		return acc + product.unitPrice * product.quantity;
 	}, 0);

diff --git a/api/src/collections/payout/mutations.ts b/api/src/collections/payout/mutations.ts
@@ -18,6 +18,10 @@ const createPayout: Resolver<CreatePayoutArgs> = async (
 		where: { id: ctx.storeId }
 	});
 
+	if (!store) {
+		throw new Error('Store not found');
+	}
+
 	// Extra validation (the frontend should cover this).
 	if (store.realizedRevenue < store.paidOut + amount) {
 		throw new Error('Insufficient funds');

diff --git a/api/src/collections/product-category/mutations.ts b/api/src/collections/product-category/mutations.ts
@@ -47,6 +47,10 @@ const createProductCategory: Resolver<CreateProductCategoryArgs> = async (
 	{ input },
 	ctx
 ) => {
+	if (!ctx.storeId) {
+		throw new Error('Store not found');
+	}
+
 	const category = await ctx.prisma.storeProductCategory.create({
 		data: { storeId: ctx.storeId, name: input.name }
 	});
@@ -67,6 +71,10 @@ const editProductCategory: Resolver<EditProductCategoryArgs> = async (
 	{ categoryId, input },
 	ctx
 ) => {
+	if (!ctx.storeId) {
+		throw new Error('Store not found');
+	}
+
 	return ctx.prisma.storeProductCategory.update({
 		where: { id: categoryId },
 		data: input
@@ -82,6 +90,10 @@ const deleteProductCategory: Resolver<DeleteProductCategoryArgs> = async (
 	{ categoryId },
 	ctx
 ) => {
+	if (!ctx.storeId) {
+		throw new Error('Store not found');
+	}
+
 	const category = await ctx.prisma.storeProductCategory.delete({
 		where: { id: categoryId }
 	});

diff --git a/api/src/collections/product-option/mutations.ts b/api/src/collections/product-option/mutations.ts
@@ -17,7 +17,7 @@ const addProductOption: Resolver<AddProductOptionArgs> = async (
 		data: {
 			productId: input.productId,
 			name: input.name,
-			description: input.description
+			description: input.description ?? null
 		}
 	});
 

diff --git a/api/src/collections/product-review/mutations.ts b/api/src/collections/product-review/mutations.ts
@@ -17,7 +17,7 @@ const addProductReview: Resolver<AddProductReviewArgs> = async (
 		data: {
 			userId: ctx.user.id,
 			productId: input.productId,
-			body: input.body,
+			body: input.body ?? null,
 			rating: input.rating
 		}
 	});

diff --git a/api/src/collections/product/queries.ts b/api/src/collections/product/queries.ts
@@ -10,7 +10,7 @@ const products: Resolver<ProductsArgs> = (_, { filter, orderBy }, ctx) => {
 };
 
 interface OrdersArgs {
-	orderBy?: {
+	orderBy: {
 		createdAt?: 'asc' | 'desc';
 		updatedAt?: 'asc' | 'desc';
 	};

diff --git a/api/src/collections/store/mutations.ts b/api/src/collections/store/mutations.ts
@@ -18,7 +18,7 @@ interface CreateStoreArgs {
 
 const createStore: Resolver<CreateStoreArgs> = async (_, { input }, ctx) => {
 	const { storeImage, ...rest } = input;
-	let uploadedImage: UploadApiResponse;
+	let uploadedImage: UploadApiResponse | undefined;
 
 	if (storeImage) {
 		const { createReadStream } = await storeImage;
@@ -76,7 +76,7 @@ const editStore: Resolver<EditStoreArgs> = async (_, { input }, ctx) => {
 		uploadedUrl = url;
 	}
 
-	let bankAccountReference: string = undefined;
+	let bankAccountReference: string | undefined;
 
 	if (rest.bankAccountNumber && rest.bankCode) {
 		bankAccountReference = await createTransferReceipient(

diff --git a/api/src/collections/store/queries.ts b/api/src/collections/store/queries.ts
@@ -16,8 +16,8 @@ const currentStore: Resolver = (_, __, ctx) => {
 };
 
 interface StoresArgs {
-	filter?: {
-		name: StringWhere;
+	filter: {
+		name?: StringWhere;
 	};
 }
 
@@ -32,7 +32,7 @@ const products: Resolver<ProductsArgs> = (parent, { filter, orderBy }, ctx) => {
 };
 
 interface OrdersArgs {
-	orderBy?: {
+	orderBy: {
 		createdAt?: 'asc' | 'desc';
 		updatedAt?: 'asc' | 'desc';
 	}[];
@@ -79,12 +79,16 @@ const followedByUser: Resolver = async (parent, _, ctx) => {
 };
 
 const cartId: Resolver = async (parent, _, ctx) => {
-	const { id } = await ctx.prisma.cart.findUnique({
+	const fetchedCart = await ctx.prisma.cart.findUnique({
 		where: { userId_storeId: { userId: ctx.user.id, storeId: parent.id } },
 		select: { id: true }
 	});
 
-	return id;
+	if (!fetchedCart) {
+		throw new Error('Cart not found');
+	}
+
+	return fetchedCart.id;
 };
 
 export default {