feat(metrics): performance

Pinelab-studio · Oct 31, 2024 · 300fb95 · 300fb95
1 parent 8e7e53c
commit 300fb95
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/packages/vendure-plugin-metrics/CHANGELOG.md b/packages/vendure-plugin-metrics/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.4.1 (2024-10-31)
+
+- Only fetch relations from DB when variants are passed in for better performance
+
 # 1.4.0 (2024-10-31)
 
 - Added revenue (per variant) metric

diff --git a/packages/vendure-plugin-metrics/package.json b/packages/vendure-plugin-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-metrics",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Vendure plugin measuring and visualizing e-commerce metrics",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-metrics/src/api/metrics/average-order-value.ts b/packages/vendure-plugin-metrics/src/api/metrics/average-order-value.ts
@@ -45,8 +45,6 @@ export class AverageOrderValueMetric implements MetricStrategy<Order> {
         .getRepository(ctx, Order)
         .createQueryBuilder('order')
         .leftJoin('order.channels', 'orderChannel')
-        .leftJoin('order.lines', 'orderLine')
-        .leftJoin('orderLine.productVariant', 'productVariant')
         .where(`orderChannel.id=:channelId`, { channelId: ctx.channelId })
         .andWhere(`order.orderPlacedAt >= :from`, {
           from: from.toISOString(),
@@ -58,9 +56,12 @@ export class AverageOrderValueMetric implements MetricStrategy<Order> {
         .limit(take);
 
       if (variants.length) {
-        query = query.andWhere(`productVariant.id IN(:...variantIds)`, {
-          variantIds: variants.map((v) => v.id),
-        });
+        query = query
+          .leftJoin('order.lines', 'orderLine')
+          .leftJoin('orderLine.productVariant', 'productVariant')
+          .andWhere(`productVariant.id IN(:...variantIds)`, {
+            variantIds: variants.map((v) => v.id),
+          });
       }
       const [items, totalOrders] = await query.getManyAndCount();
       orders.push(...items);

diff --git a/packages/vendure-plugin-metrics/src/api/metrics/revenue-per-product.ts b/packages/vendure-plugin-metrics/src/api/metrics/revenue-per-product.ts
@@ -42,8 +42,6 @@ export class RevenuePerProduct implements MetricStrategy<OrderLine> {
         .get(TransactionalConnection)
         .getRepository(ctx, OrderLine)
         .createQueryBuilder('orderLine')
-        .leftJoin('orderLine.productVariant', 'productVariant')
-        .addSelect(['productVariant.sku', 'productVariant.id'])
         .leftJoinAndSelect('orderLine.order', 'order')
         .leftJoin('order.channels', 'channel')
         .where(`channel.id=:channelId`, { channelId: ctx.channelId })
@@ -56,9 +54,12 @@ export class RevenuePerProduct implements MetricStrategy<OrderLine> {
         .offset(skip)
         .limit(take);
       if (variants.length) {
-        query = query.andWhere(`productVariant.id IN(:...variantIds)`, {
-          variantIds: variants.map((v) => v.id),
-        });
+        query = query
+          .leftJoin('orderLine.productVariant', 'productVariant')
+          .addSelect(['productVariant.sku', 'productVariant.id'])
+          .andWhere(`productVariant.id IN(:...variantIds)`, {
+            variantIds: variants.map((v) => v.id),
+          });
       }
       const [items, totalItems] = await query.getManyAndCount();
       lines.push(...items);

diff --git a/packages/vendure-plugin-metrics/src/api/metrics/units-sold-metric.ts b/packages/vendure-plugin-metrics/src/api/metrics/units-sold-metric.ts
@@ -42,9 +42,8 @@ export class UnitsSoldMetric implements MetricStrategy<OrderLine> {
         .get(TransactionalConnection)
         .getRepository(ctx, OrderLine)
         .createQueryBuilder('orderLine')
-        .leftJoin('orderLine.productVariant', 'productVariant')
-        .addSelect(['productVariant.sku', 'productVariant.id'])
-        .leftJoinAndSelect('orderLine.order', 'order')
+        .leftJoin('orderLine.order', 'order')
+        .addSelect(['order.id', 'order.orderPlacedAt'])
         .leftJoin('order.channels', 'channel')
         .where(`channel.id=:channelId`, { channelId: ctx.channelId })
         .andWhere(`order.orderPlacedAt >= :from`, {
@@ -56,9 +55,12 @@ export class UnitsSoldMetric implements MetricStrategy<OrderLine> {
         .skip(skip)
         .take(take);
       if (variants.length) {
-        query = query.andWhere(`productVariant.id IN(:...variantIds)`, {
-          variantIds: variants.map((v) => v.id),
-        });
+        query = query
+          .leftJoin('orderLine.productVariant', 'productVariant')
+          .addSelect(['productVariant.sku', 'productVariant.id'])
+          .andWhere(`productVariant.id IN(:...variantIds)`, {
+            variantIds: variants.map((v) => v.id),
+          });
       }
       const [items, totalItems] = await query.getManyAndCount();
       lines.push(...items);