@unchainedshop/api 3.0.0-rc1 → 3.0.0-rc11

package/lib/resolvers/mutations/countries/updateCountry.d.ts

@@ -1,9 +1,7 @@
 import { Country } from '@unchainedshop/core-countries';
 import { Context } from '../../../context.js';
 export default function updateCountry(root: never, { country, countryId }: {
-    country: Country & {
-        defaultCurrencyId: string;
-    };
+    country: Country;
     countryId: string;
 }, { userId, modules }: Context): Promise<Country>;
 //# sourceMappingURL=updateCountry.d.ts.map

package/lib/resolvers/mutations/countries/updateCountry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateCountry.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,aAAa,CACzC,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/F,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,oBAiB7B"}
+{"version":3,"file":"updateCountry.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,aAAa,CACzC,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/D,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,oBAY7B"}

package/lib/resolvers/mutations/countries/updateCountry.js

@@ -6,11 +6,7 @@ export default async function updateCountry(root, { country, countryId }, { user
         throw new InvalidIdError({ countryId });
     if (!(await modules.countries.countryExists({ countryId })))
         throw new CountryNotFoundError({ countryId });
-    const currencyObject = await modules.currencies.findCurrency({
-        currencyId: country.defaultCurrencyId,
-    });
-    const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
-    await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
+    await modules.countries.update(countryId, country);
     return modules.countries.findCountry({ countryId });
 }
 //# sourceMappingURL=updateCountry.js.map

package/lib/resolvers/mutations/countries/updateCountry.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateCountry.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAW,EACX,EAAE,OAAO,EAAE,SAAS,EAA2E,EAC/F,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3D,UAAU,EAAE,OAAO,CAAC,iBAAiB;KACtC,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,OAAO,EAAE,mBAAmB,IAAI,cAAc,EAAE,OAAO,CAAC;IAEpF,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE/E,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"updateCountry.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAG1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAW,EACX,EAAE,OAAO,EAAE,SAAS,EAA2C,EAC/D,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhD,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEnD,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/orders/addCartDiscount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addCartDiscount.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAS9C,wBAA8B,eAAe,CAC3C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE,OAAO,+DAmBjB"}
+{"version":3,"file":"addCartDiscount.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAS9C,wBAA8B,eAAe,CAC3C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACrD,OAAO,EAAE,OAAO,+DAwBjB"}

package/lib/resolvers/mutations/orders/addCartDiscount.js

@@ -1,10 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError, OrderDiscountCodeAlreadyPresentError, OrderDiscountCodeNotValidError, } from '../../../errors.js';
+import { OrderWrongStatusError, OrderDiscountCodeAlreadyPresentError, OrderDiscountCodeNotValidError, OrderNotFoundError, } from '../../../errors.js';
 export default async function addCartDiscount(root, { orderId, code }, context) {
     const { modules, services, user, userId } = context;
     log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
-    const order = await getOrderCart({ orderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     // 1. check if discount code is not already used

package/lib/resolvers/mutations/orders/addCartDiscount.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartDiscount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,qBAAqB,EACrB,oCAAoC,EACpC,8BAA8B,GAC/B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAW,EACX,EAAE,OAAO,EAAE,IAAI,EAAsC,EACrD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,4BAA4B,IAAI,IAAI,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAExE,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,gDAAgD;IAChD,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;QACjF,MAAM,IAAI,oCAAoC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/E,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAElE,MAAM,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"addCartDiscount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartDiscount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EACL,qBAAqB,EACrB,oCAAoC,EACpC,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAW,EACX,EAAE,OAAO,EAAE,IAAI,EAAsC,EACrD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,4BAA4B,IAAI,IAAI,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAExE,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,gDAAgD;IAChD,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;QACjF,MAAM,IAAI,oCAAoC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/E,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAElE,MAAM,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/lib/resolvers/mutations/orders/addCartProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addCartProduct.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAU9C,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,EAAE;;;;;CAAA,EAClE,OAAO,EAAE,OAAO,+DA2CjB"}
+{"version":3,"file":"addCartProduct.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAU9C,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,EAAE;;;;;CAAA,EAClE,OAAO,EAAE,OAAO,+DAiDjB"}

package/lib/resolvers/mutations/orders/addCartProduct.js

@@ -1,6 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, OrderNotFoundError, } from '../../../errors.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 export default async function addCartProduct(root, { orderId, productId: originalProductId, quantity, configuration }, context) {
     const { modules, services, userId, user } = context;
@@ -12,7 +11,13 @@ export default async function addCartProduct(root, { orderId, productId: origina
     const originalProduct = await modules.products.findProduct({ productId: originalProductId });
     if (!originalProduct)
         throw new ProductNotFoundError({ productId: originalProductId });
-    const order = await getOrderCart({ orderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     const product = await modules.products.resolveOrderableProduct(originalProduct, { configuration });

package/lib/resolvers/mutations/orders/addCartProduct.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAW,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,EAAE,EAClE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CACD,2BAA2B,iBAAiB,IAAI,QAAQ,IACtD,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,iBAAiB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACnF,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAEnG,gCAAgC;IAChC,MAAM,cAAc,CAAC,qBAAqB,CACxC;QACE,KAAK;QACL,OAAO;QACP,aAAa;QACb,YAAY,EAAE,QAAQ;KACvB,EACD,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;QAClE,QAAQ;QACR,aAAa;QACb,SAAS,EAAE,OAAO,CAAC,GAAG;QACtB,iBAAiB;QACjB,OAAO,EAAE,KAAK,CAAC,GAAG;KACnB,CAAC,CAAC;IAEH,MAAM,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;AACnF,CAAC"}
+{"version":3,"file":"addCartProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAW,EACX,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,aAAa,EAAE,EAClE,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CACD,2BAA2B,iBAAiB,IAAI,QAAQ,IACtD,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,CACpB,CAAC;IAEF,IAAI,CAAC,iBAAiB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IACnF,IAAI,QAAQ,GAAG,CAAC;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC7F,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAEnG,gCAAgC;IAChC,MAAM,cAAc,CAAC,qBAAqB,CACxC;QACE,KAAK;QACL,OAAO;QACP,aAAa;QACb,YAAY,EAAE,QAAQ;KACvB,EACD,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;QAClE,QAAQ;QACR,aAAa;QACb,SAAS,EAAE,OAAO,CAAC,GAAG;QACtB,iBAAiB;QACjB,OAAO,EAAE,KAAK,CAAC,GAAG;KACnB,CAAC,CAAC;IAEH,MAAM,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;AACnF,CAAC"}

package/lib/resolvers/mutations/orders/addCartQuotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addCartQuotation.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAY9C,wBAA8B,gBAAgB,CAC5C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,EACD,OAAO,EAAE,OAAO,+DAiDjB"}
+{"version":3,"file":"addCartQuotation.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAY9C,wBAA8B,gBAAgB,CAC5C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,EACD,OAAO,EAAE,OAAO,+DAsDjB"}

package/lib/resolvers/mutations/orders/addCartQuotation.js

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { QuotationStatus } from '@unchainedshop/core-quotations';
-import { QuotationNotFoundError, QuotationWrongStatusError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, ProductNotFoundError, } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { QuotationNotFoundError, QuotationWrongStatusError, OrderQuantityTooLowError, InvalidIdError, OrderWrongStatusError, ProductNotFoundError, OrderNotFoundError, } from '../../../errors.js';
 import { QuotationDirector } from '@unchainedshop/core';
 export default async function addCartQuotation(root, params, context) {
     const { modules, services, userId, user } = context;
@@ -17,7 +16,13 @@ export default async function addCartQuotation(root, params, context) {
     if (quotation.status !== QuotationStatus.PROPOSED) {
         throw new QuotationWrongStatusError({ status: quotation.status });
     }
-    const order = await getOrderCart({ orderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     if (!(await modules.products.productExists({

package/lib/resolvers/mutations/orders/addCartQuotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"addCartQuotation.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addCartQuotation.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addCartQuotation.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/mutations/orders/addMultipleCartProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addMultipleCartProducts.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAS9C,wBAA8B,uBAAuB,CACnD,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACvD,CAAC,CAAC;CACJ,EACD,OAAO,EAAE,OAAO,gBAgEjB"}
+{"version":3,"file":"addMultipleCartProducts.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAS9C,wBAA8B,uBAAuB,CACnD,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACvD,CAAC,CAAC;CACJ,EACD,OAAO,EAAE,OAAO,gBAqEjB"}

package/lib/resolvers/mutations/orders/addMultipleCartProducts.js

@@ -1,6 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { ProductNotFoundError, OrderQuantityTooLowError, OrderWrongStatusError, } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { ProductNotFoundError, OrderQuantityTooLowError, OrderWrongStatusError, OrderNotFoundError, } from '../../../errors.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 export default async function addMultipleCartProducts(root, params, context) {
     const { modules, services, userId, user } = context;
@@ -19,7 +18,13 @@ export default async function addMultipleCartProducts(root, params, context) {
             originalProduct,
         };
     }));
-    const order = await getOrderCart({ orderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     // Reduce is used to wait for each product to be added before processing the next (sequential processing)

package/lib/resolvers/mutations/orders/addMultipleCartProducts.js.map

@@ -1 +1 @@
-{"version":3,"file":"addMultipleCartProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAW,EACX,MAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAElC,GAAG,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;QAC/D,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;QACzC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAEpE,OAAO;YACL,GAAG,IAAI;YACP,eAAe;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,yGAAyG;IACzG,MAAM,iBAAiB,CAAC,MAAM,CAC5B,KAAK,EAAE,gBAAgB,EAAE,EAAE,eAAe,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QACvE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACzC,IAAI,QAAQ,GAAG,CAAC;YACd,MAAM,IAAI,wBAAwB,CAAC;gBACjC,QAAQ;gBACR,SAAS,EAAE,eAAe,CAAC,GAAG;aAC/B,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE;YAC9E,aAAa;SACd,CAAC,CAAC;QAEH,MAAM,cAAc,CAAC,qBAAqB,CACxC;YACE,KAAK;YACL,OAAO;YACP,aAAa;YACb,YAAY,EAAE,QAAQ;SACvB,EACD,OAAO,CACR,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;YAC7D,QAAQ;YACR,aAAa;YACb,iBAAiB,EAAE,eAAe,CAAC,GAAG;YACtC,SAAS,EAAE,OAAO,CAAC,GAAG;YACtB,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CACpB,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"addMultipleCartProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/addMultipleCartProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAW,EACX,MAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAElC,GAAG,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;QAC/D,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;QACzC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAEpE,OAAO;YACL,GAAG,IAAI;YACP,eAAe;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,yGAAyG;IACzG,MAAM,iBAAiB,CAAC,MAAM,CAC5B,KAAK,EAAE,gBAAgB,EAAE,EAAE,eAAe,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE;QACvE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACzC,IAAI,QAAQ,GAAG,CAAC;YACd,MAAM,IAAI,wBAAwB,CAAC;gBACjC,QAAQ;gBACR,SAAS,EAAE,eAAe,CAAC,GAAG;aAC/B,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE;YAC9E,aAAa;SACd,CAAC,CAAC;QAEH,MAAM,cAAc,CAAC,qBAAqB,CACxC;YACE,KAAK;YACL,OAAO;YACP,aAAa;YACb,YAAY,EAAE,QAAQ;SACvB,EACD,OAAO,CACR,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;YAC7D,QAAQ;YACR,aAAa;YACb,iBAAiB,EAAE,eAAe,CAAC,GAAG;YACtC,SAAS,EAAE,OAAO,CAAC,GAAG;YACtB,OAAO,EAAE,KAAK,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CACpB,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/orders/checkoutCart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkoutCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,wBAA8B,YAAY,CACxC,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,EACD,OAAO,EAAE,OAAO,gBAuBjB"}
+{"version":3,"file":"checkoutCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAM9C,wBAA8B,YAAY,CACxC,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,EACD,OAAO,EAAE,OAAO,gBA4BjB"}

package/lib/resolvers/mutations/orders/checkoutCart.js

@@ -1,5 +1,4 @@
-import { OrderCheckoutError } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderCheckoutError, OrderNotFoundError } from '../../../errors.js';
 import { createLogger, log } from '@unchainedshop/logger';
 const logger = createLogger('unchained:api');
 export default async function checkoutCart(root, params, context) {
@@ -7,10 +6,16 @@ export default async function checkoutCart(root, params, context) {
     const { orderId: forceOrderId, ...transactionContext } = params;
     log('mutation checkoutCart', { orderId: forceOrderId, userId });
     // Do not check for order status here! The checkout method will act accordingly
-    let order = await getOrderCart({ orderId: forceOrderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId: forceOrderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId: forceOrderId });
     try {
-        order = await services.orders.checkoutOrder(order._id, transactionContext);
-        return order;
+        const checkedOutOrder = await services.orders.checkoutOrder(order._id, transactionContext);
+        return checkedOutOrder;
     }
     catch (error) {
         logger.error(error.message, { userId, orderId: order._id });

package/lib/resolvers/mutations/orders/checkoutCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkoutCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;AAE7C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAW,EACX,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEhE,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhE,+EAA+E;IAC/E,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEzE,IAAI,CAAC;QACH,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,GAAG;YAClB,GAAG,kBAAkB;YACrB,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;YACpC,aAAa,EAAE,KAAK,CAAC,OAAO;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"checkoutCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/checkoutCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;AAE7C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAW,EACX,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEhE,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhE,+EAA+E;IAC/E,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,OAAO,EAAE,YAAY;QACrB,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAEpE,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC3F,OAAO,eAAe,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,kBAAkB,CAAC;YAC3B,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,GAAG;YAClB,GAAG,kBAAkB;YACrB,UAAU,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;YACpC,aAAa,EAAE,KAAK,CAAC,OAAO;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/orders/emptyCart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emptyCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAA8B,SAAS,CACrC,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACjC,OAAO,EAAE,OAAO,gBAcjB"}
+{"version":3,"file":"emptyCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,wBAA8B,SAAS,CACrC,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACjC,OAAO,EAAE,OAAO,gBAmBjB"}

package/lib/resolvers/mutations/orders/emptyCart.js

@@ -1,10 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 export default async function emptyCart(root, { orderId }, context) {
     const { modules, services, userId, user } = context;
     log('mutation emptyCart', { userId, orderId });
-    const order = await getOrderCart({ orderId, user }, context);
+    const order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     if (!order)

package/lib/resolvers/mutations/orders/emptyCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAW,EACX,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvE,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"emptyCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/emptyCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CACrC,IAAW,EACX,EAAE,OAAO,EAAwB,EACjC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QACjD,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IAEvE,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js

@@ -19,7 +19,7 @@ export default async function signPaymentProviderForCheckout(root, params, conte
     }
     else {
         const order = await modules.orders.cart({
-            countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+            countryCode: context.countryContext,
             userId,
         });
         if (!order)

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js.map

@@ -1 +1 @@
-{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,EAC5B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAW,EACX,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC;IAEjB,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW;YAC7E,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc,EAAE,KAAK,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,QAAQ,EACR;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAElC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,EAC5B,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAW,EACX,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC;IAEjB,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACtC,WAAW,EAAE,OAAO,CAAC,cAAc;YACnC,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc,EAAE,KAAK,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,QAAQ,EACR;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAElC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/orders/updateCart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE1D,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,gBAgC/F"}
+{"version":3,"file":"updateCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE1D,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,gBAqC/F"}

package/lib/resolvers/mutations/orders/updateCart.js

@@ -1,11 +1,16 @@
 import { log } from '@unchainedshop/logger';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 export default async function updateCart(root, params, context) {
     const { orderId, billingAddress, contact, paymentProviderId, deliveryProviderId, meta } = params;
     const { modules, services, userId, user } = context;
     log('mutation updateCart', { userId });
-    let order = await getOrderCart({ orderId, user }, context);
+    let order = await services.orders.findOrInitCart({
+        orderId,
+        user,
+        countryCode: context.countryContext,
+    });
+    if (!order)
+        throw new OrderNotFoundError({ orderId });
     if (!modules.orders.isCart(order))
         throw new OrderWrongStatusError({ status: order.status });
     if (meta) {

package/lib/resolvers/mutations/orders/updateCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAY3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAW,EAAE,MAAwB,EAAE,OAAgB;IAC9F,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjG,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAClF,CAAC;IAED,2BAA2B;IAC3B,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"updateCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/updateCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAY/E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAW,EAAE,MAAwB,EAAE,OAAgB;IAC9F,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjG,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,IAAI,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC;QAC/C,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAE7F,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAChF,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAClF,CAAC;IAED,2BAA2B;IAC3B,OAAO,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/queries/users/validateResetPasswordToken.js

@@ -2,7 +2,7 @@ import { log } from '@unchainedshop/logger';
 export default async function validateResetPasswordToken(root, params, context) {
     const { modules, userId } = context;
     log('query validateResetPasswordToken', { userId, token: params.token });
-    const user = await modules.users.findUserByResetToken(params.token);
-    return !!user;
+    const resetToken = await modules.users.findResetToken(params.token);
+    return !!resetToken;
 }
 //# sourceMappingURL=validateResetPasswordToken.js.map

package/lib/resolvers/queries/users/validateResetPasswordToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateResetPasswordToken.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/validateResetPasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,0BAA0B,CACtD,IAAW,EACX,MAAyB,EACzB,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,CAAC,CAAC,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"validateResetPasswordToken.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/validateResetPasswordToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,0BAA0B,CACtD,IAAW,EACX,MAAyB,EACzB,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,kCAAkC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,CAAC,CAAC,UAAU,CAAC;AACtB,CAAC"}

package/lib/resolvers/type/delivery-provider-types.d.ts

@@ -16,7 +16,6 @@ export interface DeliveryProviderHelperTypes {
         useNetPrice?: boolean;
         context: any;
     }, Promise<{
-        _id: string;
         amount: number;
         currencyCode: string;
         countryCode: string;

package/lib/resolvers/type/delivery-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAoB,aAAa,EAA2B,MAAM,qBAAqB,CAAC;AAG/F,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BA0D9B,CAAC"}
+{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAoB,aAAa,EAA2B,MAAM,qBAAqB,CAAC;AAE/F,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BAyD9B,CAAC"}

package/lib/resolvers/type/delivery-provider-types.js

@@ -1,5 +1,4 @@
 import { DeliveryDirector, DeliveryPricingDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 export const DeliveryProvider = {
     interface(deliveryProvider) {
         const Adapter = DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
@@ -37,7 +36,6 @@ export const DeliveryProvider = {
         const pricing = DeliveryPricingDirector.calculationSheet(pricingContext, calculated);
         const orderPrice = pricing.total({ useNetPrice });
         return {
-            _id: await sha256([deliveryProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
             amount: orderPrice.amount,
             currencyCode: orderPrice.currency,
             countryCode: country,

package/lib/resolvers/type/delivery-provider-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAiB,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAiC9C,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,gBAAgB;QACxB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,YAAY,IAAI,KAAK,EAAE,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC;QACnF,MAAM,cAAc,GAAG;YACrB,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEpG,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAErF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM,MAAM,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChG,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAiB,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAgC/F,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,gBAAgB;QACxB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,YAAY,IAAI,KAAK,EAAE,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC;QACnF,MAAM,cAAc,GAAG;YACrB,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEpG,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAErF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAIlE,KAAK,gBAAgB,GAAG;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,yBAAyB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,YAAY;6BACE,gBAAgB;0CAGH,gBAAgB;iGAIiB,gBAAgB,KAClF,KAAK,WACC,OAAO;2DAQuB,gBAAgB,KACpD,KAAK,WACC,OAAO;uFAQyD,gBAAgB,KACtF,KAAK,WACC,OAAO;;;;;;;CAcnB,CAAC"}
+{"version":3,"file":"loaded-filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGlE,KAAK,gBAAgB,GAAG;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,yBAAyB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,YAAY;6BACE,gBAAgB;0CAGH,gBAAgB;iGAIiB,gBAAgB,KAClF,KAAK,WACC,OAAO;2DAQuB,gBAAgB,KACpD,KAAK,WACC,OAAO;uFAQyD,gBAAgB,KACtF,KAAK,WACC,OAAO;;;;;;;CAcnB,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-types.js

@@ -1,5 +1,4 @@
 import { FilterDirector } from '@unchainedshop/core';
-import { intersectSet } from '@unchainedshop/utils';
 export const LoadedFilter = {
     definition: ({ filter }) => {
         return filter;
@@ -10,7 +9,7 @@ export const LoadedFilter = {
     filteredProductsCount: async ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }, _, context) => {
         const filterActions = await FilterDirector.actions({ searchQuery }, context);
         return filterActions.aggregateProductIds({
-            productIds: Array.from(intersectSet(filteredByOtherFiltersSet, filteredByThisFilterSet)),
+            productIds: Array.from(filteredByOtherFiltersSet.intersection(filteredByThisFilterSet)),
         }).length;
     },
     productsCount: async ({ examinedProductIdSet, searchQuery }, _, context) => {

package/lib/resolvers/type/filter/loaded-filter-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAWpD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,UAAU,EAAE,CAAC,EAAE,MAAM,EAAoB,EAAE,EAAE;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAoB,EAAE,EAAE;QACxD,OAAO,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IACD,qBAAqB,EAAE,KAAK,EAC1B,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,WAAW,EAAoB,EACrF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,uBAAuB,CAAC,CAAC;SACzF,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,aAAa,EAAE,KAAK,EAClB,EAAE,oBAAoB,EAAE,WAAW,EAAoB,EACvD,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,EAAE,MAAM,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,WAAW,EAAoB,EACzF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,wEAAwE;QACxE,iDAAiD;QACjD,8BAA8B;QAC9B,sCAAsC;QACtC,oEAAoE;QACpE,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE;YAChD,WAAW;YACX,mBAAmB;YACnB,YAAY,EAAE,yBAAyB;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"loaded-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWrD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,UAAU,EAAE,CAAC,EAAE,MAAM,EAAoB,EAAE,EAAE;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAoB,EAAE,EAAE;QACxD,OAAO,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IACD,qBAAqB,EAAE,KAAK,EAC1B,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,WAAW,EAAoB,EACrF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;SACxF,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,aAAa,EAAE,KAAK,EAClB,EAAE,oBAAoB,EAAE,WAAW,EAAoB,EACvD,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,EAAE,MAAM,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,WAAW,EAAoB,EACzF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,wEAAwE;QACxE,iDAAiD;QACjD,8BAA8B;QAC9B,sCAAsC;QACtC,oEAAoE;QACpE,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE;YAChD,WAAW;YACX,mBAAmB;YACnB,YAAY,EAAE,yBAAyB;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}