@unchainedshop/platform 2.0.0-beta6 → 2.0.0-beta8

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

@@ -41,6 +41,10 @@ export default async function createProduct(
     );
   }
 
+  if (!(await modules.products.productExists({ productId: _id }))) {
+    throw new Error(`Can't create product ${_id}, fields missing?`);
+  }
+
   logger.debug('create localized content for product', specification.content);
   await upsertProductContent(
     {

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

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

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

@@ -8,6 +8,10 @@ export default async function createProduct(payload: any, { logger, authorId },
   const { modules, userId } = unchainedAPI;
   const { specification, media, variations, _id } = payload;
 
+  if (!(await modules.products.productExists({ productId: _id }))) {
+    throw new Error(`Can't update non-existing product ${_id}`);
+  }
+
   if (specification) {
     const productData = transformSpecificationToProductStructure(specification);
     logger.debug('update product object', productData);
@@ -33,12 +37,6 @@ export default async function createProduct(payload: any, { logger, authorId },
     }
   }
 
-  if (variations || media) {
-    if (!(await modules.products.productExists({ productId: _id }))) {
-      throw new Error(`Can't update non-existing product ${_id}`);
-    }
-  }
-
   if (variations) {
     logger.debug('replace variations', variations);
     await upsertVariations(

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

@@ -1,44 +1,7 @@
 import { Context } from '@unchainedshop/types/api';
-import { File } from '@unchainedshop/types/files';
 import { ProductMedia, ProductMediaText } from '@unchainedshop/types/products.media';
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
-
-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;
-  }
-};
+import upsertAsset from '../../upsertAsset';
 
 const upsertProductMedia = async (productMedia: ProductMedia, { modules, userId }: Context) => {
   try {
@@ -58,6 +21,7 @@ export default async function upsertMedia({ media, authorId, productId }, unchai
     media.map(async ({ asset, content, ...mediaData }) => {
       const tags = convertTagsToLowerCase(mediaData?.tags);
       const file = await upsertAsset(
+        'product-media',
         { meta: { ...(asset.meta || {}), productId }, ...asset },
         unchainedAPI,
       );

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

@@ -5,9 +5,6 @@ export default async function upsertProductContent(
   { productId, content, authorId },
   { modules, userId }: Context,
 ) {
-  const product = await modules.products.findProduct({ productId });
-  if (!product) throw new Error(`Can't update content of non-existing product ${productId}`);
-
   await Promise.all(
     Object.entries(content).map(
       async ([locale, { authorId: tAuthorId, ...localizedData }]: [string, ProductText]) => {

package/src/bulk-importer/upsertAsset.ts

@@ -0,0 +1,45 @@
+import { Context } from '@unchainedshop/types/api';
+import { File } from '@unchainedshop/types/files';
+
+const upsertAsset = async (
+  directoryName: string,
+  asset: File & { fileName: string; headers?: Record<string, unknown> },
+  unchainedAPI: Context,
+) => {
+  const { modules, services, userId } = unchainedAPI;
+  const { _id: fileId, fileName, url, meta, headers, ...assetData } = asset;
+
+  try {
+    const existingFile = fileId && (await modules.files.findFile({ fileId }));
+    if (existingFile) {
+      const newMeta = { ...meta, fileId };
+      if (JSON.stringify(newMeta) === JSON.stringify(existingFile.meta)) {
+        return existingFile;
+      }
+      await modules.files.update(fileId, { meta: newMeta, ...assetData }, userId);
+      const updatedFile = await modules.files.findFile({ fileId });
+      return updatedFile;
+    }
+
+    const assetObject = await services.files.uploadFileFromURL(
+      {
+        directoryName,
+        fileInput: {
+          fileLink: url,
+          fileName,
+          headers,
+        },
+        meta: { ...meta, fileId },
+        userId,
+      },
+      unchainedAPI,
+    );
+
+    if (!assetObject) throw new Error('Media not created');
+    return assetObject;
+  } catch (e) {
+    return null;
+  }
+};
+
+export default upsertAsset;

package/src/context/setAccessToken.ts

@@ -1,6 +1,6 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async (unchainedAPI: Context, username: string, secret: string) => {
+export default async (unchainedAPI: UnchainedCore, username: string, secret: string): Promise<void> => {
   await unchainedAPI.modules.users.updateUser(
     { username },
     {

package/src/context/withAccessToken.ts

@@ -1,10 +1,11 @@
 import { createLogger } from '@unchainedshop/logger';
+import { Context } from '@unchainedshop/types/api';
 
 const logger = createLogger('unchained:platform');
 
 const contextIdentity = (params) => params;
 
-export default (fn = contextIdentity) => {
+export default (fn: (context: Context) => any = contextIdentity): any => {
   return async (params, unchainedContextFn) => {
     const unchainedContext = await unchainedContextFn(params);
     const newContext = {

package/src/platform-index.ts

@@ -1,2 +1,8 @@
+import { express } from '@unchainedshop/api';
+
 export * from './startPlatform';
 export * from './context';
+
+const connectPlatformToExpress4 = express.connect;
+
+export { connectPlatformToExpress4 };

package/src/setup/setupAccounts.ts

@@ -47,10 +47,8 @@ export const setupAccounts = (unchainedAPI: UnchainedCore) => {
         {
           email: params.email || `${guestname}@unchained.local`,
           guest: true,
-          profile: {},
           password: null,
           initialPassword: true,
-          lastBillingAddress: {},
         },
         {},
       );

package/src/startPlatform.ts

@@ -3,6 +3,7 @@ import { startAPIServer, roles } from '@unchainedshop/api';
 import { initCore } from '@unchainedshop/core';
 import { initDb } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
+import { UnchainedCore } from '@unchainedshop/types/core';
 import { createBulkImporterFactory } from './bulk-importer/createBulkImporter';
 import { runMigrations } from './migrations/runMigrations';
 import { generateEventTypeDefs } from './setup/generateEventTypeDefs';
@@ -35,7 +36,7 @@ const checkWorkQueueEnabled = (options: SetupWorkqueueOptions) => {
   return !UNCHAINED_DISABLE_WORKER;
 };
 
-export const queueWorkers = [];
+export const queueWorkers: Array<any> = [];
 
 export const startPlatform = async ({
   modules = {},
@@ -44,7 +45,6 @@ export const startPlatform = async ({
   resolvers = [],
   options = {},
   rolesOptions = {},
-  expressApp,
   bulkImporter: bulkImporterOptions,
   schema,
   plugins,
@@ -55,8 +55,10 @@ export const startPlatform = async ({
   playground,
   tracing,
   cacheControl,
-  corsOrigins,
-}: PlatformOptions) => {
+}: PlatformOptions): Promise<{
+  unchainedAPI: UnchainedCore;
+  apolloGraphQLServer: any;
+}> => {
   exitOnMissingEnvironmentVariables();
 
   // Configure database
@@ -97,20 +99,18 @@ export const startPlatform = async ({
   ];
 
   // Start the graphQL server
-  startAPIServer({
+  const apolloGraphQLServer = await startAPIServer({
     unchainedAPI,
     roles: configuredRoles,
     typeDefs: [...generatedTypeDefs, ...typeDefs],
     resolvers,
     schema,
     plugins,
-    expressApp,
     cache,
     context,
     introspection,
     playground,
     tracing,
-    corsOrigins,
     cacheControl,
   });
 
@@ -126,5 +126,5 @@ export const startPlatform = async ({
     setImmediate(() => unchainedAPI.modules.filters.invalidateCache({}, unchainedAPI));
   }
 
-  return unchainedAPI;
+  return { unchainedAPI, apolloGraphQLServer };
 };

package/src/templates/resolveQuotationStatusTemplate.ts

@@ -19,8 +19,8 @@ export const resolveQuotationStatusTemplate: TemplateResolver = async (
   const quotation = await modules.quotations.findQuotation({ quotationId });
   const user = await modules.users.findUserById(quotation.userId);
   const attachments = (
-    await modules.files.findFilesByMetaData(
-      { meta: { quotationId: quotation._id, type: 'PROPOSAL ' } },
+    await modules.files.findFiles(
+      { 'meta.quotationId': quotation._id, 'meta.type': 'PROPOSAL' },
       { sort: { 'meta.date': -1 } },
     )
   )

package/src/templates/utils/getOrderAttachmentsData.ts

@@ -6,13 +6,10 @@ export const getOrderAttachmentsData = async (
   params: { fileType: string },
   { modules }: Context,
 ) => {
-  const orderId = order._id;
   const attachments = [];
 
-  const orderFiles = await modules.files.findFilesByMetaData(
-    {
-      meta: { orderId: order._id, type: params.fileType },
-    },
+  const orderFiles = await modules.files.findFiles(
+    { 'meta.orderId': order._id, 'meta.type': params.fileType },
     { limit: 1 },
   );
   attachments.concat(orderFiles);
@@ -23,18 +20,14 @@ export const getOrderAttachmentsData = async (
     { limit: 1 },
   );
   if (modules.orders.payments.isBlockingOrderFullfillment(payment)) {
-    const invoices = await modules.files.findFilesByMetaData(
-      {
-        meta: { orderId, type: 'INVOICE' },
-      },
+    const invoices = await modules.files.findFiles(
+      { 'meta.orderId': order._id, 'meta.type': 'INVOICE' },
       { limit: 1 },
     );
     attachments.concat(invoices);
   } else {
-    const receipts = await modules.files.findFilesByMetaData(
-      {
-        meta: { orderId, type: 'RECEIPT' },
-      },
+    const receipts = await modules.files.findFiles(
+      { 'meta.orderId': order._id, 'meta.type': 'RECEIPT' },
       { limit: 1 },
     );
     attachments.concat(receipts);