@evershop/evershop 1.2.1 → 1.2.2

package/src/modules/catalog/pages/frontStore/productView/index.js

@@ -1,159 +1,159 @@
-const { select, node } = require('@evershop/postgres-query-builder');
-const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { get } = require('@evershop/evershop/src/lib/util/get');
-const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
-const {
-  setContextValue
-} = require('../../../../graphql/services/contextHelper');
-
-module.exports = async (request, response, delegate, next) => {
-  try {
-    const query = select();
-    query
-      .from('product')
-      .leftJoin('product_description')
-      .on(
-        'product.product_id',
-        '=',
-        'product_description.product_description_product_id'
-      );
-    query
-      .innerJoin('product_inventory')
-      .on(
-        'product.product_id',
-        '=',
-        'product_inventory.product_inventory_product_id'
-      );
-    query.where('product.uuid', '=', request.params.uuid);
-    query.andWhere('status', '=', 1);
-    const product = await query.load(pool);
-
-    if (product === null) {
-      response.status(404);
-      next();
-    } else {
-      const queries = request.query;
-      if (
-        !get(product, 'variant_group_id') ||
-        Object.values(queries).length === 0
-      ) {
-        setContextValue(request, 'productId', product.product_id);
-        setContextValue(request, 'pageInfo', {
-          title: product.meta_title || product.name,
-          description: product.meta_description || product.short_description
-        });
-      } else {
-        const group = await select()
-          .from('variant_group')
-          .select('attribute_one')
-          .select('attribute_two')
-          .select('attribute_three')
-          .select('attribute_four')
-          .select('attribute_five')
-          .where('variant_group_id', '=', product.variant_group_id)
-          .load(pool);
-
-        const attributes = await select()
-          .from('attribute')
-          .where(
-            'attribute_id',
-            'IN',
-            Object.values(group).filter((v) => v != null)
-          )
-          .and('attribute_code', 'IN', Object.keys(queries))
-          .execute(pool);
-
-        if (attributes.length > 0) {
-          const vsQuery = select()
-            .from('product', 'p')
-            .select('p.product_id')
-            .select('COUNT(p.product_id)', 'count');
-
-          vsQuery
-            .innerJoin('product_inventory')
-            .on(
-              'p.product_id',
-              '=',
-              'product_inventory.product_inventory_product_id'
-            );
-          vsQuery
-            .innerJoin('product_attribute_value_index', 'a')
-            .on('p.product_id', '=', 'a.product_id');
-          vsQuery
-            .where('p.variant_group_id', '=', product.variant_group_id)
-            .and('p.status', '=', 1);
-
-          if (getConfig('catalog.showOutOfStockProduct') === false) {
-            vsQuery
-              .andWhere('product_inventory.manage_stock', '=', false)
-              .addNode(
-                node('OR')
-                  .addLeaf('AND', 'product_inventory.qty', '>', 0)
-                  .addLeaf(
-                    'AND',
-                    'product_inventory.stock_availability',
-                    '=',
-                    true
-                  )
-              );
-          }
-          vsQuery
-            .andWhere(
-              'a.attribute_id',
-              'IN',
-              attributes.map((a) => a.attribute_id)
-            )
-            .and(
-              'a.option_id',
-              'IN',
-              attributes.map((a) => queries[a.attribute_code])
-            );
-          vsQuery.groupBy('p.product_id');
-          vsQuery.having('COUNT(p.product_id)', '>=', attributes.length);
-          const variants = await vsQuery.execute(pool);
-
-          if (variants.length > 0) {
-            const variantQuery = select();
-            variantQuery
-              .from('product')
-              .leftJoin('product_description')
-              .on(
-                'product.product_id',
-                '=',
-                'product_description.product_description_product_id'
-              );
-            variantQuery
-              .innerJoin('product_inventory')
-              .on(
-                'product.product_id',
-                '=',
-                'product_inventory.product_inventory_product_id'
-              );
-            variantQuery.where('product_id', '=', variants[0].product_id);
-            const pv = await variantQuery.load(pool);
-            setContextValue(request, 'productId', pv.product_id);
-            setContextValue(request, 'pageInfo', {
-              title: pv.meta_title || pv.name,
-              description: pv.meta_description || pv.short_description
-            });
-          } else {
-            setContextValue(request, 'productId', product.product_id);
-            setContextValue(request, 'pageInfo', {
-              title: product.meta_title || product.name,
-              description: product.meta_description || product.short_description
-            });
-          }
-        } else {
-          setContextValue(request, 'productId', product.product_id);
-          setContextValue(request, 'pageInfo', {
-            title: product.meta_title || product.name,
-            description: product.meta_description || product.short_description
-          });
-        }
-      }
-      next();
-    }
-  } catch (e) {
-    next(e);
-  }
-};
+const { select, node } = require('@evershop/postgres-query-builder');
+const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
+const { get } = require('@evershop/evershop/src/lib/util/get');
+const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
+const {
+  setContextValue
+} = require('../../../../graphql/services/contextHelper');
+
+module.exports = async (request, response, delegate, next) => {
+  try {
+    const query = select();
+    query
+      .from('product')
+      .leftJoin('product_description')
+      .on(
+        'product.product_id',
+        '=',
+        'product_description.product_description_product_id'
+      );
+    query
+      .innerJoin('product_inventory')
+      .on(
+        'product.product_id',
+        '=',
+        'product_inventory.product_inventory_product_id'
+      );
+    query.where('product.uuid', '=', request.params.uuid);
+    query.andWhere('status', '=', 1);
+    const product = await query.load(pool);
+
+    if (product === null) {
+      response.status(404);
+      next();
+    } else {
+      const queries = request.query;
+      if (
+        !get(product, 'variant_group_id') ||
+        Object.values(queries).length === 0
+      ) {
+        setContextValue(request, 'productId', product.product_id);
+        setContextValue(request, 'pageInfo', {
+          title: product.meta_title || product.name,
+          description: product.meta_description || product.short_description
+        });
+      } else {
+        const group = await select()
+          .from('variant_group')
+          .select('attribute_one')
+          .select('attribute_two')
+          .select('attribute_three')
+          .select('attribute_four')
+          .select('attribute_five')
+          .where('variant_group_id', '=', product.variant_group_id)
+          .load(pool);
+
+        const attributes = await select()
+          .from('attribute')
+          .where(
+            'attribute_id',
+            'IN',
+            Object.values(group).filter((v) => v != null)
+          )
+          .and('attribute_code', 'IN', Object.keys(queries))
+          .execute(pool);
+
+        if (attributes.length > 0) {
+          const vsQuery = select()
+            .from('product', 'p')
+            .select('p.product_id')
+            .select('COUNT(p.product_id)', 'count');
+
+          vsQuery
+            .innerJoin('product_inventory')
+            .on(
+              'p.product_id',
+              '=',
+              'product_inventory.product_inventory_product_id'
+            );
+          vsQuery
+            .innerJoin('product_attribute_value_index', 'a')
+            .on('p.product_id', '=', 'a.product_id');
+          vsQuery
+            .where('p.variant_group_id', '=', product.variant_group_id)
+            .and('p.status', '=', 1);
+
+          if (getConfig('catalog.showOutOfStockProduct') === false) {
+            vsQuery
+              .andWhere('product_inventory.manage_stock', '=', false)
+              .addNode(
+                node('OR')
+                  .addLeaf('AND', 'product_inventory.qty', '>', 0)
+                  .addLeaf(
+                    'AND',
+                    'product_inventory.stock_availability',
+                    '=',
+                    true
+                  )
+              );
+          }
+          vsQuery
+            .andWhere(
+              'a.attribute_id',
+              'IN',
+              attributes.map((a) => a.attribute_id)
+            )
+            .and(
+              'a.option_id',
+              'IN',
+              attributes.map((a) => queries[a.attribute_code])
+            );
+          vsQuery.groupBy('p.product_id');
+          vsQuery.having('COUNT(p.product_id)', '>=', attributes.length);
+          const variants = await vsQuery.execute(pool);
+
+          if (variants.length > 0) {
+            const variantQuery = select();
+            variantQuery
+              .from('product')
+              .leftJoin('product_description')
+              .on(
+                'product.product_id',
+                '=',
+                'product_description.product_description_product_id'
+              );
+            variantQuery
+              .innerJoin('product_inventory')
+              .on(
+                'product.product_id',
+                '=',
+                'product_inventory.product_inventory_product_id'
+              );
+            variantQuery.where('product_id', '=', variants[0].product_id);
+            const pv = await variantQuery.load(pool);
+            setContextValue(request, 'productId', pv.product_id);
+            setContextValue(request, 'pageInfo', {
+              title: pv.meta_title || pv.name,
+              description: pv.meta_description || pv.short_description
+            });
+          } else {
+            setContextValue(request, 'productId', product.product_id);
+            setContextValue(request, 'pageInfo', {
+              title: product.meta_title || product.name,
+              description: product.meta_description || product.short_description
+            });
+          }
+        } else {
+          setContextValue(request, 'productId', product.product_id);
+          setContextValue(request, 'pageInfo', {
+            title: product.meta_title || product.name,
+            description: product.meta_description || product.short_description
+          });
+        }
+      }
+      next();
+    }
+  } catch (e) {
+    next(e);
+  }
+};

package/src/modules/catalog/pages/frontStore/productView/route.json

@@ -1,5 +1,5 @@
-{
-  "methods": ["GET"],
-  "path": "/product/:uuid",
-  "name": "Product single page"
-}
+{
+  "methods": ["GET"],
+  "path": "/product/:uuid",
+  "name": "Product single page"
+}

package/src/modules/catalog/services/AttributeCollection.js

@@ -1,59 +1,59 @@
-const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
-const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { getValue } = require('@evershop/evershop/src/lib/util/registry');
-
-class AttributeCollection {
-  constructor(baseQuery) {
-    this.baseQuery = baseQuery;
-  }
-
-  async init(filters = []) {
-    const currentFilters = [];
-
-    // Apply the filters
-    const attributeCollectionFilters = await getValue(
-      'attributeCollectionFilters',
-      []
-    );
-
-    attributeCollectionFilters.forEach((filter) => {
-      const check = filters.find(
-        (f) => f.key === filter.key && filter.operation.includes(f.operation)
-      );
-      if (filter.key === '*' || check) {
-        filter.callback(
-          this.baseQuery,
-          check?.operation,
-          check?.value,
-          currentFilters
-        );
-      }
-    });
-
-    // Clone the main query for getting total right before doing the paging
-    const totalQuery = this.baseQuery.clone();
-    totalQuery.select('COUNT(attribute.attribute_id)', 'total');
-    totalQuery.removeOrderBy();
-    totalQuery.removeLimit();
-
-    this.currentFilters = currentFilters;
-    this.totalQuery = totalQuery;
-  }
-
-  async items() {
-    const items = await this.baseQuery.execute(pool);
-    return items.map((row) => camelCase(row));
-  }
-
-  async total() {
-    // Call items to get the total
-    const total = await this.totalQuery.execute(pool);
-    return total[0].total;
-  }
-
-  currentFilters() {
-    return this.currentFilters;
-  }
-}
-
-module.exports.AttributeCollection = AttributeCollection;
+const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
+const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
+const { getValue } = require('@evershop/evershop/src/lib/util/registry');
+
+class AttributeCollection {
+  constructor(baseQuery) {
+    this.baseQuery = baseQuery;
+  }
+
+  async init(filters = []) {
+    const currentFilters = [];
+
+    // Apply the filters
+    const attributeCollectionFilters = await getValue(
+      'attributeCollectionFilters',
+      []
+    );
+
+    attributeCollectionFilters.forEach((filter) => {
+      const check = filters.find(
+        (f) => f.key === filter.key && filter.operation.includes(f.operation)
+      );
+      if (filter.key === '*' || check) {
+        filter.callback(
+          this.baseQuery,
+          check?.operation,
+          check?.value,
+          currentFilters
+        );
+      }
+    });
+
+    // Clone the main query for getting total right before doing the paging
+    const totalQuery = this.baseQuery.clone();
+    totalQuery.select('COUNT(attribute.attribute_id)', 'total');
+    totalQuery.removeOrderBy();
+    totalQuery.removeLimit();
+
+    this.currentFilters = currentFilters;
+    this.totalQuery = totalQuery;
+  }
+
+  async items() {
+    const items = await this.baseQuery.execute(pool);
+    return items.map((row) => camelCase(row));
+  }
+
+  async total() {
+    // Call items to get the total
+    const total = await this.totalQuery.execute(pool);
+    return total[0].total;
+  }
+
+  currentFilters() {
+    return this.currentFilters;
+  }
+}
+
+module.exports.AttributeCollection = AttributeCollection;

package/src/modules/catalog/services/AttributeGroupCollection.js

@@ -1,100 +1,100 @@
-const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
-const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const {
-  getValue,
-  getValueSync
-} = require('@evershop/evershop/src/lib/util/registry');
-const {
-  OPERATION_MAP
-} = require('@evershop/evershop/src/lib/util/filterOperationMapp');
-
-class AttributeGroupCollection {
-  constructor(baseQuery) {
-    this.baseQuery = baseQuery;
-  }
-
-  async init(filters = []) {
-    const currentFilters = [];
-    const defaultFilters = [
-      {
-        key: 'name',
-        operation: ['eq', 'like', 'nlike'],
-        callback: (query, operation, value, currentFilters) => {
-          query.andWhere(
-            'attribute_group.group_name',
-            OPERATION_MAP[operation],
-            value
-          );
-          currentFilters.push({
-            key: 'name',
-            operation,
-            value
-          });
-        }
-      },
-      {
-        key: 'ob',
-        operation: ['eq'],
-        callback: (query, operation, value, currentFilters) => {
-          const attributeGroupsSortBy = getValueSync('attributeGroupsSortBy', {
-            name: (query) => query.orderBy('attribute_group.group_name')
-          });
-
-          if (attributeGroupsSortBy[value]) {
-            attributeGroupsSortBy[value](query, operation);
-            currentFilters.push({
-              key: 'ob',
-              operation,
-              value
-            });
-          }
-        }
-      }
-    ];
-    // Apply the filters
-    const attributeGroupCollectionFilters = await getValue(
-      'attributeGroupCollectionFilters',
-      defaultFilters
-    );
-
-    attributeGroupCollectionFilters.forEach((filter) => {
-      const check = filters.find(
-        (f) => f.key === filter.key && filter.operation.includes(f.operation)
-      );
-      if (filter.key === '*' || check) {
-        filter.callback(
-          this.baseQuery,
-          check?.operation,
-          check?.value,
-          currentFilters
-        );
-      }
-    });
-
-    // Clone the main query for getting total right before doing the paging
-    const totalQuery = this.baseQuery.clone();
-    totalQuery.select('COUNT(attribute_group.attribute_group_id)', 'total');
-    totalQuery.removeOrderBy();
-    totalQuery.removeLimit();
-
-    this.currentFilters = currentFilters;
-    this.totalQuery = totalQuery;
-  }
-
-  async items() {
-    const items = await this.baseQuery.execute(pool);
-    return items.map((row) => camelCase(row));
-  }
-
-  async total() {
-    // Call items to get the total
-    const total = await this.totalQuery.execute(pool);
-    return total[0].total;
-  }
-
-  currentFilters() {
-    return this.currentFilters;
-  }
-}
-
-module.exports.AttributeGroupCollection = AttributeGroupCollection;
+const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
+const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
+const {
+  getValue,
+  getValueSync
+} = require('@evershop/evershop/src/lib/util/registry');
+const {
+  OPERATION_MAP
+} = require('@evershop/evershop/src/lib/util/filterOperationMapp');
+
+class AttributeGroupCollection {
+  constructor(baseQuery) {
+    this.baseQuery = baseQuery;
+  }
+
+  async init(filters = []) {
+    const currentFilters = [];
+    const defaultFilters = [
+      {
+        key: 'name',
+        operation: ['eq', 'like', 'nlike'],
+        callback: (query, operation, value, currentFilters) => {
+          query.andWhere(
+            'attribute_group.group_name',
+            OPERATION_MAP[operation],
+            value
+          );
+          currentFilters.push({
+            key: 'name',
+            operation,
+            value
+          });
+        }
+      },
+      {
+        key: 'ob',
+        operation: ['eq'],
+        callback: (query, operation, value, currentFilters) => {
+          const attributeGroupsSortBy = getValueSync('attributeGroupsSortBy', {
+            name: (query) => query.orderBy('attribute_group.group_name')
+          });
+
+          if (attributeGroupsSortBy[value]) {
+            attributeGroupsSortBy[value](query, operation);
+            currentFilters.push({
+              key: 'ob',
+              operation,
+              value
+            });
+          }
+        }
+      }
+    ];
+    // Apply the filters
+    const attributeGroupCollectionFilters = await getValue(
+      'attributeGroupCollectionFilters',
+      defaultFilters
+    );
+
+    attributeGroupCollectionFilters.forEach((filter) => {
+      const check = filters.find(
+        (f) => f.key === filter.key && filter.operation.includes(f.operation)
+      );
+      if (filter.key === '*' || check) {
+        filter.callback(
+          this.baseQuery,
+          check?.operation,
+          check?.value,
+          currentFilters
+        );
+      }
+    });
+
+    // Clone the main query for getting total right before doing the paging
+    const totalQuery = this.baseQuery.clone();
+    totalQuery.select('COUNT(attribute_group.attribute_group_id)', 'total');
+    totalQuery.removeOrderBy();
+    totalQuery.removeLimit();
+
+    this.currentFilters = currentFilters;
+    this.totalQuery = totalQuery;
+  }
+
+  async items() {
+    const items = await this.baseQuery.execute(pool);
+    return items.map((row) => camelCase(row));
+  }
+
+  async total() {
+    // Call items to get the total
+    const total = await this.totalQuery.execute(pool);
+    return total[0].total;
+  }
+
+  currentFilters() {
+    return this.currentFilters;
+  }
+}
+
+module.exports.AttributeGroupCollection = AttributeGroupCollection;