@unchainedshop/platform 2.0.0-beta8 → 2.0.0-rc.1

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',

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,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
 import { ProductMedia, ProductMediaText } from '@unchainedshop/types/products.media';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
 import upsertAsset from '../../upsertAsset';
 
-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;
@@ -14,8 +14,8 @@ 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 }) => {
@@ -29,7 +29,6 @@ export default async function upsertMedia({ media, authorId, productId }, unchai
       const fileId = file._id;
       const productMedia = await upsertProductMedia(
         {
-          authorId,
           ...mediaData,
           tags,
           productId,
@@ -41,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);
+      }
+    }),
+  );
 }

package/src/bulk-importer/upsertAsset.ts

@@ -1,12 +1,12 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { File } from '@unchainedshop/types/files';
 
 const upsertAsset = async (
   directoryName: string,
   asset: File & { fileName: string; headers?: Record<string, unknown> },
-  unchainedAPI: Context,
+  unchainedAPI: UnchainedCore,
 ) => {
-  const { modules, services, userId } = unchainedAPI;
+  const { modules, services } = unchainedAPI;
   const { _id: fileId, fileName, url, meta, headers, ...assetData } = asset;
 
   try {
@@ -16,7 +16,7 @@ const upsertAsset = async (
       if (JSON.stringify(newMeta) === JSON.stringify(existingFile.meta)) {
         return existingFile;
       }
-      await modules.files.update(fileId, { meta: newMeta, ...assetData }, userId);
+      await modules.files.update(fileId, { meta: newMeta, ...assetData });
       const updatedFile = await modules.files.findFile({ fileId });
       return updatedFile;
     }
@@ -30,7 +30,6 @@ const upsertAsset = async (
           headers,
         },
         meta: { ...meta, fileId },
-        userId,
       },
       unchainedAPI,
     );

package/src/setup/setupAccounts.ts

@@ -29,14 +29,11 @@ export const setupAccounts = (unchainedAPI: UnchainedCore) => {
     if (!input) return true;
     if (input.skipMessaging) return true;
 
-    return unchainedAPI.modules.worker.addWork(
-      {
-        type: 'MESSAGE',
-        retries: 0,
-        input,
-      },
-      undefined,
-    );
+    return unchainedAPI.modules.worker.addWork({
+      type: 'MESSAGE',
+      retries: 0,
+      input,
+    });
   };
 
   accountsServer.services.guest = {
@@ -76,6 +73,8 @@ export const setupAccounts = (unchainedAPI: UnchainedCore) => {
 
   accountsServer.on('LoginTokenCreated', async (props) => {
     const { userId, connection = {} } = props;
+
+    // TODO: Doubt that there is countryContext etc. here?
     const { userIdBeforeLogin, countryContext, remoteAddress, remotePort, userAgent, normalizedLocale } =
       connection;
 

package/src/setup/setupCarts.ts

@@ -17,6 +17,7 @@ export const setupCarts = async (unchainedAPI: UnchainedCore, options: SetupCart
     await Promise.all(
       users.map((user) => {
         const locale = unchainedAPI.modules.users.userLocale(user);
+
         return unchainedAPI.modules.orders.ensureCartForUser(
           { user, countryCode: locale.country },
           unchainedAPI,

package/src/startPlatform.ts

@@ -4,11 +4,10 @@ import { initCore } from '@unchainedshop/core';
 import { initDb } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
 import { UnchainedCore } from '@unchainedshop/types/core';
+import { getRegisteredEvents } from '@unchainedshop/events';
+import { WorkerDirector } from '@unchainedshop/core-worker';
 import { createBulkImporterFactory } from './bulk-importer/createBulkImporter';
 import { runMigrations } from './migrations/runMigrations';
-import { generateEventTypeDefs } from './setup/generateEventTypeDefs';
-import { generateWorkerTypeDefs } from './setup/generateWorkTypeDefs';
-import { generateRoleActionTypeDefs } from './setup/generateRoleActionTypeDefs';
 import { setupAccounts } from './setup/setupAccounts';
 import { setupCarts } from './setup/setupCarts';
 import { setupTemplates } from './setup/setupTemplates';
@@ -85,6 +84,8 @@ export const startPlatform = async ({
   }
 
   const configuredRoles = roles.configureRoles(rolesOptions);
+  const configuredEvents = getRegisteredEvents();
+  const configuredWorkTypes = WorkerDirector.getActivePluginTypes();
 
   // Setup accountsjs specific extensions and event handlers
   setupAccounts(unchainedAPI);
@@ -92,17 +93,13 @@ export const startPlatform = async ({
   // Setup email templates
   setupTemplates();
 
-  const generatedTypeDefs = [
-    ...generateEventTypeDefs(),
-    ...generateWorkerTypeDefs(),
-    ...generateRoleActionTypeDefs(),
-  ];
-
   // Start the graphQL server
   const apolloGraphQLServer = await startAPIServer({
     unchainedAPI,
     roles: configuredRoles,
-    typeDefs: [...generatedTypeDefs, ...typeDefs],
+    events: configuredEvents,
+    workTypes: configuredWorkTypes,
+    typeDefs,
     resolvers,
     schema,
     plugins,

package/src/templates/utils/getOrderAttachmentsData.ts

@@ -1,10 +1,10 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { Order } from '@unchainedshop/types/orders';
 
 export const getOrderAttachmentsData = async (
   order: Order,
   params: { fileType: string },
-  { modules }: Context,
+  { modules }: UnchainedCore,
 ) => {
   const attachments = [];
 

package/src/templates/utils/getOrderPositionsData.ts

@@ -1,11 +1,11 @@
-import { Context } from '@unchainedshop/types/api';
 import { Locale } from '@unchainedshop/types/common';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { Order } from '@unchainedshop/types/orders';
 
 export const getOrderPositionsData = async (
   order: Order,
   params: { locale?: Locale },
-  context: Context,
+  context: UnchainedCore,
 ) => {
   const { modules } = context;
   const orderPositions = await modules.orders.positions.findOrderPositions({

package/tests/platform-index.test.ts

@@ -0,0 +1,5 @@
+describe('Platform', () => {
+  it('Init', async () => {
+    expect(true).toBeTruthy()
+  });
+});

package/lib/setup/generateEventTypeDefs.d.ts

@@ -1 +0,0 @@
-export declare const generateEventTypeDefs: () => string[];

package/lib/setup/generateEventTypeDefs.js

@@ -1,9 +0,0 @@
-import { getRegisteredEvents } from '@unchainedshop/events';
-export const generateEventTypeDefs = () => [
-    /* GraphQL */ `
-    extend enum EventType {
-      ${getRegisteredEvents().join(',')}
-    }
-  `,
-];
-//# sourceMappingURL=generateEventTypeDefs.js.map

package/lib/setup/generateEventTypeDefs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateEventTypeDefs.js","sourceRoot":"","sources":["../../src/setup/generateEventTypeDefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC;IACzC,aAAa,CAAC;;QAER,mBAAmB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;;GAEpC;CACF,CAAC"}

package/lib/setup/generateRoleActionTypeDefs.d.ts

@@ -1 +0,0 @@
-export declare const generateRoleActionTypeDefs: () => string[];

package/lib/setup/generateRoleActionTypeDefs.js

@@ -1,9 +0,0 @@
-import { roles } from '@unchainedshop/api';
-export const generateRoleActionTypeDefs = () => [
-    /* GraphQL */ `
-      extend enum RoleAction {
-        ${Object.keys(roles.actions).join(',')}
-      }
-    `,
-];
-//# sourceMappingURL=generateRoleActionTypeDefs.js.map

package/lib/setup/generateRoleActionTypeDefs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateRoleActionTypeDefs.js","sourceRoot":"","sources":["../../src/setup/generateRoleActionTypeDefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,EAAE,CAAC;IAC9C,aAAa,CAAC;;UAEN,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;KAEzC;CACJ,CAAC"}

package/lib/setup/generateWorkTypeDefs.d.ts

@@ -1 +0,0 @@
-export declare const generateWorkerTypeDefs: () => string[];

package/lib/setup/generateWorkTypeDefs.js

@@ -1,11 +0,0 @@
-import { WorkerDirector } from '@unchainedshop/core-worker';
-export const generateWorkerTypeDefs = () => {
-    return [
-        /* GraphQL */ `
-    extend enum WorkType {
-      ${WorkerDirector.getActivePluginTypes().join(',')}
-    }
-  `,
-    ];
-};
-//# sourceMappingURL=generateWorkTypeDefs.js.map

package/lib/setup/generateWorkTypeDefs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateWorkTypeDefs.js","sourceRoot":"","sources":["../../src/setup/generateWorkTypeDefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,OAAO;QACL,aAAa,CAAC;;QAEV,cAAc,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;;GAEpD;KACA,CAAC;AACJ,CAAC,CAAC"}

package/src/setup/generateEventTypeDefs.ts

@@ -1,9 +0,0 @@
-import { getRegisteredEvents } from '@unchainedshop/events';
-
-export const generateEventTypeDefs = () => [
-  /* GraphQL */ `
-    extend enum EventType {
-      ${getRegisteredEvents().join(',')}
-    }
-  `,
-];

package/src/setup/generateRoleActionTypeDefs.ts

@@ -1,9 +0,0 @@
-import { roles } from '@unchainedshop/api';
-
-export const generateRoleActionTypeDefs = () => [
-  /* GraphQL */ `
-      extend enum RoleAction {
-        ${Object.keys(roles.actions).join(',')}
-      }
-    `,
-];

package/src/setup/generateWorkTypeDefs.ts

@@ -1,11 +0,0 @@
-import { WorkerDirector } from '@unchainedshop/core-worker';
-
-export const generateWorkerTypeDefs = () => {
-  return [
-    /* GraphQL */ `
-    extend enum WorkType {
-      ${WorkerDirector.getActivePluginTypes().join(',')}
-    }
-  `,
-  ];
-};