@unchainedshop/api 4.0.0-rc.13 → 4.0.0-rc.15

package/src/resolvers/type/order/order-payment-types.ts

@@ -5,7 +5,6 @@ import { objectInvert } from '@unchainedshop/utils';
 
 const OrderPaymentMap = {
   OrderPaymentGeneric: PaymentProviderType.GENERIC,
-  OrderPaymentCard: PaymentProviderType.CARD,
   OrderPaymentInvoice: PaymentProviderType.INVOICE,
 };
 

package/src/resolvers/type/order/order-statistics-types.ts

@@ -0,0 +1,99 @@
+import { Context } from '../../../context.js';
+
+function buildDateMatch(dateField: string, dateRange?: { start?: string; end?: string }) {
+  if (!dateRange?.start && !dateRange?.end) return { [dateField]: { $exists: true } };
+
+  const rangeMatch: Record<string, any> = {};
+  if (dateRange?.start) rangeMatch.$gte = new Date(dateRange.start);
+  if (dateRange?.end) rangeMatch.$lte = new Date(dateRange.end);
+
+  return { [dateField]: rangeMatch };
+}
+
+async function aggregateOrders(
+  modules: Context['modules'],
+  dateField: string,
+  dateRange?: { start?: string; end?: string },
+  options?: { includeAmount?: boolean; includeCarts?: boolean },
+) {
+  const match = buildDateMatch(dateField, dateRange);
+
+  const pipeline: any[] = [{ $match: match }];
+
+  if (options?.includeCarts) {
+    match.status = null;
+    match.orderNumber = null;
+  }
+
+  if (options?.includeAmount) {
+    pipeline.push({
+      $addFields: {
+        orderTotal: {
+          $reduce: {
+            input: { $ifNull: ['$calculation', []] },
+            initialValue: 0,
+            in: { $add: ['$$value', { $ifNull: ['$$this.amount', 0] }] },
+          },
+        },
+      },
+    });
+
+    pipeline.push({
+      $group: {
+        _id: {
+          date: { $dateToString: { format: '%Y-%m-%d', date: `$${dateField}` } },
+          currency: '$currencyCode',
+        },
+        totalAmount: { $sum: '$orderTotal' },
+        count: { $sum: 1 },
+      },
+    });
+
+    pipeline.push({
+      $project: {
+        _id: 0,
+        date: '$_id.date',
+        total: { amount: '$totalAmount', currencyCode: '$_id.currency' },
+        count: 1,
+      },
+    });
+
+    pipeline.push({ $sort: { date: 1 } });
+    return modules.orders.aggregateOrders({ pipeline });
+  }
+  // Just count total orders
+  pipeline.push({ $count: 'count' });
+  const result = await modules.orders.aggregateOrders({ pipeline });
+  return result[0]?.count ?? 0;
+}
+export const OrderStatistics = {
+  newCount: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'created', dateRange, { includeCarts: true }),
+
+  checkoutCount: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'ordered', dateRange),
+
+  rejectCount: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'rejected', dateRange),
+
+  confirmCount: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'confirmed', dateRange),
+
+  fulfillCount: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'fullfilled', dateRange),
+
+  newRecords: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'created', dateRange, { includeAmount: true, includeCarts: true }),
+
+  checkoutRecords: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'ordered', dateRange, { includeAmount: true }),
+
+  rejectRecords: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'rejected', dateRange, { includeAmount: true }),
+
+  confirmRecords: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'confirmed', dateRange, { includeAmount: true }),
+
+  fulfilledRecords: async ({ dateRange }, _p, { modules }: Context) =>
+    aggregateOrders(modules, 'fullfilled', dateRange, { includeAmount: true }),
+};

package/src/resolvers/type/product/product-bundle-types.ts

@@ -1,8 +1,8 @@
 import { ProductBundleItem } from '@unchainedshop/core-products';
-import { Product } from './product-types.js';
+import { PlanProduct } from './product-plan-types.js';
 
 export const BundleProduct = {
-  ...Product,
+  ...PlanProduct,
 
   bundleItems(product): ProductBundleItem[] {
     return product.bundleItems ? product.bundleItems : [];

package/src/schema/mutation.ts

@@ -226,12 +226,44 @@ export default [
       doesn’t exists new delivery provider will be created with the provided ID.
       """
       setOrderDeliveryProvider(orderId: ID!, deliveryProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartDelivery* mutations instead")
 
       """
       Change the payment method/provider to an order. If the payment provider
       doesn’t exists new payment provider will be created with the provided ID.
       """
       setOrderPaymentProvider(orderId: ID!, paymentProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartPayment* mutations instead")
+
+      """
+      Update the cart by changing the delivery provider and using a shipping specific configuration
+      """
+      updateCartDeliveryShipping(
+        orderId: ID
+        deliveryProviderId: ID!
+        address: AddressInput
+        meta: JSON
+      ): Order!
+
+      """
+      Update the cart by changing the delivery provider and using a pick up specific configuration
+      """
+      updateCartDeliveryPickUp(
+        orderId: ID
+        deliveryProviderId: ID!
+        orderPickUpLocationId: ID!
+        meta: JSON
+      ): Order!
+
+      """
+      Update the cart by changing the payment provider and using an invoice-type specific configuration
+      """
+      updateCartPaymentInvoice(orderId: ID, paymentProviderId: ID!, meta: JSON): Order!
+
+      """
+      Update the cart by changing the payment provider and using a generic specific configuration
+      """
+      updateCartPaymentGeneric(orderId: ID, paymentProviderId: ID!, meta: JSON): Order!
 
       """
       Update a Shipping Delivery Provider's specific configuration
@@ -240,7 +272,7 @@ export default [
         orderDeliveryId: ID!
         address: AddressInput
         meta: JSON
-      ): OrderDeliveryShipping!
+      ): OrderDeliveryShipping! @deprecated(reason: "Use updateCartDeliveryShipping instead")
 
       """
       Update a Pick Up Delivery Provider's specific configuration
@@ -249,22 +281,19 @@ export default [
         orderDeliveryId: ID!
         orderPickUpLocationId: ID!
         meta: JSON
-      ): OrderDeliveryPickUp!
-
-      """
-      Update a Card Payment Provider's specific configuration
-      """
-      updateOrderPaymentCard(orderPaymentId: ID!, meta: JSON): OrderPaymentCard!
+      ): OrderDeliveryPickUp! @deprecated(reason: "Use updateCartDeliveryPickUp instead")
 
       """
       Update an Invoice Payment Provider's specific configuration
       """
       updateOrderPaymentInvoice(orderPaymentId: ID!, meta: JSON): OrderPaymentInvoice!
+        @deprecated(reason: "Use updateCartPaymentInvoice instead")
 
       """
       Update a Generic Payment Provider's specific configuration
       """
       updateOrderPaymentGeneric(orderPaymentId: ID!, meta: JSON): OrderPaymentGeneric!
+        @deprecated(reason: "Use updateCartPaymentGeneric instead")
 
       """
       Remove an order while it's still open

package/src/schema/query.ts

@@ -480,14 +480,14 @@ export default [
         limit: Int = 10
         offset: Int = 0
         queryString: String
-        created: DateTime
+        created: DateFilterInput
         sort: [SortOptionInput!]
       ): [Event!]!
 
       """
       Get total count of all emitted events
       """
-      eventsCount(types: [String!], queryString: String, created: DateTime): Int!
+      eventsCount(types: [String!], queryString: String, created: DateFilterInput): Int!
 
       """
       Determines if a token is valid/active for reset password

package/src/schema/types/events.ts

@@ -11,9 +11,15 @@ export default [
       created: Timestamp!
     }
 
+    type EventStatisticReport {
+      date: Date!
+      count: Int!
+    }
+
     type EventStatistics {
-      type: EventType!
+      detail: [EventStatisticReport!]!
       emitCount: Int!
+      type: String
     }
   `,
 ];

package/src/schema/types/order/order.ts

@@ -81,13 +81,21 @@ export default [
       updated: DateTime
       user: User
     }
-
+    type OrderStatisticsRecord {
+      date: String!
+      total: Price!
+    }
     type OrderStatistics {
       newCount: Int!
       checkoutCount: Int!
       rejectCount: Int!
       confirmCount: Int!
       fulfillCount: Int!
+      confirmRecords: [OrderStatisticsRecord!]!
+      checkoutRecords: [OrderStatisticsRecord!]!
+      rejectRecords: [OrderStatisticsRecord!]!
+      newRecords: [OrderStatisticsRecord!]!
+      fulfilledRecords: [OrderStatisticsRecord!]!
     }
   `,
 ];

package/src/schema/types/payment.ts

@@ -7,11 +7,6 @@ export default [
     }
 
     enum PaymentProviderType {
-      """
-      Card
-      """
-      CARD
-
       """
       Invoice
       """

package/src/schema/types/product/bundle-product.ts

@@ -13,14 +13,18 @@ export default [
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
       texts(forceLocale: Locale): ProductTexts
+      catalogPrice(quantity: Int = 1, currencyCode: String): Price
+      leveledCatalogPrices(currencyCode: String): [PriceLevel!]!
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        quantity: Int = 1
+        configuration: [ProductConfigurationParameterInput!]
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
+      salesUnit: String
+      salesQuantityPerUnit: String
+      defaultOrderQuantity: Int
       bundleItems: [ProductBundleItem!]
-      reviews(
-        limit: Int = 10
-        offset: Int = 0
-        sort: [SortOptionInput!]
-        queryString: String
-      ): [ProductReview!]!
-      reviewsCount(queryString: String): Int!
       assortmentPaths: [ProductAssortmentPath!]!
       proxies: [ConfigurableOrBundleProduct!]!
       siblings(
@@ -29,6 +33,13 @@ export default [
         offset: Int = 0
         includeInactive: Boolean = false
       ): [Product!]!
+      reviews(
+        limit: Int = 10
+        offset: Int = 0
+        sort: [SortOptionInput!]
+        queryString: String
+      ): [ProductReview!]!
+      reviewsCount(queryString: String): Int!
     }
 
     type ProductBundleItem @cacheControl(maxAge: 180) {

package/src/resolvers/mutations/orders/updateOrderPaymentCard.ts

@@ -1,37 +0,0 @@
-import { log } from '@unchainedshop/logger';
-import { Context } from '../../../context.js';
-import { PaymentProviderType } from '@unchainedshop/core-payment';
-import { OrderPaymentNotFoundError, InvalidIdError, OrderPaymentTypeError } from '../../../errors.js';
-
-export default async function updateOrderPaymentCard(
-  root: never,
-  { orderPaymentId, meta }: { orderPaymentId: string; meta?: any },
-  context: Context,
-) {
-  const { modules, services, userId } = context;
-
-  log(`mutation updateOrderPaymentCard ${orderPaymentId} ${JSON.stringify(meta)}`, { userId });
-
-  if (!orderPaymentId) throw new InvalidIdError({ orderPaymentId });
-
-  const orderPayment = await modules.orders.payments.findOrderPayment({
-    orderPaymentId,
-  });
-  if (!orderPayment) throw new OrderPaymentNotFoundError({ data: { orderPaymentId } });
-
-  const provider = await modules.payment.paymentProviders.findProvider({
-    paymentProviderId: orderPayment.paymentProviderId,
-  });
-  const providerType = provider?.type;
-
-  if (providerType !== PaymentProviderType.CARD)
-    throw new OrderPaymentTypeError({
-      orderPaymentId,
-      received: providerType,
-      required: PaymentProviderType.CARD,
-    });
-
-  await modules.orders.payments.updateContext(orderPayment._id, { meta });
-  await services.orders.updateCalculation(orderPayment.orderId);
-  return modules.orders.payments.findOrderPayment({ orderPaymentId });
-}