Remove queueMessage instance for follows

overthq · Dec 24, 2024 · e3fd02f · e3fd02f
1 parent 56c24ca
commit e3fd02f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/api/src/collections/order/mutations.ts b/api/src/collections/order/mutations.ts
@@ -20,7 +20,7 @@ const createOrder: Resolver<CreateOrderArgs> = async (
 ) => {
 	// Get all required data in a single query
 	const cart = await ctx.prisma.cart.findUnique({
-		where: { id: cartId },
+		where: { id: cartId, userId: ctx.user.id },
 		include: {
 			user: {
 				include: {
@@ -36,14 +36,6 @@ const createOrder: Resolver<CreateOrderArgs> = async (
 		throw new Error('Cart not found');
 	}
 
-	if (cart.userId !== ctx.user.id) {
-		throw new Error('You are not authorized to access this cart.');
-	}
-
-	if (!cart.store) {
-		throw new Error('Store not found');
-	}
-
 	const card = cart.user.cards[0];
 
 	if (!card) {

diff --git a/api/src/collections/store-follower/mutations.ts b/api/src/collections/store-follower/mutations.ts
@@ -15,10 +15,12 @@ const followStore: Resolver<FollowStoreArgs> = async (_, { storeId }, ctx) => {
 
 	for (const pushToken of pushTokens) {
 		if (pushToken) {
-			ctx.services.notifications.queueMessage({
-				to: pushToken,
-				title: `${follower.store.name} has a new follower`,
-				body: `${ctx.user.name} followed you`
+			ctx.services.notifications.queueNotification({
+				type: 'NEW_FOLLOW',
+				data: {
+					followerName: ctx.user.name
+				},
+				recipientTokens: [pushToken]
 			});
 		}
 	}

diff --git a/api/src/templates/notifications.ts b/api/src/templates/notifications.ts
@@ -31,5 +31,9 @@ export const notificationTemplates: Record<
 	ORDER_COMPLETED: {
 		title: 'Order Completed',
 		body: data => `Your order #${data.orderId} has been completed`
+	},
+	NEW_FOLLOW: {
+		title: 'New Store Follower',
+		body: data => `${data.followerName} started following your store`
 	}
 };
diff --git a/api/src/types/notifications.ts b/api/src/types/notifications.ts
@@ -5,7 +5,8 @@ export type NotificationType =
 	| 'ORDER_FULFILLED'
 	| 'DELIVERY_CONFIRMED'
 	| 'ORDER_CANCELLED'
-	| 'ORDER_COMPLETED';
+	| 'ORDER_COMPLETED'
+	| 'NEW_FOLLOW';
 
 export interface NotificationTemplate {
 	title: string;