@unchainedshop/platform 2.0.0-beta7 → 2.0.0-beta9

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

@@ -1,48 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
 import { AssortmentMediaText } from '@unchainedshop/types/assortments.media';
-import { File } from '@unchainedshop/types/files';
+import { UnchainedCore } from '@unchainedshop/types/core';
+import upsertAsset from '../../upsertAsset';
 
-const upsertAsset = async (
-  asset: File & { fileName: string; headers?: Record<string, unknown> },
-  unchainedAPI: Context,
-) => {
-  const { modules, services, userId } = unchainedAPI;
-  const { _id, fileName, url, meta, headers, ...assetData } = asset;
-  const fileId = _id;
-
-  try {
-    if (_id && (await modules.files.findFile({ fileId }))) throw new Error('Media already exists');
-
-    const assetObject = await services.files.uploadFileFromURL(
-      {
-        directoryName: 'assortment-media',
-        fileInput: {
-          fileLink: url,
-          fileName,
-          headers,
-        },
-        meta: { ...meta, fileId },
-        userId,
-      },
-      unchainedAPI,
-    );
-
-    if (!assetObject) throw new Error('Media not created');
-    return assetObject;
-  } catch (e) {
-    if (fileId) {
-      await modules.files.update(fileId, { meta: { ...meta, fileId }, ...assetData }, userId);
-      const file = await modules.files.findFile({ fileId });
-      return file;
-    }
-    return null;
-  }
-};
-
-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;
@@ -50,11 +13,12 @@ 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(
+        'assortment-media',
         { meta: { ...(asset.meta || {}), assortmentId }, ...asset },
         unchainedAPI,
       );
@@ -62,7 +26,6 @@ export default async ({ media, authorId, assortmentId }, unchainedAPI: Context)
 
       const mediaObject = await upsertMediaObject(
         {
-          authorId,
           ...mediaData,
           assortmentId,
           mediaId: file._id,
@@ -74,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,10 +1,10 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async function removeFilter(payload: any, { logger }, unchainedAPI: Context) {
-  const { modules, userId } = unchainedAPI;
+export default async function removeFilter(payload: any, { logger }, unchainedAPI: UnchainedCore) {
+  const { modules } = unchainedAPI;
   const { _id } = payload;
   logger.debug('remove filter');
-  await modules.assortments.filters.deleteMany({ filterId: _id }, userId);
+  await modules.assortments.filters.deleteMany({ filterId: _id });
   await modules.filters.delete(_id);
 
   return {

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,9 +1,9 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async function removeProduct(payload: any, { logger }, unchainedAPI: Context) {
+export default async function removeProduct(payload: any, { logger }, unchainedAPI: UnchainedCore) {
   const { services } = unchainedAPI;
   const { _id } = payload;
-  logger.debug('remove product');
+  logger.debug(`remove product ${_id}`);
 
   await services.products.removeProduct({ productId: _id }, unchainedAPI);
 

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

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import upsertVariations from './upsertVariations';
 import upsertMedia from './upsertMedia';
 import upsertProductContent from './upsertProductContent';
 import transformSpecificationToProductStructure from './transformSpecificationToProductStructure';
 
-export default async function createProduct(payload: any, { logger, authorId }, unchainedAPI: Context) {
-  const { modules, userId } = unchainedAPI;
+export default async function createProduct(payload: any, { logger }, unchainedAPI: UnchainedCore) {
+  const { modules } = unchainedAPI;
   const { specification, media, variations, _id } = payload;
 
   if (!(await modules.products.productExists({ productId: _id }))) {
@@ -15,14 +15,9 @@ export default async function createProduct(payload: any, { logger, authorId },
   if (specification) {
     const productData = transformSpecificationToProductStructure(specification);
     logger.debug('update product object', productData);
-    await modules.products.update(
-      _id,
-      {
-        ...productData,
-        authorId,
-      },
-      userId,
-    );
+    await modules.products.update(_id, {
+      ...productData,
+    });
 
     if (specification.content) {
       logger.debug('replace localized content for product', specification.content);
@@ -30,7 +25,6 @@ export default async function createProduct(payload: any, { logger, authorId },
         {
           content: specification.content,
           productId: _id,
-          authorId,
         },
         unchainedAPI,
       );
@@ -43,7 +37,6 @@ export default async function createProduct(payload: any, { logger, authorId },
       {
         variations: variations || [],
         productId: _id,
-        authorId,
       },
       unchainedAPI,
     );
@@ -51,7 +44,7 @@ export default async function createProduct(payload: any, { logger, authorId },
 
   if (media) {
     logger.debug('replace product media', media);
-    await upsertMedia({ media, productId: _id, authorId }, unchainedAPI);
+    await upsertMedia({ media, productId: _id }, unchainedAPI);
   }
 
   return {

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

@@ -1,48 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
-import { File } from '@unchainedshop/types/files';
 import { ProductMedia, ProductMediaText } from '@unchainedshop/types/products.media';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
+import upsertAsset from '../../upsertAsset';
 
-const upsertAsset = async (
-  asset: File & { fileName: string; headers?: Record<string, unknown> },
-  unchainedAPI: Context,
-) => {
-  const { modules, services, userId } = unchainedAPI;
-  const { _id, fileName, url, meta, headers, ...assetData } = asset;
-  const fileId = _id;
-
-  try {
-    if (_id && (await modules.files.findFile({ fileId }))) throw new Error('Media already exists');
-
-    const assetObject = await services.files.uploadFileFromURL(
-      {
-        directoryName: 'product-media',
-        fileInput: {
-          fileLink: url,
-          fileName,
-          headers,
-        },
-        meta: { ...meta, fileId },
-        userId,
-      },
-      unchainedAPI,
-    );
-
-    if (!assetObject) throw new Error('Media not created');
-    return assetObject;
-  } catch (e) {
-    if (fileId) {
-      await modules.files.update(fileId, { meta: { ...meta, fileId }, ...assetData }, userId);
-      const file = await modules.files.findFile({ fileId });
-      return file;
-    }
-    return null;
-  }
-};
-
-const upsertProductMedia = async (productMedia: ProductMedia, { modules, userId }: Context) => {
+const upsertProductMedia = async (productMedia: ProductMedia, { modules }: UnchainedCore) => {
   try {
-    const productMediaObj = await modules.products.media.create(productMedia, userId);
+    const productMediaObj = await modules.products.media.create(productMedia);
     return productMediaObj;
   } catch (e) {
     const { _id, ...productMediaData } = productMedia;
@@ -51,13 +14,14 @@ const upsertProductMedia = async (productMedia: ProductMedia, { modules, userId
   }
 };
 
-export default async function upsertMedia({ media, authorId, productId }, unchainedAPI: Context) {
-  const { modules, userId } = unchainedAPI;
+export default async function upsertMedia({ media, productId }, unchainedAPI: UnchainedCore) {
+  const { modules } = unchainedAPI;
 
   const productMediaObjects = await Promise.all(
     media.map(async ({ asset, content, ...mediaData }) => {
       const tags = convertTagsToLowerCase(mediaData?.tags);
       const file = await upsertAsset(
+        'product-media',
         { meta: { ...(asset.meta || {}), productId }, ...asset },
         unchainedAPI,
       );
@@ -65,7 +29,6 @@ export default async function upsertMedia({ media, authorId, productId }, unchai
       const fileId = file._id;
       const productMedia = await upsertProductMedia(
         {
-          authorId,
           ...mediaData,
           tags,
           productId,
@@ -77,16 +40,13 @@ export default async function upsertMedia({ media, authorId, productId }, unchai
 
       if (content) {
         await Promise.all(
-          Object.entries(content).map(
-            async ([locale, { authorId: tAuthorId, ...localizedData }]: [string, ProductMediaText]) => {
-              return modules.products.media.texts.upsertLocalizedText(
-                productMedia._id,
-                locale,
-                localizedData,
-                tAuthorId || authorId || userId,
-              );
-            },
-          ),
+          Object.entries(content).map(async ([locale, localizedData]: [string, ProductMediaText]) => {
+            return modules.products.media.texts.upsertLocalizedText(
+              productMedia._id,
+              locale,
+              localizedData,
+            );
+          }),
         );
       }
       return productMedia;

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

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

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

@@ -1,27 +1,23 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { ProductVariation, ProductVariationText } from '@unchainedshop/types/products.variations';
 
-const upsert = async (productVariation: ProductVariation, unchainedAPI: Context) => {
-  const { modules, userId } = unchainedAPI;
+const upsert = async (productVariation: ProductVariation, unchainedAPI: UnchainedCore) => {
+  const { modules } = unchainedAPI;
   try {
-    const newVariation = await modules.products.variations.create(productVariation, userId);
+    const newVariation = await modules.products.variations.create(productVariation);
     return newVariation;
   } catch (e) {
     return modules.products.variations.update(productVariation._id, productVariation);
   }
 };
 
-export default async function upsertVariations(
-  { variations, authorId, productId },
-  unchainedAPI: Context,
-) {
-  const { modules, userId } = unchainedAPI;
+export default async function upsertVariations({ variations, productId }, unchainedAPI: UnchainedCore) {
+  const { modules } = unchainedAPI;
 
-  const productVariationObjects = await Promise.all(
+  const upsertedProductVariationIds = await Promise.all(
     variations.map(async ({ content, options, ...variationsRest }) => {
       const variation = await upsert(
         {
-          authorId,
           ...variationsRest,
           options: options.map((option) => option.value),
           productId,
@@ -33,10 +29,7 @@ export default async function upsertVariations(
         options.map(async ({ content: optionContent, value: optionValue }) => {
           await Promise.all(
             Object.entries(optionContent).map(
-              async ([locale, { authorId: tAuthorId, ...localizedData }]: [
-                string,
-                ProductVariationText,
-              ]) => {
+              async ([locale, localizedData]: [string, ProductVariationText]) => {
                 return modules.products.variations.texts.upsertLocalizedText(
                   {
                     productVariationId: variation._id,
@@ -44,7 +37,6 @@ export default async function upsertVariations(
                   },
                   locale,
                   localizedData,
-                  tAuthorId || authorId || userId,
                 );
               },
             ),
@@ -52,27 +44,27 @@ export default async function upsertVariations(
         }),
       );
       await Promise.all(
-        Object.entries(content).map(
-          async ([locale, { authorId: tAuthorId, ...localizedData }]: [
-            string,
-            ProductVariationText,
-          ]) => {
-            return modules.products.variations.texts.upsertLocalizedText(
-              {
-                productVariationId: variation._id,
-              },
-              locale,
-              localizedData,
-              tAuthorId || authorId || userId,
-            );
-          },
-        ),
+        Object.entries(content).map(async ([locale, localizedData]: [string, ProductVariationText]) => {
+          return modules.products.variations.texts.upsertLocalizedText(
+            {
+              productVariationId: variation._id,
+            },
+            locale,
+            localizedData,
+          );
+        }),
       );
-      return variation;
+      return variation._id;
     }),
   );
-  await modules.products.variations.deleteVariations({
+  const allVariations = await modules.products.variations.findProductVariations({
     productId,
-    excludedProductVariationIds: productVariationObjects.map((obj) => obj._id),
   });
+  await Promise.all(
+    allVariations.map(async (variation) => {
+      if (!upsertedProductVariationIds.includes(variation._id)) {
+        await modules.products.variations.delete(variation._id);
+      }
+    }),
+  );
 }