@unchainedshop/platform 2.0.0-beta8 → 2.0.0-beta9

package/src/bulk-importer/handlers/assortment/create.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 import upsertAssortmentChildren from './upsertAssortmentChildren';
 import upsertAssortmentContent from './upsertAssortmentContent';
@@ -8,10 +8,10 @@ import upsertMedia from './upsertMedia';
 
 export default async function createAssortment(
   payload: any,
-  { logger, authorId, createShouldUpsertIfIDExists },
-  unchainedAPI: Context,
+  { logger, createShouldUpsertIfIDExists },
+  unchainedAPI: UnchainedCore,
 ) {
-  const { modules, userId } = unchainedAPI;
+  const { modules } = unchainedAPI;
   const { media, specification, products, children, filters, _id } = payload;
   if (!specification) throw new Error(`Specification is required when creating new assortment ${_id}`);
 
@@ -22,18 +22,13 @@ export default async function createAssortment(
 
   logger.debug('create assortment object', specification);
   try {
-    await modules.assortments.create({ ...specification, _id, authorId }, userId);
+    await modules.assortments.create({ ...specification, _id });
   } catch (e) {
     if (!createShouldUpsertIfIDExists) throw e;
     logger.debug('entity already exists, falling back to update', specification);
-    await modules.assortments.update(
-      _id,
-      {
-        ...specification,
-        authorId,
-      },
-      userId,
-    );
+    await modules.assortments.update(_id, {
+      ...specification,
+    });
   }
 
   if (!(await modules.assortments.assortmentExists({ assortmentId: _id }))) {
@@ -45,7 +40,6 @@ export default async function createAssortment(
     {
       content: specification.content,
       assortmentId: _id,
-      authorId,
     },
     unchainedAPI,
   );
@@ -55,7 +49,6 @@ export default async function createAssortment(
     {
       products: products || [],
       assortmentId: _id,
-      authorId,
     },
     unchainedAPI,
   );
@@ -65,7 +58,6 @@ export default async function createAssortment(
     {
       children: children || [],
       assortmentId: _id,
-      authorId,
     },
     unchainedAPI,
   );
@@ -75,13 +67,12 @@ export default async function createAssortment(
     {
       filters: filters || [],
       assortmentId: _id,
-      authorId,
     },
     unchainedAPI,
   );
 
   logger.debug('create assortment media', media);
-  await upsertMedia({ media: media || [], assortmentId: _id, authorId }, unchainedAPI);
+  await upsertMedia({ media: media || [], assortmentId: _id }, unchainedAPI);
 
   return {
     entity: 'ASSORTMENT',

package/src/bulk-importer/handlers/assortment/remove.ts

@@ -1,6 +1,6 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async function removeAssortment(payload, { logger }, unchainedAPI: Context) {
+export default async function removeAssortment(payload, { logger }, unchainedAPI: UnchainedCore) {
   const { modules } = unchainedAPI;
   const { _id } = payload;
   logger.debug('remove assortment');

package/src/bulk-importer/handlers/assortment/update.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertAssortmentContent from './upsertAssortmentContent';
 import upsertAssortmentProducts from './upsertAssortmentProducts';
 import upsertAssortmentChildren from './upsertAssortmentChildren';
@@ -6,12 +6,8 @@ import upsertAssortmentFilters from './upsertAssortmentFilters';
 import upsertMedia from './upsertMedia';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 
-export default async function updateAssortment(
-  payload: any,
-  { logger, authorId },
-  unchainedAPI: Context,
-) {
-  const { modules, userId } = unchainedAPI;
+export default async function updateAssortment(payload: any, { logger }, unchainedAPI: UnchainedCore) {
+  const { modules } = unchainedAPI;
   const { media, specification, products, children, filters, _id } = payload;
 
   if (!(await modules.assortments.assortmentExists({ assortmentId: _id }))) {
@@ -23,14 +19,13 @@ export default async function updateAssortment(
 
     specification.tags = convertTagsToLowerCase(specification?.tags);
 
-    await unchainedAPI.modules.assortments.update(_id, { ...specification, authorId }, userId);
+    await unchainedAPI.modules.assortments.update(_id, { ...specification });
     if (specification.content) {
       logger.debug('replace localized content for assortment', specification.content);
       await upsertAssortmentContent(
         {
           content: specification.content,
           assortmentId: _id,
-          authorId,
         },
         unchainedAPI,
       );
@@ -43,7 +38,6 @@ export default async function updateAssortment(
       {
         products: products || [],
         assortmentId: _id,
-        authorId,
       },
       unchainedAPI,
     );
@@ -55,7 +49,6 @@ export default async function updateAssortment(
       {
         children: children || [],
         assortmentId: _id,
-        authorId,
       },
       unchainedAPI,
     );
@@ -67,14 +60,13 @@ export default async function updateAssortment(
       {
         filters: filters || [],
         assortmentId: _id,
-        authorId,
       },
       unchainedAPI,
     );
   }
   if (media) {
     logger.debug('update assortment media', media);
-    await upsertMedia({ media: media || [], assortmentId: _id, authorId }, unchainedAPI);
+    await upsertMedia({ media: media || [], assortmentId: _id }, unchainedAPI);
   }
 
   return {

package/src/bulk-importer/handlers/assortment/upsertAssortmentChildren.ts

@@ -1,8 +1,8 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentLink } from '@unchainedshop/types/assortments';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 
-const upsert = async (assortmentLink: AssortmentLink, { modules, userId }: Context) => {
+const upsert = async (assortmentLink: AssortmentLink, { modules }: UnchainedCore) => {
   if (
     !(await modules.assortments.assortmentExists({
       assortmentId: assortmentLink.childAssortmentId,
@@ -11,26 +11,18 @@ const upsert = async (assortmentLink: AssortmentLink, { modules, userId }: Conte
     throw new Error(`Can't link non-existing assortment ${assortmentLink.childAssortmentId}`);
   }
   try {
-    const newAssortmentLink = await modules.assortments.links.create(
-      assortmentLink,
-      { skipInvalidation: true },
-      userId,
-    );
+    const newAssortmentLink = await modules.assortments.links.create(assortmentLink, {
+      skipInvalidation: true,
+    });
     return newAssortmentLink;
   } catch (e) {
-    return modules.assortments.links.update(
-      assortmentLink._id,
-      assortmentLink,
-      { skipInvalidation: true },
-      userId,
-    );
+    return modules.assortments.links.update(assortmentLink._id, assortmentLink, {
+      skipInvalidation: true,
+    });
   }
 };
 
-export default async (
-  { children, authorId, assortmentId: parentAssortmentId },
-  unchainedAPI: Context,
-) => {
+export default async ({ children, assortmentId: parentAssortmentId }, unchainedAPI: UnchainedCore) => {
   const { modules } = unchainedAPI;
   const assortmentLinkIds = await Promise.all(
     children.map(async ({ assortmentId: childAssortmentId, ...childrenRest }) => {
@@ -39,7 +31,6 @@ export default async (
         {
           ...childrenRest,
           tags,
-          authorId,
           parentAssortmentId,
           childAssortmentId,
         } as AssortmentLink,

package/src/bulk-importer/handlers/assortment/upsertAssortmentContent.ts

@@ -1,17 +1,10 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentText } from '@unchainedshop/types/assortments';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async ({ assortmentId, content, authorId }, { modules, userId }: Context) => {
+export default async ({ assortmentId, content }, { modules }: UnchainedCore) => {
   await Promise.all(
-    Object.entries(content).map(
-      async ([locale, { authorId: tAuthorId, ...localizedData }]: [string, AssortmentText]) => {
-        return modules.assortments.texts.upsertLocalizedText(
-          assortmentId,
-          locale,
-          localizedData,
-          tAuthorId || authorId || userId,
-        );
-      },
-    ),
+    Object.entries(content).map(async ([locale, localizedData]: [string, AssortmentText]) => {
+      return modules.assortments.texts.upsertLocalizedText(assortmentId, locale, localizedData);
+    }),
   );
 };

package/src/bulk-importer/handlers/assortment/upsertAssortmentFilters.ts

@@ -1,8 +1,8 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentFilter } from '@unchainedshop/types/assortments';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 
-const upsert = async (assortmentFilter: AssortmentFilter, { modules, userId }: Context) => {
+const upsert = async (assortmentFilter: AssortmentFilter, { modules }: UnchainedCore) => {
   if (
     !(await modules.filters.filterExists({
       filterId: assortmentFilter.filterId,
@@ -11,14 +11,14 @@ const upsert = async (assortmentFilter: AssortmentFilter, { modules, userId }: C
     throw new Error(`Can't link non-existing filter ${assortmentFilter.filterId}`);
   }
   try {
-    const newAssortmentFilter = await modules.assortments.filters.create(assortmentFilter, userId);
+    const newAssortmentFilter = await modules.assortments.filters.create(assortmentFilter);
     return newAssortmentFilter;
   } catch (e) {
     return modules.assortments.filters.update(assortmentFilter._id, assortmentFilter);
   }
 };
 
-export default async ({ filters, authorId, assortmentId }, unchainedAPI: Context) => {
+export default async ({ filters, assortmentId }, unchainedAPI: UnchainedCore) => {
   const { modules } = unchainedAPI;
   const assortmentFilterIds = await Promise.all(
     filters.map(async (filter: AssortmentFilter) => {
@@ -27,7 +27,6 @@ export default async ({ filters, authorId, assortmentId }, unchainedAPI: Context
         {
           ...filter,
           tags,
-          authorId,
           assortmentId,
         },
         unchainedAPI,

package/src/bulk-importer/handlers/assortment/upsertAssortmentProducts.ts

@@ -1,9 +1,9 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentProduct } from '@unchainedshop/types/assortments';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 
-const upsert = async (assortmentProduct: AssortmentProduct, unchainedAPI: Context) => {
-  const { modules, userId } = unchainedAPI;
+const upsert = async (assortmentProduct: AssortmentProduct, unchainedAPI: UnchainedCore) => {
+  const { modules } = unchainedAPI;
   if (
     !(await modules.products.productExists({
       productId: assortmentProduct.productId,
@@ -12,25 +12,18 @@ const upsert = async (assortmentProduct: AssortmentProduct, unchainedAPI: Contex
     throw new Error(`Can't link non-existing product ${assortmentProduct.productId}`);
   }
   try {
-    const newAssortmentProduct = await modules.assortments.products.create(
-      assortmentProduct,
-      {
-        skipInvalidation: true,
-      },
-      userId,
-    );
+    const newAssortmentProduct = await modules.assortments.products.create(assortmentProduct, {
+      skipInvalidation: true,
+    });
     return newAssortmentProduct;
   } catch (e) {
-    return modules.assortments.products.update(
-      assortmentProduct._id,
-      assortmentProduct,
-      { skipInvalidation: true },
-      userId,
-    );
+    return modules.assortments.products.update(assortmentProduct._id, assortmentProduct, {
+      skipInvalidation: true,
+    });
   }
 };
 
-export default async ({ products, authorId, assortmentId }, unchainedAPI: Context) => {
+export default async ({ products, assortmentId }, unchainedAPI: UnchainedCore) => {
   const { modules } = unchainedAPI;
   const assortmentProductIds = await Promise.all(
     products.map(async (product: AssortmentProduct) => {
@@ -38,7 +31,6 @@ export default async ({ products, authorId, assortmentId }, unchainedAPI: Contex
       const assortmentProduct = await upsert(
         {
           ...product,
-          authorId,
           tags,
           assortmentId,
         },

package/src/bulk-importer/handlers/assortment/upsertMedia.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentMediaText } from '@unchainedshop/types/assortments.media';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertAsset from '../../upsertAsset';
 
-const upsertMediaObject = async (media, unchainedAPI: Context) => {
-  const { modules, userId } = unchainedAPI;
+const upsertMediaObject = async (media, unchainedAPI: UnchainedCore) => {
+  const { modules } = unchainedAPI;
   try {
-    const assortmentMedia = await modules.assortments.media.create(media, userId);
+    const assortmentMedia = await modules.assortments.media.create(media);
     return assortmentMedia;
   } catch (e) {
     const { _id, ...mediaData } = media;
@@ -13,8 +13,8 @@ const upsertMediaObject = async (media, unchainedAPI: Context) => {
   }
 };
 
-export default async ({ media, authorId, assortmentId }, unchainedAPI: Context) => {
-  const { modules, userId } = unchainedAPI;
+export default async ({ media, assortmentId }, unchainedAPI: UnchainedCore) => {
+  const { modules } = unchainedAPI;
   const mediaObjects = await Promise.all(
     media.map(async ({ asset, content, ...mediaData }) => {
       const file = await upsertAsset(
@@ -26,7 +26,6 @@ export default async ({ media, authorId, assortmentId }, unchainedAPI: Context)
 
       const mediaObject = await upsertMediaObject(
         {
-          authorId,
           ...mediaData,
           assortmentId,
           mediaId: file._id,
@@ -38,19 +37,13 @@ export default async ({ media, authorId, assortmentId }, unchainedAPI: Context)
 
       if (content) {
         await Promise.all(
-          Object.entries(content).map(
-            async ([locale, { authorId: tAuthorId, ...localizedData }]: [
-              string,
-              AssortmentMediaText,
-            ]) => {
-              return modules.assortments.media.texts.upsertLocalizedText(
-                mediaObject._id,
-                locale,
-                localizedData,
-                tAuthorId || authorId || userId,
-              );
-            },
-          ),
+          Object.entries(content).map(async ([locale, localizedData]: [string, AssortmentMediaText]) => {
+            return modules.assortments.media.texts.upsertLocalizedText(
+              mediaObject._id,
+              locale,
+              localizedData,
+            );
+          }),
         );
       }
       return mediaObject;

package/src/bulk-importer/handlers/filter/create.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertFilterContent from './upsertFilterContent';
 import upsertFilterOptionContent from './upsertFilterOptionContent';
 
 export default async function createFilter(
   payload: any,
-  { logger, authorId, createShouldUpsertIfIDExists },
-  unchainedAPI: Context,
+  { logger, createShouldUpsertIfIDExists },
+  unchainedAPI: UnchainedCore,
 ) {
   const { modules } = unchainedAPI;
   const { specification, _id } = payload;
@@ -23,11 +23,9 @@ export default async function createFilter(
         ...filterData,
         _id,
         options: options?.map((option) => option.value) || [],
-        authorId,
       },
       unchainedAPI,
       { skipInvalidation: true },
-      unchainedAPI.userId,
     );
   } catch (e) {
     if (!createShouldUpsertIfIDExists) throw e;
@@ -38,11 +36,9 @@ export default async function createFilter(
       {
         ...filterData,
         options: options?.map((option) => option.value) || [],
-        authorId,
       },
       unchainedAPI,
       { skipInvalidation: true },
-      unchainedAPI.userId,
     );
   }
 
@@ -51,7 +47,7 @@ export default async function createFilter(
   }
 
   logger.debug('create localized content for filter', content);
-  await upsertFilterContent({ content, filterId: _id, authorId }, unchainedAPI);
+  await upsertFilterContent({ content, filterId: _id }, unchainedAPI);
 
   logger.debug('create localized content for filter options', content);
   await upsertFilterOptionContent({ options, filterId: _id }, unchainedAPI);

package/src/bulk-importer/handlers/filter/remove.ts

@@ -1,6 +1,6 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async function removeFilter(payload: any, { logger }, unchainedAPI: Context) {
+export default async function removeFilter(payload: any, { logger }, unchainedAPI: UnchainedCore) {
   const { modules } = unchainedAPI;
   const { _id } = payload;
   logger.debug('remove filter');

package/src/bulk-importer/handlers/filter/update.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertFilterContent from './upsertFilterContent';
 import upsertFilterOptionContent from './upsertFilterOptionContent';
 
 export default async function updateFilter(
   payload: any,
-  { authorId, logger }: { authorId: string; logger: any },
-  unchainedAPI: Context,
+  { logger }: { logger: any },
+  unchainedAPI: UnchainedCore,
 ) {
   const { modules } = unchainedAPI;
   const { specification, _id } = payload;
@@ -23,17 +23,15 @@ export default async function updateFilter(
       {
         ...filterData,
         options: options?.map((option) => option.value) || [],
-        authorId,
       },
       unchainedAPI,
       { skipInvalidation: true },
-      unchainedAPI.userId,
     );
   }
 
   if (content) {
     logger.debug('replace localized content for filter', content);
-    await upsertFilterContent({ content, filterId: _id, authorId }, unchainedAPI);
+    await upsertFilterContent({ content, filterId: _id }, unchainedAPI);
   }
 
   if (options) {

package/src/bulk-importer/handlers/filter/upsertFilterContent.ts

@@ -1,20 +1,10 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { FilterText } from '@unchainedshop/types/filters';
 
-export default async function upsertFilterContent(
-  { content, filterId, authorId },
-  unchainedAPI: Context,
-) {
+export default async function upsertFilterContent({ content, filterId }, unchainedAPI: UnchainedCore) {
   return Promise.all(
-    Object.entries(content).map(
-      async ([locale, { authorId: tAuthorId, ...localizedData }]: [string, FilterText]) => {
-        return unchainedAPI.modules.filters.texts.upsertLocalizedText(
-          { filterId },
-          locale,
-          localizedData,
-          tAuthorId || authorId || unchainedAPI.userId,
-        );
-      },
-    ),
+    Object.entries(content).map(async ([locale, localizedData]: [string, FilterText]) => {
+      return unchainedAPI.modules.filters.texts.upsertLocalizedText({ filterId }, locale, localizedData);
+    }),
   );
 }

package/src/bulk-importer/handlers/filter/upsertFilterOptionContent.ts

@@ -1,20 +1,20 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { FilterText } from '@unchainedshop/types/filters';
 
-export default async function upsertFilterOptionContent({ options, filterId }, unchainedAPI: Context) {
+export default async function upsertFilterOptionContent(
+  { options, filterId },
+  unchainedAPI: UnchainedCore,
+) {
   return Promise.all(
     (options || []).map(async ({ content: optionContent, value: optionValue }) => {
       await Promise.all(
-        Object.entries(optionContent).map(
-          async ([locale, { authorId, ...localizedData }]: [string, FilterText]) => {
-            return unchainedAPI.modules.filters.texts.upsertLocalizedText(
-              { filterId, filterOptionValue: optionValue },
-              locale,
-              localizedData,
-              authorId || unchainedAPI.userId,
-            );
-          },
-        ),
+        Object.entries(optionContent).map(async ([locale, localizedData]: [string, FilterText]) => {
+          return unchainedAPI.modules.filters.texts.upsertLocalizedText(
+            { filterId, filterOptionValue: optionValue },
+            locale,
+            localizedData,
+          );
+        }),
       );
     }),
   );

package/src/bulk-importer/handlers/product/create.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertVariations from './upsertVariations';
 import upsertMedia from './upsertMedia';
 import upsertProductContent from './upsertProductContent';
@@ -6,10 +6,10 @@ import transformSpecificationToProductStructure from './transformSpecificationTo
 
 export default async function createProduct(
   payload: any,
-  { logger, authorId, createShouldUpsertIfIDExists },
-  unchainedAPI: Context,
+  { logger, createShouldUpsertIfIDExists },
+  unchainedAPI: UnchainedCore,
 ) {
-  const { modules, userId } = unchainedAPI;
+  const { modules } = unchainedAPI;
   const { specification, media, variations, _id } = payload;
 
   if (!specification) throw new Error(`Specification is required when creating new product ${_id}`);
@@ -19,26 +19,17 @@ export default async function createProduct(
   const productData = transformSpecificationToProductStructure(specification);
   logger.debug('create product object', productData);
   try {
-    await modules.products.create(
-      {
-        ...productData,
-        _id,
-        authorId,
-      },
-      userId,
-    );
+    await modules.products.create({
+      ...productData,
+      _id,
+    });
   } catch (e) {
     if (!createShouldUpsertIfIDExists) throw e;
 
     logger.debug('entity already exists, falling back to update', specification);
-    await modules.products.update(
-      _id,
-      {
-        ...productData,
-        authorId,
-      },
-      userId,
-    );
+    await modules.products.update(_id, {
+      ...productData,
+    });
   }
 
   if (!(await modules.products.productExists({ productId: _id }))) {
@@ -50,7 +41,6 @@ export default async function createProduct(
     {
       content: specification.content,
       productId: _id,
-      authorId,
     },
     unchainedAPI,
   );
@@ -60,13 +50,12 @@ export default async function createProduct(
     {
       variations: variations || [],
       productId: _id,
-      authorId,
     },
     unchainedAPI,
   );
 
   logger.debug('create product media', media);
-  await upsertMedia({ media: media || [], productId: _id, authorId }, unchainedAPI);
+  await upsertMedia({ media: media || [], productId: _id }, unchainedAPI);
 
   return {
     entity: 'PRODUCT',

package/src/bulk-importer/handlers/product/remove.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async function removeProduct(payload: any, { logger }, unchainedAPI: Context) {
-  const { services, userId } = unchainedAPI;
+export default async function removeProduct(payload: any, { logger }, unchainedAPI: UnchainedCore) {
+  const { services } = unchainedAPI;
   const { _id } = payload;
   logger.debug(`remove product ${_id}`);
 
-  await services.products.removeProduct({ productId: _id, userId }, unchainedAPI);
+  await services.products.removeProduct({ productId: _id }, unchainedAPI);
 
   return {
     entity: 'PRODUCT',