Fix cart util call

unchainedshop · Nov 28, 2024 · a21706d · a21706d
1 parent 02e5e1d
commit a21706d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/api/src/resolvers/mutations/users/removeUser.ts b/packages/api/src/resolvers/mutations/users/removeUser.ts
@@ -14,7 +14,7 @@ export default async function removeUser(
   log(`mutation removeUser ${normalizedUserId}`, { userId });
 
   if (!(await modules.users.userExists({ userId: normalizedUserId })))
-    throw UserNotFoundError({ id: normalizedUserId });
+    throw new UserNotFoundError({ id: normalizedUserId });
 
   return modules.users.delete({ userId: normalizedUserId, removeUserReviews }, unchainedApi);
 }
diff --git a/packages/core/src/services/deleteUserCartService.ts b/packages/core/src/services/deleteUserCartService.ts
@@ -1,8 +1,15 @@
 import { UnchainedCore } from '../core-index.js';
 
-const deleteUserCartService = async (userId: string, unchainedAPI: UnchainedCore) => {
+const deleteUserCartService = async (
+    userId: string,
+    unchainedAPI: UnchainedCore & { countryContext?: string },
+) => {
     try {
-        const userCart = await unchainedAPI.modules.orders.cart({ userId });
+        const user = await unchainedAPI.modules.users.findUserById(userId);
+        const userCart = await unchainedAPI.modules.orders.cart({
+            userId,
+            countryContext: unchainedAPI?.countryContext || user?.lastLogin?.countryCode,
+        });
         await unchainedAPI.modules.orders.delete(userCart?._id);
         await unchainedAPI.modules.orders.payments.deleteOrderPayment(userCart?._id);
         await unchainedAPI.modules.orders.deliveries.deleteOrderDelivery(userCart?._id);