@unchainedshop/api 2.0.0-beta8 → 2.0.0-beta9

package/src/resolvers/mutations/payment/registerPaymentCredentials.ts

@@ -7,7 +7,7 @@ export default async function registerPaymentCredentials(
   params: { paymentProviderId: string; transactionContext: any },
   context: Context,
 ) {
-  const { modules, services, userId } = context;
+  const { modules, userId } = context;
   const { paymentProviderId, transactionContext } = params;
   log(`mutation registerPaymentCredentials for ${paymentProviderId}`, {
     userId,
@@ -18,5 +18,9 @@ export default async function registerPaymentCredentials(
   const paymentProvider = await modules.payment.paymentProviders.findProvider({ paymentProviderId });
   if (!paymentProvider) throw new PaymentProviderNotFoundError({ paymentProviderId });
 
-  return services.payment.registerPaymentCredentials(paymentProviderId, { transactionContext }, context);
+  return modules.payment.registerCredentials(
+    paymentProviderId,
+    { transactionContext, userId: context.userId },
+    context,
+  );
 }

package/src/resolvers/mutations/payment/removePaymentProvider.ts

@@ -17,5 +17,5 @@ export default async (
   )
     throw new PaymentProviderNotFoundError({ paymentProviderId });
 
-  return modules.payment.paymentProviders.delete(paymentProviderId, userId);
+  return modules.payment.paymentProviders.delete(paymentProviderId);
 };

package/src/resolvers/mutations/payment/updatePaymentProvider.ts

@@ -21,5 +21,5 @@ export default async (
   )
     throw new PaymentProviderNotFoundError({ paymentProviderId });
 
-  return modules.payment.paymentProviders.update(paymentProviderId, paymentProvider, userId);
+  return modules.payment.paymentProviders.update(paymentProviderId, paymentProvider);
 };

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

@@ -36,14 +36,10 @@ export default async function addProductAssignment(
       required: ProductTypes.ConfigurableProduct,
     });
 
-  await modules.products.assignments.addProxyAssignment(
-    productId,
-    {
-      proxyId,
-      vectors,
-    },
-    userId,
-  );
+  await modules.products.assignments.addProxyAssignment(productId, {
+    proxyId,
+    vectors,
+  });
 
   return modules.products.findProduct({ productId: proxyId });
 }

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

@@ -16,10 +16,9 @@ export default async function addProductMedia(root: Root, { media, productId },
       directoryName: 'product-media',
       rawFile: media,
       meta: { productId },
-      userId,
     },
     context,
   );
 
-  return modules.products.media.create({ productId, mediaId: file._id }, userId);
+  return modules.products.media.create({ productId, mediaId: file._id });
 }

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

@@ -18,5 +18,5 @@ export default async function addProductReviewVote(
   });
   if (!productReview) throw new ProductReviewNotFoundError({ productReviewId });
 
-  return modules.products.reviews.votes.addVote(productReview, { meta, type }, userId);
+  return modules.products.reviews.votes.addVote(productReview, { meta, type, userId });
 }

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

@@ -9,12 +9,8 @@ export default async function createProduct(
 ) {
   log('mutation createProduct', { userId });
 
-  return modules.products.create(
-    {
-      ...product,
-      authorId: userId,
-      locale: localeContext.language,
-    },
-    userId,
-  );
+  return modules.products.create({
+    ...product,
+    locale: localeContext.language,
+  });
 }

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

@@ -27,7 +27,7 @@ export default async function createProductBundleItem(
   if (!(await modules.products.productExists({ productId: item.productId })))
     throw new ProductNotFoundError({ productId: item.productId });
 
-  await modules.products.bundleItems.addBundleItem(productId, item, userId);
+  await modules.products.bundleItems.addBundleItem(productId, item);
 
   return modules.products.findProduct({ productId });
 }

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

@@ -16,12 +16,9 @@ export default async function createProductReview(
   if (!(await modules.products.productExists({ productId })))
     throw new ProductNotFoundError({ productId });
 
-  return modules.products.reviews.create(
-    {
-      productId,
-      authorId: userId,
-      ...productReview,
-    },
-    userId,
-  );
+  return modules.products.reviews.create({
+    productId,
+    authorId: userId,
+    ...productReview,
+  });
 }

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

@@ -32,14 +32,10 @@ export default async function F(
       required: ProductTypes.ConfigurableProduct,
     });
 
-  return modules.products.variations.create(
-    {
-      authorId: userId,
-      locale: localeContext.language,
-      options: [],
-      productId,
-      ...variation,
-    },
-    userId,
-  );
+  return modules.products.variations.create({
+    locale: localeContext.language,
+    options: [],
+    productId,
+    ...variation,
+  });
 }

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

@@ -23,9 +23,8 @@ export default async function createProductVariationOption(
   });
   if (!variation) throw new ProductVariationNotFoundError({ productVariationId });
 
-  return modules.products.variations.addVariationOption(
-    productVariationId,
-    { inputData, localeContext },
-    userId,
-  );
+  return modules.products.variations.addVariationOption(productVariationId, {
+    ...inputData,
+    locale: localeContext.language,
+  });
 }

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

@@ -14,7 +14,6 @@ export default async function prepareProductMediaUpload(
       directoryName: 'product-media',
       fileName: mediaName,
       meta: { productId },
-      userId,
     },
     context,
   );

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

@@ -14,7 +14,7 @@ export default async function publishProduct(
   const product = await modules.products.findProduct({ productId });
   if (!product) throw new ProductNotFoundError({ productId });
 
-  if (!(await modules.products.publish(product, userId))) {
+  if (!(await modules.products.publish(product))) {
     throw new ProductWrongStatusError({ status: product.status });
   }
 

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

@@ -8,7 +8,7 @@ export default async function removeBundleItem(
   { productId, index }: { productId: string; index: number },
   { modules, userId }: Context,
 ) {
-  log(`mutation removeBundleItem ${productId}`, { index });
+  log(`mutation removeBundleItem ${productId} ${index}`, { userId });
 
   if (!productId) throw new InvalidIdError({ productId });
 
@@ -22,7 +22,7 @@ export default async function removeBundleItem(
       required: ProductTypes.BundleProduct,
     });
 
-  await modules.products.bundleItems.removeBundleItem(productId, index, userId);
+  await modules.products.bundleItems.removeBundleItem(productId, index);
 
   return modules.products.findProduct({ productId });
 }

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

@@ -1,6 +1,13 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api';
-import { ProductNotFoundError, InvalidIdError } from '../../../errors';
+import {
+  ProductNotFoundError,
+  InvalidIdError,
+  ProductLinkedToActiveVariationError,
+  ProductLinkedToActiveBundleError,
+  ProductLinkedToEnrollmentError,
+  ProductLinkedToQuotationError,
+} from '../../../errors';
 
 export default async function removeProduct(
   root: Root,
@@ -15,7 +22,21 @@ export default async function removeProduct(
   if (!(await modules.products.productExists({ productId })))
     throw new ProductNotFoundError({ productId });
 
-  await services.products.removeProduct({ productId, userId: context.userId }, context);
+  const activeBundle = await modules.products.firstActiveProductBundle(productId);
+  if (activeBundle)
+    throw new ProductLinkedToActiveBundleError({ productId, bundleId: activeBundle._id });
+  const activeProxy = await modules.products.firstActiveProductProxy(productId);
+  if (activeProxy)
+    throw new ProductLinkedToActiveVariationError({ productId, proxyId: activeProxy._id });
+
+  const openQuotation = await modules.quotations.openQuotationWithProduct({ productId });
+  if (openQuotation)
+    throw new ProductLinkedToQuotationError({ productId, quotationId: openQuotation?._id });
+  const openEnrollment = await modules.enrollments.openEnrollmentWithProduct({ productId });
+  if (openEnrollment)
+    throw new ProductLinkedToEnrollmentError({ productId, enrollmentId: openEnrollment?._id });
+
+  await services.products.removeProduct({ productId }, context);
 
   return modules.products.findProduct({ productId });
 }

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

@@ -24,7 +24,7 @@ export default async function removeProductAssignment(
       required: ProductTypes.ConfigurableProduct,
     });
 
-  await modules.products.assignments.removeAssignment(proxyId, { vectors }, userId);
+  await modules.products.assignments.removeAssignment(proxyId, { vectors });
 
   return modules.products.findProduct({ productId: proxyId });
 }

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

@@ -16,8 +16,8 @@ export default async function removeProductMedia(
   });
   if (!productMedia) throw new ProductMediaNotFoundError({ productMediaId });
 
-  await modules.files.delete(productMedia.mediaId, userId);
-  await modules.products.media.delete(productMediaId, userId);
+  await modules.files.delete(productMedia.mediaId);
+  await modules.products.media.delete(productMediaId);
 
   return productMedia;
 }

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

@@ -14,7 +14,7 @@ export default async function removeProductReview(
   if (!(await modules.products.reviews.reviewExists({ productReviewId })))
     throw new ProductReviewNotFoundError({ productReviewId });
 
-  await modules.products.reviews.delete(productReviewId, userId);
+  await modules.products.reviews.delete(productReviewId);
 
   return modules.products.reviews.findProductReview({
     productReviewId,

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

@@ -19,5 +19,5 @@ export default async function removeProductReviewVote(
   });
   if (!productReview) throw new ProductReviewNotFoundError({ productReviewId });
 
-  return modules.products.reviews.votes.removeVote(productReviewId, { type, userId }, userId);
+  return modules.products.reviews.votes.removeVote(productReviewId, { type, userId });
 }

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

@@ -16,7 +16,7 @@ export default async function removeProductVariation(
   });
   if (!productVariation) throw new ProductVariationNotFoundError({ productVariationId });
 
-  await modules.products.variations.delete(productVariationId, userId);
+  await modules.products.variations.delete(productVariationId);
 
   return productVariation;
 }

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

@@ -23,7 +23,6 @@ export default async function removeProductVariationOption(
   await modules.products.variations.removeVariationOption(
     productVariationId,
     productVariationOptionValue,
-    userId,
   );
 
   return modules.products.variations.findProductVariation({

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

@@ -10,5 +10,5 @@ export default async function reorderProductMedia(
 
   log('mutation reorderProductMedia', { userId });
 
-  return modules.products.media.updateManualOrder({ sortKeys }, userId);
+  return modules.products.media.updateManualOrder({ sortKeys });
 }

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

@@ -14,7 +14,7 @@ export default async function unpublishProduct(
   const product = await modules.products.findProduct({ productId });
   if (!product) throw new ProductNotFoundError({ productId });
 
-  if (!(await modules.products.unpublish(product, userId))) {
+  if (!(await modules.products.unpublish(product))) {
     throw new ProductWrongStatusError({ status: product.status });
   }
 

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

@@ -15,7 +15,7 @@ export default async function updateProduct(
   if (!(await modules.products.productExists({ productId })))
     throw new ProductNotFoundError({ productId });
 
-  await modules.products.update(productId, product, userId);
+  await modules.products.update(productId, product);
 
   return modules.products.findProduct({ productId });
 }

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

@@ -15,7 +15,7 @@ export default async function updateProductCommerce(
   if (!(await modules.products.productExists({ productId })))
     throw new ProductNotFoundError({ productId });
 
-  await modules.products.update(productId, { commerce }, userId);
+  await modules.products.update(productId, { commerce });
 
   return modules.products.findProduct({ productId });
 }

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

@@ -17,5 +17,5 @@ export default async function updateProductMediaTexts(
   });
   if (!productMedia) throw new ProductMediaNotFoundError({ productMediaId });
 
-  return modules.products.media.texts.updateMediaTexts(productMediaId, texts, userId);
+  return modules.products.media.texts.updateMediaTexts(productMediaId, texts);
 }

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

@@ -22,7 +22,7 @@ export default async function updateProductPlan(
       required: ProductTypes.PlanProduct,
     });
 
-  await modules.products.update(productId, { plan }, userId);
+  await modules.products.update(productId, { plan });
 
   return modules.products.findProduct({ productId });
 }

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

@@ -17,5 +17,5 @@ export default async function updateProductReview(
   if (!(await modules.products.reviews.reviewExists({ productReviewId })))
     throw new ProductReviewNotFoundError({ productReviewId });
 
-  return modules.products.reviews.update(productReviewId, productReview, userId);
+  return modules.products.reviews.update(productReviewId, productReview);
 }

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

@@ -24,7 +24,7 @@ export default async function updateProductSupply(
       required: ProductTypes.SimpleProduct,
     });
 
-  await modules.products.update(productId, { supply }, userId);
+  await modules.products.update(productId, { supply });
 
   return modules.products.findProduct({ productId });
 }

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

@@ -14,7 +14,7 @@ export default async function updateProductTexts(
   const product = await modules.products.findProduct({ productId });
   if (!product) throw new ProductNotFoundError({ productId });
 
-  const productTexts = await modules.products.texts.updateTexts(productId, texts, userId);
+  const productTexts = await modules.products.texts.updateTexts(productId, texts);
 
   return productTexts;
 }

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

@@ -22,7 +22,7 @@ export default async function updateProductTokenization(
       required: ProductTypes.TokenizedProduct,
     });
 
-  await modules.products.update(productId, { tokenization }, userId);
+  await modules.products.update(productId, { tokenization });
 
   return modules.products.findProduct({ productId });
 }

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

@@ -27,6 +27,5 @@ export default async function F(
     productVariationId,
     texts,
     productVariationOptionValue,
-    userId,
   );
 }

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

@@ -24,7 +24,7 @@ export default async function updateProductWarehousing(
       required: ProductTypes.SimpleProduct,
     });
 
-  await modules.products.update(productId, { warehousing }, userId);
+  await modules.products.update(productId, { warehousing });
 
   return modules.products.findProduct({ productId });
 }

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

@@ -19,7 +19,6 @@ export default async function prepareUserAvatarUpload(
       directoryName: 'user-avatars',
       fileName: params.mediaName,
       meta: { userId: normalizedUserId },
-      userId,
     },
     context,
   );

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

@@ -0,0 +1,19 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+import { UserNotFoundError } from '../../../errors';
+
+export default async function removeUser(
+  root: Root,
+  params: { userId: string },
+  { modules, userId }: Context,
+) {
+  const { userId: paramUserId } = params;
+  const normalizedUserId = paramUserId || userId;
+
+  log(`mutation removeUser ${normalizedUserId}`, { userId });
+
+  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+    throw UserNotFoundError({ id: normalizedUserId });
+
+  return modules.users.delete(normalizedUserId);
+}

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

@@ -15,5 +15,5 @@ export default async function updateUserProfile(
   if (!(await modules.users.userExists({ userId: foreignUserId })))
     throw new UserNotFoundError({ userId: foreignUserId });
 
-  return modules.users.updateRoles(foreignUserId, params.roles, userId);
+  return modules.users.updateRoles(foreignUserId, params.roles);
 }

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

@@ -15,5 +15,5 @@ export default async function updateUserProfile(
   if (!(await modules.users.userExists({ userId: normalizedUserId })))
     throw new UserNotFoundError({ userId: normalizedUserId });
 
-  return modules.users.updateTags(normalizedUserId, params.tags, userId);
+  return modules.users.updateTags(normalizedUserId, params.tags);
 }

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

@@ -22,7 +22,6 @@ export default async function updateUserAvatar(
       directoryName: 'user-avatars',
       rawFile: params.avatar,
       meta: { userId: normalizedUserId },
-      userId,
     },
     context,
   );
@@ -36,5 +35,5 @@ export default async function updateUserAvatar(
     );
   }
 
-  return modules.users.updateAvatar(normalizedUserId, file._id, userId);
+  return modules.users.updateAvatar(normalizedUserId, file._id);
 }

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

@@ -16,5 +16,5 @@ export default async function updateUserProfile(
   if (!(await modules.users.userExists({ userId: normalizedUserId })))
     throw UserNotFoundError({ id: normalizedUserId });
 
-  return modules.users.updateProfile(normalizedUserId, profile, userId);
+  return modules.users.updateProfile(normalizedUserId, profile);
 }

package/src/resolvers/mutations/utils/getOrderCart.ts

@@ -17,5 +17,5 @@ export const getOrderCart = async (params: { orderId?: string; user: User }, con
   const cart = await modules.orders.cart({ countryContext }, user);
   if (cart) return cart;
 
-  return services.orders.createUserCart({ user }, context);
+  return services.orders.createUserCart({ user, countryCode: context.countryContext }, context);
 };

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

@@ -10,13 +10,9 @@ export default async function createWarehousingProvider(
 ) {
   log('mutation createWarehousingProvider', { userId });
 
-  const warehousingProviderId = await modules.warehousing.create(
-    {
-      ...params.warehousingProvider,
-      authorId: userId,
-    },
-    userId,
-  );
+  const warehousingProviderId = await modules.warehousing.create({
+    ...params.warehousingProvider,
+  });
 
   if (!warehousingProviderId) throw new ProviderConfigurationInvalid(params.warehousingProvider);
 

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

@@ -18,5 +18,5 @@ export default async function removeWarehousingProvider(
   });
   if (!provider) throw new WarehousingProviderNotFoundError({ warehousingProviderId });
 
-  return modules.warehousing.delete(warehousingProviderId, userId);
+  return modules.warehousing.delete(warehousingProviderId);
 }

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

@@ -22,7 +22,7 @@ export default async function updateWarehousingProvider(
   if (!(await modules.warehousing.providerExists({ warehousingProviderId })))
     throw new WarehousingProviderNotFoundError({ warehousingProviderId });
 
-  await modules.warehousing.update(warehousingProviderId, warehousingProvider, userId);
+  await modules.warehousing.update(warehousingProviderId, warehousingProvider);
 
   return modules.warehousing.findProvider({ warehousingProviderId });
 }

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

@@ -7,5 +7,5 @@ export default async function addWork(root: Root, workData: WorkData, { modules,
 
   log(`mutation addWork ${type} ${JSON.stringify(input)}`, { userId });
 
-  return modules.worker.addWork(workData, userId);
+  return modules.worker.addWork(workData);
 }

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

@@ -23,18 +23,14 @@ export default async function finishWork(
 
   if (!workId) throw new InvalidIdError({ workId });
 
-  const work = await modules.worker.finishWork(
-    workId,
-    {
-      result,
-      error,
-      success,
-      worker,
-      started,
-      finished,
-    },
-    userId,
-  );
+  const work = await modules.worker.finishWork(workId, {
+    result,
+    error,
+    success,
+    worker,
+    started,
+    finished,
+  });
 
   if (!work) throw new WorkNotFoundOrWrongStatus({ workId });
 

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

@@ -13,7 +13,7 @@ export default async function removeWork(
 
   if (!workId) throw new InvalidIdError({ workId });
 
-  const work = await modules.worker.deleteWork(workId, userId);
+  const work = await modules.worker.deleteWork(workId);
 
   if (!work) throw new WorkNotFoundOrWrongStatus({ workId });
 

package/src/resolvers/queries/products/productCatalogPrices.ts

@@ -13,7 +13,6 @@ export default async function productCatalogPrices(
 
   const product = await loaders.productLoader.load({
     productId,
-    includeDrafts: true,
   });
   if (!product) return null;
 

package/src/resolvers/queries/users/users.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api';
+import { Context, Root, SortOption } from '@unchainedshop/types/api';
 import { UserQuery } from '@unchainedshop/types/user';
 
 export default async function users(
@@ -7,6 +7,7 @@ export default async function users(
   params: UserQuery & {
     limit?: number;
     offset?: number;
+    sort?: Array<SortOption>;
   },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/worker/workQueue.ts

@@ -2,7 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { Root, Context, SortOption } from '@unchainedshop/types/api';
 import { WorkStatus } from '@unchainedshop/types/worker';
 
-export default async function workers(
+export default async function workQueue(
   root: Root,
   {
     limit,

package/src/resolvers/type/assortment/assortment-filter-types.ts

@@ -13,7 +13,6 @@ export const AssortmentFilter: AssortmentFilterHelperTypes = {
   assortment: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-      includeInactive: true,
     });
     return assortment;
   },

package/src/resolvers/type/assortment/assortment-link-types.ts

@@ -12,7 +12,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   child: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.childAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },
@@ -20,7 +19,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   parent: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.parentAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },