@unchainedshop/platform 2.0.0-beta7 → 2.0.0-beta9

package/src/bulk-importer/upsertAsset.ts

@@ -0,0 +1,44 @@
+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: UnchainedCore,
+) => {
+  const { modules, services } = 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 });
+      const updatedFile = await modules.files.findFile({ fileId });
+      return updatedFile;
+    }
+
+    const assetObject = await services.files.uploadFileFromURL(
+      {
+        directoryName,
+        fileInput: {
+          fileLink: url,
+          fileName,
+          headers,
+        },
+        meta: { ...meta, fileId },
+      },
+      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 { UnchainedCore } from '@unchainedshop/types/core';
 
-export default async (unchainedAPI: UnchainedCore, 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

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

@@ -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
-  await 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

@@ -1,18 +1,15 @@
-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 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);

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()
+  });
+});