@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc2

package/src/resolvers/queries/assortments/translatedAssortmentMediaTexts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function translatedAssortmentMediaTexts(
   root: never,

package/src/resolvers/queries/assortments/translatedAssortmentTexts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function translatedAssortmentTexts(
   root: never,

package/src/resolvers/queries/countries/countries.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { CountryQuery } from '@unchainedshop/core-countries';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function countries(
   root: never,

package/src/resolvers/queries/countries/countriesCount.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { CountryQuery } from '@unchainedshop/core-countries';
 import { log } from '@unchainedshop/logger';
 

package/src/resolvers/queries/countries/country.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function country(
   root: never,

package/src/resolvers/queries/currencies/currencies.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { CurrencyQuery } from '@unchainedshop/core-currencies';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function currencies(
   root: never,

package/src/resolvers/queries/currencies/currenciesCount.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { CurrencyQuery } from '@unchainedshop/core-currencies';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function currenciesCount(
   root: never,

package/src/resolvers/queries/currencies/currency.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function currency(
   root: never,

package/src/resolvers/queries/delivery/deliveryInterfaces.ts

@@ -1,13 +1,20 @@
-import { Context } from '../../../types.js';
+import { DeliveryDirector } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 
 export default function deliveryInterfaces(
   root: never,
   { type }: { type: DeliveryProviderType },
-  { modules, userId }: Context,
+  { userId }: Context,
 ) {
   log(`query deliveryInterfaces ${type}`, { userId });
 
-  return modules.delivery.findInterfaces({ type });
+  return DeliveryDirector.getAdapters({
+    adapterFilter: (Adapter) => Adapter.typeSupported(type),
+  }).map((Adapter) => ({
+    _id: Adapter.key,
+    label: Adapter.label,
+    version: Adapter.version,
+  }));
 }

package/src/resolvers/queries/delivery/deliveryProvider.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/queries/delivery/deliveryProviders.ts

@@ -1,10 +1,12 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
-import { DeliveryProviderQuery } from '@unchainedshop/core-delivery';
+import { Context } from '../../../context.js';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 export default async function deliveryProviders(
   root: never,
-  params: DeliveryProviderQuery,
+  params: {
+    type?: DeliveryProviderType;
+  },
   { modules, userId }: Context,
 ) {
   log(`query deliveryProviders ${params.type}`, { userId });

package/src/resolvers/queries/delivery/deliveryProvidersCount.ts

@@ -1,10 +1,12 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
-import { DeliveryProviderQuery } from '@unchainedshop/core-delivery';
+import { Context } from '../../../context.js';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 export default async function deliveryProvidersCount(
   root: never,
-  params: DeliveryProviderQuery,
+  params: {
+    type?: DeliveryProviderType;
+  },
   { modules, userId }: Context,
 ) {
   log(`query deliveryProvidersCount ${params.type}`, { userId });

package/src/resolvers/queries/enrollments/enrollment.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function enrollment(
   root: never,

package/src/resolvers/queries/enrollments/enrollments.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { EnrollmentQuery } from '@unchainedshop/core-enrollments';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function enrollments(
   root: never,

package/src/resolvers/queries/enrollments/enrollmentsCount.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { EnrollmentQuery } from '@unchainedshop/core-enrollments';
 
 export default async function enrollmentsCount(

package/src/resolvers/queries/events/event.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function event(
   root: never,

package/src/resolvers/queries/events/eventStatistics.ts

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { DateFilterInput } from '@unchainedshop/utils';
 
 export default async function eventStatistics(
   root: never,
-  params: { types?: string[]; from?: Date; to?: Date },
+  params: { types?: string[]; dateRange?: DateFilterInput },
   { userId, modules }: Context,
 ) {
-  log(`query eventStatistics ${params.types || ''} ${params.from || ''} ${params.to || ''}`, {
+  log(`query eventStatistics ${(params?.types || []).join(', ')}`, {
     userId,
+    ...(params?.dateRange || {}),
   });
 
   return modules.events.getReport(params);

package/src/resolvers/queries/events/events.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 type FindEventsParams = Parameters<Context['modules']['events']['findEvents']>['0'];
 

package/src/resolvers/queries/events/eventsCounts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 type CountEventsParams = Parameters<Context['modules']['events']['count']>['0'];
 

package/src/resolvers/queries/filters/filter.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function filter(
   root: never,

package/src/resolvers/queries/filters/filters.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { FilterQuery } from '@unchainedshop/core-filters';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function filters(
   root: never,

package/src/resolvers/queries/filters/filtersCount.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { FilterQuery } from '@unchainedshop/core-filters';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function filtersCount(
   root: never,

package/src/resolvers/queries/filters/searchAssortments.ts

@@ -1,21 +1,17 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { SearchQuery } from '@unchainedshop/core-filters';
 import { log } from '@unchainedshop/logger';
 import { QueryStringRequiredError } from '../../../errors.js';
 
 export default async function searchAssortments(root: never, query: SearchQuery, context: Context) {
-  const { modules, userId } = context;
+  const { services, userId } = context;
   const forceLiveCollection = false;
 
   log(`query search assortments ${JSON.stringify(query)}`, { userId });
 
   if (!query.queryString && !query.assortmentIds?.length) throw new QueryStringRequiredError({});
 
-  return modules.filters.search.searchAssortments(
-    query,
-    {
-      forceLiveCollection,
-    },
-    context,
-  );
+  return services.filters.searchAssortments(query, {
+    forceLiveCollection,
+  });
 }

package/src/resolvers/queries/filters/searchProducts.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SearchFilterQuery } from '@unchainedshop/core-filters';
 import { QueryStringRequiredError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function searchProducts(
   root: never,
@@ -15,7 +15,7 @@ export default async function searchProducts(
   },
   context: Context,
 ) {
-  const { modules, userId } = context;
+  const { modules, services, userId } = context;
   const forceLiveCollection = false;
   const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments, ...rest } =
     query;
@@ -31,18 +31,16 @@ export default async function searchProducts(
     const filterIds = await modules.assortments.filters.findFilterIds({
       assortmentId,
     });
-    return modules.filters.search.searchProducts(
+    return services.filters.searchProducts(
       { queryString, includeInactive, filterQuery, productIds, filterIds, ...rest },
       { forceLiveCollection },
-      context,
     );
   }
 
   if (!queryString) throw new QueryStringRequiredError({});
 
-  return modules.filters.search.searchProducts(
+  return services.filters.searchProducts(
     { queryString, includeInactive, filterQuery, ...rest },
     { forceLiveCollection },
-    context,
   );
 }

package/src/resolvers/queries/filters/translatedFilterTexts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function translatedFilterTexts(
   root: never,

package/src/resolvers/queries/languages/language.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/queries/languages/languages.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { LanguageQuery } from '@unchainedshop/core-languages';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function languages(
   root: never,

package/src/resolvers/queries/languages/languagesCount.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { LanguageQuery } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 

package/src/resolvers/queries/orders/order.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function order(
   root: never,

package/src/resolvers/queries/orders/orderStatistics.ts

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { DateFilterInput } from '@unchainedshop/utils';
 
 export default async function orderStatistics(
   root: never,
-  params: { from?: Date; to?: Date },
+  params: { dateRange?: DateFilterInput },
   { modules, userId }: Context,
 ) {
-  log(`query orderStatistics ${params.from || ''} ${params.to || ''}`, {
+  log(`query orderStatistics `, {
     userId,
+    ...(params?.dateRange || {}),
   });
 
   return modules.orders.getReport(params);

package/src/resolvers/queries/orders/orders.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { OrderQuery } from '@unchainedshop/core-orders';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function orders(
   root: never,

package/src/resolvers/queries/orders/ordersCount.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { OrderQuery } from '@unchainedshop/core-orders';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function ordersCount(
   root: never,

package/src/resolvers/queries/payment/paymentInterfaces.ts

@@ -1,13 +1,20 @@
 import { log } from '@unchainedshop/logger';
 import { PaymentProviderType } from '@unchainedshop/core-payment';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
+import { PaymentDirector } from '@unchainedshop/core';
 
 export default async function paymentInterfaces(
   root: never,
   { type }: { type: PaymentProviderType },
-  { modules, userId }: Context,
+  { userId }: Context,
 ) {
   log(`query paymentInterfaces ${type}`, { userId });
 
-  return modules.payment.paymentProviders.findInterfaces({ type });
+  return PaymentDirector.getAdapters()
+    .filter((Adapter) => Adapter.typeSupported(type))
+    .map((Adapter) => ({
+      _id: Adapter.key,
+      label: Adapter.label,
+      version: Adapter.version,
+    }));
 }

package/src/resolvers/queries/payment/paymentProvider.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/queries/payment/paymentProviders.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { mongodb } from '@unchainedshop/mongodb';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 
 export default async function paymentProviders(

package/src/resolvers/queries/payment/paymentProvidersCount.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { mongodb } from '@unchainedshop/mongodb';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 
 export default async function paymentProvidersCount(

package/src/resolvers/queries/products/product.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
 

package/src/resolvers/queries/products/productCatalogPrices.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { InvalidIdError } from '../../../errors.js';
 
 export default async function productCatalogPrices(

package/src/resolvers/queries/products/productReview.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors.js';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function productReview(
   root: never,

package/src/resolvers/queries/products/productReviews.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function productReviews(
   root: never,

package/src/resolvers/queries/products/productReviewsCount.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { ProductReviewQuery } from '@unchainedshop/core-products';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function productReviewsCount(
   root: never,

package/src/resolvers/queries/products/products.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { ProductQuery } from '@unchainedshop/core-products';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function products(
   root: never,

package/src/resolvers/queries/products/productsCount.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { ProductQuery } from '@unchainedshop/core-products';
 
 export default async function productsCount(

package/src/resolvers/queries/products/translatedProductMediaTexts.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function translatedProductMediaTexts(
   root: never,

package/src/resolvers/queries/products/translatedProductTexts.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 
 export default async function translatedProductTexts(

package/src/resolvers/queries/products/translatedProductVariationTexts.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 
 export default async function translatedProductVariationTexts(

package/src/resolvers/queries/quotations/quotation.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { InvalidIdError } from '../../../errors.js';
 
 export default async function quotation(

package/src/resolvers/queries/quotations/quotations.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { SortOption } from '@unchainedshop/utils';
 import { QuotationQuery } from '@unchainedshop/core-quotations';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function quotations(
   root: never,

package/src/resolvers/queries/quotations/quotationsCount.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { QuotationQuery } from '@unchainedshop/core-quotations';
 
 export default async function quotationsCount(

package/src/resolvers/queries/shopInfo.ts

@@ -1,4 +1,4 @@
-import { Context } from '../../types.js';
+import { Context } from '../../context.js';
 import { log } from '@unchainedshop/logger';
 
 export default function shopInfo(

package/src/resolvers/queries/users/me.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function me(root: never, params: any, { userId, user, remoteAddress }: Context) {
   log(`query me ${remoteAddress}`, { userId });

package/src/resolvers/queries/users/user.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function user(
   root: never,

package/src/resolvers/queries/users/users.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
-import { SortOption } from '@unchainedshop/utils';
+import { SortOption, DateFilterInput } from '@unchainedshop/utils';
 import { UserQuery } from '@unchainedshop/core-users';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function users(
   root: never,
@@ -9,6 +9,9 @@ export default async function users(
     limit?: number;
     offset?: number;
     sort?: Array<SortOption>;
+    includeGuests?: boolean;
+    emailVerified?: boolean;
+    lastLogin?: DateFilterInput;
   },
   { modules, userId }: Context,
 ) {
@@ -18,6 +21,7 @@ export default async function users(
     }`,
     {
       userId,
+      ...(params || {}),
     },
   );
 

package/src/resolvers/queries/users/usersCount.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 import { UserQuery } from '@unchainedshop/core-users';
 
 export default async function usersCount(root: never, params: UserQuery, { modules, userId }: Context) {

package/src/resolvers/queries/users/validateResetPasswordToken.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function validateResetPasswordToken(
   root: never,

package/src/resolvers/queries/users/validateVerifyEmailToken.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export default async function validateVerifyEmailToken(
   root: never,