@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc10

package/src/resolvers/mutations/bookmarks/createBookmark.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkAlreadyExistsError, InvalidIdError, ProductNotFoundError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createBookmark(
   root: never,

package/src/resolvers/mutations/bookmarks/removeBookmark.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeBookmark(
   root: never,

package/src/resolvers/mutations/countries/createCountry.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Country } from '@unchainedshop/core-countries';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createCountry(
   root: never,

package/src/resolvers/mutations/countries/removeCountry.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeCountry(
   root: never,

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -1,11 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Country } from '@unchainedshop/core-countries';
 import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateCountry(
   root: never,
-  { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
+  { country, countryId }: { country: Country; countryId: string },
   { userId, modules }: Context,
 ) {
   log(`mutation updateCountry ${countryId}`, { userId });
@@ -15,12 +15,7 @@ export default async function updateCountry(
   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 });
 }

package/src/resolvers/mutations/currencies/createCurrency.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Currency } from '@unchainedshop/core-currencies';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function createCurrency(
   root: never,

package/src/resolvers/mutations/currencies/removeCurrency.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/mutations/currencies/updateCurrency.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { Currency } from '@unchainedshop/core-currencies';
 import { log } from '@unchainedshop/logger';
 import { CurrencyNotFoundError, InvalidIdError } from '../../../errors.js';

package/src/resolvers/mutations/delivery/createDeliveryProvider.ts

@@ -1,7 +1,8 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 import { ProviderConfigurationInvalid } from '../../../errors.js';
+import { DeliveryDirector } from '@unchainedshop/core';
 
 export default async function createDeliveryProvider(
   root: never,
@@ -10,7 +11,11 @@ export default async function createDeliveryProvider(
 ) {
   log('mutation createDeliveryProvider', { userId });
 
+  const Adapter = DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
+  if (!Adapter) return null;
+
   const provider = await modules.delivery.create({
+    configuration: Adapter.initialConfiguration,
     ...deliveryProvider,
   });
 

package/src/resolvers/mutations/delivery/removeDeliveryProvider.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/mutations/delivery/updateDeliveryProvider.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { DeliverProviderNotFoundError, InvalidIdError } from '../../../errors.js';
 

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
@@ -8,7 +8,7 @@ export default async function activateEnrollment(
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
 
   log('mutation activateEnrollment', { userId });
 
@@ -28,5 +28,5 @@ export default async function activateEnrollment(
     throw new EnrollmentWrongStatusError({ status: enrollment.status });
   }
 
-  return modules.enrollments.activateEnrollment(enrollment, context);
+  return services.enrollments.activateEnrollment(enrollment);
 }

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { ProductStatus, ProductTypes } from '@unchainedshop/core-products';
 import {
   ProductNotFoundError,
@@ -13,7 +13,7 @@ export default async function createEnrollment(
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {
-  const { countryContext, currencyContext, modules, userId } = context;
+  const { countryContext, currencyContext, modules, services, userId } = context;
 
   log('mutation createEnrollment', { userId });
 
@@ -34,20 +34,22 @@ export default async function createEnrollment(
 
   if (product.type !== ProductTypes.PlanProduct) throw new ProductWrongTypeError({ type: product.type });
 
-  return modules.enrollments.create(
-    {
-      billingAddress,
-      configuration,
-      contact,
-      countryCode: countryContext,
-      currencyCode: currencyContext,
-      delivery,
-      meta,
-      payment,
-      productId,
-      quantity,
-      userId,
-    },
-    context,
-  );
+  const enrollment = await modules.enrollments.create({
+    billingAddress,
+    configuration,
+    contact,
+    countryCode: countryContext,
+    currencyCode: currencyContext,
+    delivery,
+    meta,
+    payment,
+    productId,
+    quantity,
+    userId,
+  });
+
+  return await services.enrollments.initializeEnrollment(enrollment, {
+    orderIdForFirstPeriod: enrollment.orderIdForFirstPeriod,
+    reason: 'new_enrollment',
+  });
 }

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { log } from '@unchainedshop/logger';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
@@ -8,7 +8,7 @@ export default async function terminateEnrollment(
   { enrollmentId }: { enrollmentId: string },
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
 
   log('mutation terminateEnrollment', { userId });
 
@@ -25,5 +25,5 @@ export default async function terminateEnrollment(
     throw new EnrollmentWrongStatusError({ status: enrollment.status });
   }
 
-  return modules.enrollments.terminateEnrollment(enrollment, context);
+  return services.enrollments.terminateEnrollment(enrollment);
 }

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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
 import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentPlan, Enrollment } from '@unchainedshop/core-enrollments';
 import { EnrollmentNotFoundError, EnrollmentWrongStatusError, InvalidIdError } from '../../../errors.js';
-import type { Address, Contact } from '@unchainedshop/mongodb';
+import { Address, Contact } from '@unchainedshop/mongodb';
 
 type UpdateEnrollmentParams = {
   enrollmentId: string;
@@ -19,7 +19,7 @@ export default async function updateEnrollment(
   params: UpdateEnrollmentParams,
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
   const { billingAddress, contact, delivery, enrollmentId, meta, payment, plan } = params;
 
   log('mutation updateEnrollment', { userId });
@@ -64,7 +64,8 @@ export default async function updateEnrollment(
         'TODO: Unchained currently does not support order splitting for enrollments, therefore updates to quantity, product and configuration of a enrollment is forbidden for non initial enrollments',
       );
     }
-    enrollment = await modules.enrollments.updatePlan(enrollmentId, plan, context);
+    enrollment = await modules.enrollments.updatePlan(enrollmentId, plan);
+    enrollment = await services.enrollments.initializeEnrollment(enrollment, { reason: 'updated_plan' });
   }
 
   return enrollment;

package/src/resolvers/mutations/files/confirmMediaUpload.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { FileUploadExpiredError, FileNotFoundError } from '../../../errors.js';
 
@@ -17,5 +17,5 @@ export default async function confirmMediaUpload(
   if (file.expires && new Date(file.expires).getTime() < new Date().getTime())
     throw new FileUploadExpiredError({ fileId });
 
-  return services.files.linkFile({ fileId, size, type }, context);
+  return services.files.linkFile({ fileId, size, type });
 }

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
-import { Filter, FilterInputText } from '@unchainedshop/core-filters';
-import { Context } from '../../../types.js';
+import { Filter } from '@unchainedshop/core-filters';
+import { Context } from '../../../context.js';
+import { FilterDirector, FilterInputText } from '@unchainedshop/core';
 
 export default async function createFilter(
   root: never,
@@ -10,14 +11,14 @@ export default async function createFilter(
   const { modules, localeContext, userId } = context;
   log('mutation createFilter', { userId });
 
-  const newFilter = await modules.filters.create(
-    {
-      ...filter,
-      title: '',
-      locale: localeContext.language,
-    },
-    context,
-  );
+  const newFilter = await modules.filters.create({
+    ...filter,
+    title: '',
+    locale: localeContext.language,
+  });
+
+  await FilterDirector.invalidateProductIdCache(newFilter, context);
+
   if (texts) {
     await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
   }

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

@@ -1,6 +1,6 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
-import { FilterInputText } from '@unchainedshop/core-filters';
+import { FilterDirector, FilterInputText } from '@unchainedshop/core';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function createFilterOption(
@@ -17,7 +17,8 @@ export default async function createFilterOption(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  const filter = await modules.filters.createFilterOption(filterId, { value: option }, context);
+  const filter = await modules.filters.createFilterOption(filterId, { value: option });
+  await FilterDirector.invalidateProductIdCache(filter, context);
 
   if (texts) {
     await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function removeFilter(
   root: never,

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { FilterDirector } from '@unchainedshop/core';
 
 export default async function removeFilterOption(
   root: never,
@@ -14,13 +15,11 @@ export default async function removeFilterOption(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  const filter = await modules.filters.removeFilterOption(
-    {
-      filterId,
-      filterOptionValue,
-    },
-    context,
-  );
+  const filter = await modules.filters.removeFilterOption({
+    filterId,
+    filterOptionValue,
+  });
+  await FilterDirector.invalidateProductIdCache(filter, context);
 
   return filter;
 }

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

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 import { Filter } from '@unchainedshop/core-filters';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { FilterDirector } from '@unchainedshop/core';
 
 export default async function updateFilter(
   root: never,
@@ -16,5 +17,8 @@ export default async function updateFilter(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  return modules.filters.update(filterId, filter, context);
+  const updatedFilter = await modules.filters.update(filterId, filter);
+  await FilterDirector.invalidateProductIdCache(updatedFilter, context);
+
+  return updatedFilter;
 }

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function updateFilterTexts(
   root: never,

package/src/resolvers/mutations/index.ts

@@ -150,6 +150,7 @@ import prepareUserAvatarUpload from './users/prepareUserAvatarUpload.js';
 import rejectOrder from './orders/rejectOrder.js';
 import removePushSubscription from './users/removePushSubscription.js';
 import addPushSubscription from './users/addPushSubscription.js';
+import removeUserProductReviews from './users/removeUserProductReviews.js';
 
 export default {
   logout: acl(actions.logout)(logout),
@@ -180,7 +181,7 @@ export default {
   heartbeat: acl(actions.heartbeat)(heartbeat),
   addEmail: acl(actions.updateUser)(addEmail),
   removeEmail: acl(actions.updateUser)(removeEmail),
-  prepareUserAvatarUpload: acl(actions.updateUser)(prepareUserAvatarUpload),
+  prepareUserAvatarUpload: acl(actions.uploadUserAvatar)(prepareUserAvatarUpload),
   updateUserProfile: acl(actions.updateUser)(updateUserProfile),
   removeUser: acl(actions.updateUser)(removeUser),
   setUserTags: acl(actions.manageUsers)(setUserTags),
@@ -312,4 +313,5 @@ export default {
   signPaymentProviderForCheckout: acl(actions.registerPaymentCredentials)(
     signPaymentProviderForCheckout,
   ),
+  removeUserProductReviews,
 };

package/src/resolvers/mutations/languages/createLanguage.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 

package/src/resolvers/mutations/languages/removeLanguage.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';
 

package/src/resolvers/mutations/languages/updateLanguage.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';

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

@@ -1,22 +1,37 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import {
+  OrderWrongStatusError,
+  OrderDiscountCodeAlreadyPresentError,
+  OrderDiscountCodeNotValidError,
+  OrderNotFoundError,
+} from '../../../errors.js';
 
 export default async function addCartDiscount(
   root: never,
   { orderId, code }: { orderId?: string; code: string },
   context: Context,
 ) {
-  const { modules, user, userId } = 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 });
 
-  const discount = await modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
-  await modules.orders.updateCalculation(order._id, context);
+  // 1. check if discount code is not already used
+  if (await modules.orders.discounts.isDiscountCodeUsed({ code, orderId: order._id }))
+    throw new OrderDiscountCodeAlreadyPresentError({ orderId: order._id, code });
+
+  const discount = await services.orders.createManualOrderDiscount({ order, code });
+  if (!discount) throw new OrderDiscountCodeNotValidError({ code });
+
+  await services.orders.updateCalculation(order._id);
   return discount;
 }

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

@@ -1,44 +1,64 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
   InvalidIdError,
   OrderWrongStatusError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { ordersSettings } from '@unchainedshop/core-orders';
 
 export default async function addCartProduct(
   root: never,
-  { orderId, productId, quantity, configuration },
+  { orderId, productId: originalProductId, quantity, configuration },
   context: Context,
 ) {
-  const { modules, userId, user } = context;
+  const { modules, services, userId, user } = context;
 
   log(
-    `mutation addCartProduct ${productId} ${quantity} ${
+    `mutation addCartProduct ${originalProductId} ${quantity} ${
       configuration ? JSON.stringify(configuration) : ''
     }`,
     { userId, orderId },
   );
 
-  if (!productId) throw new InvalidIdError({ productId });
+  if (!originalProductId) throw new InvalidIdError({ productId: originalProductId });
   if (quantity < 1) throw new OrderQuantityTooLowError({ quantity });
 
-  const product = await modules.products.findProduct({ productId });
-  if (!product) throw new ProductNotFoundError({ productId });
+  const originalProduct = await modules.products.findProduct({ productId: originalProductId });
+  if (!originalProduct) throw new ProductNotFoundError({ productId: originalProductId });
+
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
 
-  const order = await getOrderCart({ orderId, user }, context);
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
-  const orderPosition = await modules.orders.positions.addProductItem(
+  const product = await modules.products.resolveOrderableProduct(originalProduct, { configuration });
+
+  // Validate add to cart mutation
+  await ordersSettings.validateOrderPosition(
     {
-      quantity,
+      order,
+      product,
       configuration,
+      quantityDiff: quantity,
     },
-    { order, product },
     context,
   );
-  await modules.orders.updateCalculation(order._id, context);
+
+  const orderPosition = await modules.orders.positions.addProductItem({
+    quantity,
+    configuration,
+    productId: product._id,
+    originalProductId,
+    orderId: order._id,
+  });
+
+  await services.orders.updateCalculation(order._id);
   return modules.orders.positions.findOrderPosition({ itemId: orderPosition._id });
 }

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

@@ -1,14 +1,16 @@
 import { log } from '@unchainedshop/logger';
 import { QuotationStatus } from '@unchainedshop/core-quotations';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import {
   QuotationNotFoundError,
   QuotationWrongStatusError,
   OrderQuantityTooLowError,
   InvalidIdError,
   OrderWrongStatusError,
+  ProductNotFoundError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { QuotationDirector } from '@unchainedshop/core';
 
 export default async function addCartQuotation(
   root: never,
@@ -20,7 +22,7 @@ export default async function addCartQuotation(
   },
   context: Context,
 ) {
-  const { modules, userId, user } = context;
+  const { modules, services, userId, user } = context;
   const { orderId, quotationId, quantity, configuration } = params;
 
   log(
@@ -41,31 +43,35 @@ export default async function addCartQuotation(
     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 });
 
-  const product = await modules.products.findProduct({
-    productId: quotation.productId,
-  });
+  if (
+    !(await modules.products.productExists({
+      productId: quotation.productId,
+    }))
+  )
+    throw new ProductNotFoundError({ productId: quotation.productId });
 
-  const quotationConfiguration = await modules.quotations.transformItemConfiguration(
-    quotation,
-    {
-      quantity,
-      configuration,
-    },
-    context,
-  );
+  const director = await QuotationDirector.actions({ quotation }, context);
+  const quotationConfiguration = await director.transformItemConfiguration({
+    quantity,
+    configuration,
+  });
 
-  const updatedOrderPosition = await modules.orders.positions.addProductItem(
-    {
-      quantity: quotationConfiguration.quantity,
-      configuration: quotationConfiguration.configuration,
-      quotationId,
-    },
-    { order, product },
-    context,
-  );
-  await modules.orders.updateCalculation(order._id, context);
+  const updatedOrderPosition = await modules.orders.positions.addProductItem({
+    quantity: quotationConfiguration.quantity,
+    configuration: quotationConfiguration.configuration,
+    quotationId,
+    productId: quotation.productId,
+    originalProductId: quotation.productId,
+    orderId: order._id,
+  });
+  await services.orders.updateCalculation(order._id);
   return modules.orders.positions.findOrderPosition({ itemId: updatedOrderPosition._id });
 }