@unchainedshop/api 3.1.13 → 4.0.0-rc.3

package/src/resolvers/mutations/accounts/loginAsGuest.ts

@@ -17,17 +17,15 @@ export default async function loginAsGuest(root: never, _: any, context: Context
     { skipMessaging: true },
   );
 
-  let user = await context.modules.users.findUserById(guestUserId);
-
-  user = await context.modules.users.updateHeartbeat(user._id, {
+  const user = await context.modules.users.updateHeartbeat(guestUserId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
-    locale: context.localeContext.baseName,
-    countryCode: context.countryContext,
+    locale: context.locale.baseName,
+    countryCode: context.countryCode,
   });
 
-  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
+  await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 
   return context.login(user);
 }

package/src/resolvers/mutations/accounts/loginWithPassword.ts

@@ -36,15 +36,15 @@ export default async function loginWithPassword(
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
-    locale: context.localeContext.baseName,
-    countryCode: context.countryContext,
+    locale: context.locale.baseName,
+    countryCode: context.countryCode,
   });
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);
   }
 
-  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
+  await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 
   return context.login(user);
 }

package/src/resolvers/mutations/accounts/loginWithWebAuthn.ts

@@ -29,15 +29,15 @@ export default async function loginWithWebAuthn(
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
-    locale: context.localeContext.baseName,
-    countryCode: context.countryContext,
+    locale: context.locale.baseName,
+    countryCode: context.countryCode,
   });
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);
   }
 
-  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
+  await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 
   return context.login(user);
 }

package/src/resolvers/mutations/accounts/resetPassword.ts

@@ -19,15 +19,15 @@ export default async function resetPassword(
       remoteAddress: context.remoteAddress,
       remotePort: context.remotePort,
       userAgent: context.getHeader('user-agent'),
-      locale: context.localeContext.baseName,
-      countryCode: context.countryContext,
+      locale: context.locale.baseName,
+      countryCode: context.countryCode,
     });
 
     if (context.userId) {
       await context.services.users.migrateUserData(context.userId, user._id);
     }
 
-    await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
+    await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 
     return context.login(user);
   } catch (e) {

package/src/resolvers/mutations/accounts/stopImpersonation.ts

@@ -17,7 +17,7 @@ export default async function stopImpersonation(root: never, _, context: Context
 
   await context.services.orders.nextUserCart({
     user: impersonator,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
 
   return context.login(impersonator);

package/src/resolvers/mutations/accounts/verifyEmail.ts

@@ -19,15 +19,15 @@ export default async function verifyEmail(root: never, { token }: { token: any }
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
-    locale: context.localeContext.baseName,
-    countryCode: context.countryContext,
+    locale: context.locale.baseName,
+    countryCode: context.countryCode,
   });
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);
   }
 
-  await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
+  await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 
   return context.login(user);
 }

package/src/resolvers/mutations/assortments/reorderAssortmentFilters.ts

@@ -3,7 +3,7 @@ import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentFilters(
   root: never,
-  params: { sortKeys: Array<{ assortmentFilterId: string; sortKey: number }> },
+  params: { sortKeys: { assortmentFilterId: string; sortKey: number }[] },
   { modules, userId }: Context,
 ) {
   log('mutation reorderAssortmentFilters', { userId });

package/src/resolvers/mutations/assortments/reorderAssortmentLinks.ts

@@ -3,7 +3,7 @@ import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentLinks(
   root: never,
-  params: { sortKeys: Array<{ assortmentLinkId: string; sortKey: number }> },
+  params: { sortKeys: { assortmentLinkId: string; sortKey: number }[] },
   { modules, userId }: Context,
 ) {
   log('mutation reorderAssortmentLinks', { userId });

package/src/resolvers/mutations/assortments/reorderAssortmentMedia.ts

@@ -3,7 +3,7 @@ import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentMedia(
   root: never,
-  params: { sortKeys: Array<{ assortmentMediaId: string; sortKey: number }> },
+  params: { sortKeys: { assortmentMediaId: string; sortKey: number }[] },
   { modules, userId }: Context,
 ) {
   log('mutation reorderAssortmentMedia', { userId });

package/src/resolvers/mutations/assortments/reorderAssortmentProducts.ts

@@ -3,7 +3,7 @@ import { Context } from '../../../context.js';
 
 export default async function reorderAssortmentProducts(
   root: never,
-  params: { sortKeys: Array<{ assortmentProductId: string; sortKey: number }> },
+  params: { sortKeys: { assortmentProductId: string; sortKey: number }[] },
   { modules, userId }: Context,
 ) {
   log('mutation reorderAssortmentProducts', { userId });

package/src/resolvers/mutations/assortments/updateAssortmentMediaTexts.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function updateAssortmentMediaTexts(
   root: never,
-  { texts, assortmentMediaId }: { texts: Array<AssortmentMediaText>; assortmentMediaId: string },
+  { texts, assortmentMediaId }: { texts: AssortmentMediaText[]; assortmentMediaId: string },
   { modules, userId }: Context,
 ) {
   log(`mutation updateAssortmentMediaTexts ${assortmentMediaId}`, {

package/src/resolvers/mutations/assortments/updateAssortmentTexts.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function updateAssortmentTexts(
   root: never,
-  { texts, assortmentId }: { texts: Array<AssortmentText>; assortmentId: string },
+  { texts, assortmentId }: { texts: AssortmentText[]; assortmentId: string },
   { modules, userId }: Context,
 ) {
   log(`mutation updateAssortmentTexts ${assortmentId}`, { userId });

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -13,7 +13,7 @@ export default async function createEnrollment(
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {
-  const { countryContext, currencyContext, modules, services, userId } = context;
+  const { countryCode, currencyCode, modules, services, userId } = context;
 
   log('mutation createEnrollment', { userId });
 
@@ -38,8 +38,8 @@ export default async function createEnrollment(
     billingAddress,
     configuration,
     contact,
-    countryCode: countryContext,
-    currencyCode: currencyContext,
+    countryCode,
+    currencyCode,
     delivery,
     meta,
     payment,

package/src/resolvers/mutations/enrollments/updateEnrollment.ts

@@ -5,7 +5,7 @@ import { EnrollmentPlan, Enrollment } from '@unchainedshop/core-enrollments';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
 import { Address, Contact } from '@unchainedshop/mongodb';
 
-type UpdateEnrollmentParams = {
+interface UpdateEnrollmentParams {
   enrollmentId: string;
   contact?: Contact;
   plan: EnrollmentPlan;
@@ -13,7 +13,7 @@ type UpdateEnrollmentParams = {
   payment?: Enrollment['payment'];
   delivery?: Enrollment['delivery'];
   meta?: any;
-};
+}
 export default async function updateEnrollment(
   root: never,
   params: UpdateEnrollmentParams,

package/src/resolvers/mutations/filters/createFilter.ts

@@ -8,14 +8,10 @@ export default async function createFilter(
   { filter, texts }: { filter: Filter; texts: FilterInputText[] },
   context: Context,
 ) {
-  const { modules, localeContext, userId } = context;
+  const { modules, userId } = context;
   log('mutation createFilter', { userId });
 
-  const newFilter = await modules.filters.create({
-    ...filter,
-    title: '',
-    locale: localeContext.language,
-  });
+  const newFilter = await modules.filters.create(filter);
 
   await FilterDirector.invalidateProductIdCache(newFilter, context);
 

package/src/resolvers/mutations/filters/updateFilterTexts.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 export default async function updateFilterTexts(
   root: never,
   params: {
-    texts: Array<{ locale: string; title?: string; subtitle?: string }>;
+    texts: { locale: string; title?: string; subtitle?: string }[];
     filterId: string;
     filterOptionValue?: string;
   },

package/src/resolvers/mutations/orders/addCartDiscount.ts

@@ -19,7 +19,7 @@ export default async function addCartDiscount(
   const order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
 

package/src/resolvers/mutations/orders/addCartProduct.ts

@@ -32,7 +32,7 @@ export default async function addCartProduct(
   const order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
 

package/src/resolvers/mutations/orders/addCartQuotation.ts

@@ -18,7 +18,7 @@ export default async function addCartQuotation(
     orderId?: string;
     quotationId: string;
     quantity: number;
-    configuration: Array<{ key: string; value: string }>;
+    configuration: { key: string; value: string }[];
   },
   context: Context,
 ) {
@@ -46,7 +46,7 @@ export default async function addCartQuotation(
   const order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });

package/src/resolvers/mutations/orders/addMultipleCartProducts.ts

@@ -12,11 +12,11 @@ export default async function addMultipleCartProducts(
   root: never,
   params: {
     orderId: string;
-    items: Array<{
+    items: {
       productId: string;
       quantity: number;
-      configuration?: Array<{ key: string; value: string }>;
-    }>;
+      configuration?: { key: string; value: string }[];
+    }[];
   },
   context: Context,
 ) {
@@ -44,7 +44,7 @@ export default async function addMultipleCartProducts(
   const order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });

package/src/resolvers/mutations/orders/checkoutCart.ts

@@ -22,7 +22,7 @@ export default async function checkoutCart(
   const order = await services.orders.findOrInitCart({
     orderId: forceOrderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId: forceOrderId });
 

package/src/resolvers/mutations/orders/createCart.ts

@@ -16,7 +16,7 @@ export default async function createCart(
   return services.orders.nextUserCart({
     user,
     orderNumber,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
     forceCartCreation: true,
   });
 }

package/src/resolvers/mutations/orders/emptyCart.ts

@@ -14,7 +14,7 @@ export default async function emptyCart(
   const order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });

package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts

@@ -32,7 +32,7 @@ export default async function signPaymentProviderForCheckout(
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   } else {
     const order = await modules.orders.cart({
-      countryCode: context.countryContext,
+      countryCode: context.countryCode,
       userId,
     });
     if (!order) throw new UserNoCartError({ userId });

package/src/resolvers/mutations/orders/updateCart.ts

@@ -22,7 +22,7 @@ export default async function updateCart(root: never, params: UpdateCartParams,
   let order = await services.orders.findOrInitCart({
     orderId,
     user,
-    countryCode: context.countryContext,
+    countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });

package/src/resolvers/mutations/orders/updateCartItem.ts

@@ -14,7 +14,7 @@ export default async function updateCartItem(
   params: {
     itemId: string;
     quantity?: number;
-    configuration?: Array<{ key: string; value: string }>;
+    configuration?: { key: string; value: string }[];
   },
   context: Context,
 ) {

package/src/resolvers/mutations/products/addProductAssignment.ts

@@ -7,15 +7,43 @@ import {
   ProductNotFoundError,
   InvalidIdError,
   ProductWrongTypeError,
+  ProductVariationVectorInvalid,
+  ProductVariationVectorAlreadySet,
   ProductVariationInfinityLoop,
 } from '../../../errors.js';
+const extractVariationMatrix = (variations = []) => {
+  const cartesianProduct = (arrays) => {
+    return arrays.reduce(
+      (acc, array) => acc.flatMap((item) => array.map((value) => [...item, value])),
+      [[]],
+    );
+  };
+  const keys = variations.map((item) => item.key);
+  const options = variations.map((item) => item.options);
+  const combinations = cartesianProduct(options);
+  return combinations.map((combination) =>
+    combination.reduce((acc, value, index) => {
+      acc[keys[index]] = value;
+      return acc;
+    }, {}),
+  );
+};
+
+const combinationExists = (matrix, combination) => {
+  return matrix.some((variation) => {
+    return (
+      Object.keys(variation).length === Object.keys(combination).length && // Ensure both have the same number of keys
+      Object.entries(combination).every(([key, value]) => variation[key] === value)
+    );
+  });
+};
 
 export default async function addProductAssignment(
   root: never,
   params: {
     proxyId: string;
     productId: string;
-    vectors: Array<ProductConfiguration>;
+    vectors: ProductConfiguration[];
   },
   { modules, userId }: Context,
 ) {
@@ -42,11 +70,26 @@ export default async function addProductAssignment(
       received: proxyProduct.type,
       required: ProductTypes.ConfigurableProduct,
     });
+  const variations = await modules.products.variations.findProductVariations({
+    productId: proxyId,
+  });
+  const variationMatrix = extractVariationMatrix(variations);
+  const normalizedVectors = vectors?.reduce((prev, { key, value }) => {
+    return {
+      ...prev,
+      [key]: value,
+    };
+  }, {});
+  if (!combinationExists(variationMatrix, normalizedVectors))
+    throw new ProductVariationVectorInvalid({ proxyId, vectors });
 
-  await modules.products.assignments.addProxyAssignment(productId, {
+  const added = await modules.products.assignments.addProxyAssignment({
+    productId,
     proxyId,
     vectors,
   });
 
+  if (!added) throw new ProductVariationVectorAlreadySet({ proxyId, vectors });
+
   return modules.products.findProduct({ productId: proxyId });
 }

package/src/resolvers/mutations/products/createProductVariation.ts

@@ -4,7 +4,11 @@ import { log } from '@unchainedshop/logger';
 import { InvalidIdError, ProductNotFoundError, ProductWrongTypeError } from '../../../errors.js';
 import { ProductVariationType } from '@unchainedshop/core-products';
 
-export type VariationInputText = { locale: string; title: string; subtitle?: string };
+export interface VariationInputText {
+  locale: string;
+  title: string;
+  subtitle?: string;
+}
 
 export default async function F(
   root: never,

package/src/resolvers/mutations/products/removeProductAssignment.ts

@@ -6,7 +6,7 @@ import { InvalidIdError, ProductNotFoundError, ProductWrongTypeError } from '../
 
 export default async function removeProductAssignment(
   root: never,
-  params: { proxyId: string; vectors: Array<ProductConfiguration> },
+  params: { proxyId: string; vectors: ProductConfiguration[] },
   { modules, userId }: Context,
 ) {
   const { proxyId, vectors } = params;

package/src/resolvers/mutations/products/reorderProductMedia.ts

@@ -3,7 +3,7 @@ import { Context } from '../../../context.js';
 
 export default async function reorderProductMedia(
   root: never,
-  params: { sortKeys: Array<{ productMediaId: string; sortKey: number }> },
+  params: { sortKeys: { productMediaId: string; sortKey: number }[] },
   { modules, userId }: Context,
 ) {
   const { sortKeys = [] } = params;

package/src/resolvers/mutations/products/updateProductMediaTexts.ts

@@ -5,7 +5,7 @@ import { ProductMediaNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function updateProductMediaTexts(
   root: never,
-  { productMediaId, texts }: { productMediaId: string; texts: Array<ProductMediaText> },
+  { productMediaId, texts }: { productMediaId: string; texts: ProductMediaText[] },
   { modules, userId }: Context,
 ) {
   log(`mutation updateProductMediaTexts ${productMediaId}`, { userId });

package/src/resolvers/mutations/products/updateProductVariationTexts.ts

@@ -8,7 +8,7 @@ export default async function F(
   params: {
     productVariationId: string;
     productVariationOptionValue?: string;
-    texts: Array<ProductVariationText>;
+    texts: ProductVariationText[];
   },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/quotations/requestQuotation.ts

@@ -4,10 +4,10 @@ import { ProductNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function requestQuotation(
   root: never,
-  params: { productId: string; configuration: Array<{ key: string; value: string }> },
+  params: { productId: string; configuration: { key: string; value: string }[] },
   context: Context,
 ) {
-  const { countryContext, currencyContext, modules, services, userId } = context;
+  const { countryCode, currencyCode, modules, services, userId } = context;
   const { productId, configuration } = params;
 
   log(`mutation requestQuotation ${productId} ${configuration ? JSON.stringify(configuration) : ''}`, {
@@ -22,8 +22,8 @@ export default async function requestQuotation(
   const newQuotation = await modules.quotations.create({
     userId,
     productId,
-    countryCode: countryContext,
-    currency: currencyContext,
+    countryCode,
+    currencyCode,
     configuration,
   });
 

package/src/resolvers/mutations/users/heartbeat.ts

@@ -5,7 +5,7 @@ import { UserNotFoundError } from '../../../errors.js';
 export default async function heartbeat(
   root: never,
   _: any,
-  { countryContext, localeContext, modules, remoteAddress, remotePort, userId, getHeader }: Context,
+  { countryCode, locale, modules, remoteAddress, remotePort, userId, getHeader }: Context,
 ) {
   log(`mutation heartbeat`, { userId });
 
@@ -16,8 +16,8 @@ export default async function heartbeat(
   }
 
   const user = await modules.users.updateHeartbeat(userId, {
-    countryCode: countryContext,
-    locale: localeContext.baseName,
+    countryCode,
+    locale: locale.baseName,
     remoteAddress,
     remotePort,
     userAgent: getHeader('user-agent'),

package/src/resolvers/mutations/users/setRoles.ts

@@ -4,7 +4,7 @@ import { InvalidIdError, UserNotFoundError } from '../../../errors.js';
 
 export default async function setRoles(
   root: never,
-  params: { roles: Array<string>; userId: string },
+  params: { roles: string[]; userId: string },
   { modules, userId }: Context,
 ) {
   const foreignUserId = params.userId;

package/src/resolvers/mutations/users/setUserTags.ts

@@ -4,7 +4,7 @@ import { InvalidIdError, UserNotFoundError } from '../../../errors.js';
 
 export default async function setUserTags(
   root: never,
-  params: { tags: Array<string>; userId: string },
+  params: { tags: string[]; userId: string },
   { modules, userId }: Context,
 ) {
   const normalizedUserId = params.userId;

package/src/resolvers/mutations/warehousing/invalidateToken.ts

@@ -27,9 +27,9 @@ export default async function invalidateToken(
   const product = await modules.products.findProduct({ productId: token.productId });
   if (!product) throw new ProductNotFoundError({ productId: token.productId });
 
-  const virtualProviders = await context.modules.warehousing.findProviders({
-    type: WarehousingProviderType.VIRTUAL,
-  });
+  const virtualProviders = (await context.modules.warehousing.allProviders()).filter(
+    ({ type }) => type === WarehousingProviderType.VIRTUAL,
+  );
 
   const isInvalidateable = await WarehousingDirector.isInvalidateable(
     virtualProviders,

package/src/resolvers/mutations/worker/allocateWork.ts

@@ -3,7 +3,7 @@ import { log } from '@unchainedshop/logger';
 
 export default async function allocateWork(
   root: never,
-  { types, worker }: { types?: Array<string>; worker?: string },
+  { types, worker }: { types?: string[]; worker?: string },
   { modules, userId }: Context,
 ) {
   log(`mutation allocateWork ${(types || []).join(',')} ${worker}`, {

package/src/resolvers/queries/assortments/assortments.ts

@@ -8,7 +8,7 @@ export default async function assortments(
   params: AssortmentQuery & {
     limit?: number;
     offset?: number;
-    sort?: Array<SortOption>;
+    sort?: SortOption[];
   },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/countries/countries.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function countries(
   root: never,
-  params: CountryQuery & { limit?: number; offset?: number; sort?: Array<SortOption> },
+  params: CountryQuery & { limit?: number; offset?: number; sort?: SortOption[] },
   { modules, userId }: Context,
 ) {
   log(

package/src/resolvers/queries/currencies/currencies.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function currencies(
   root: never,
-  params: CurrencyQuery & { limit: number; offset: number; sort?: Array<SortOption> },
+  params: CurrencyQuery & { limit: number; offset: number; sort?: SortOption[] },
   { modules, userId }: Context,
 ) {
   log(

package/src/resolvers/queries/enrollments/enrollments.ts

@@ -8,7 +8,7 @@ export default async function enrollments(
   params: EnrollmentQuery & {
     limit?: number;
     offset?: number;
-    sort?: Array<SortOption>;
+    sort?: SortOption[];
   },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/filters/filters.ts

@@ -8,7 +8,7 @@ export default async function filters(
   params: FilterQuery & {
     limit?: number;
     offset?: number;
-    sort?: Array<SortOption>;
+    sort?: SortOption[];
   },
   { modules, userId }: Context,
 ) {