@storecraft/database-mongodb 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-mongodb",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Storecraft database driver for mongodb on node / bun / deno platform",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",

package/src/con.customers.js

@@ -114,9 +114,11 @@ const count = (driver) => count_regular(driver, col(driver));
  * @returns {db_col["list_customer_orders"]}
  */
 const list_customer_orders = (driver) => {
-  return async (customer_id, query) => {
+  return async (customer_id_or_email, query) => {
 
-    const { filter: filter_query, sort, reverse_sign } = query_to_mongo(query);
+    const { 
+      filter: filter_query, sort, reverse_sign 
+    } = query_to_mongo(query);
 
     // console.log('query', query)
     // console.log('filter', JSON.stringify(filter_query, null, 2))
@@ -126,7 +128,7 @@ const list_customer_orders = (driver) => {
     /** @type {Filter<WithRelations<OrderData>>} */
     const filter = {
       $and: [
-        {'_relations.search': `customer:${customer_id}` },
+        {'_relations.search': `customer:${customer_id_or_email}` },
       ]
     };
 

package/src/con.discounts.utils.js

@@ -1,8 +1,8 @@
 /**
  * @import { 
- *  DiscountType, FilterValue_p_in_price_range, FilterValue_p_not_in_collections, 
- *  FilterValue_p_in_collections, FilterValue_p_not_in_tags, FilterValue_p_in_tags, 
- *  FilterValue_p_in_products, FilterValue_p_not_in_products 
+ *  DiscountType, Filter_p_in_price_range, Filter_p_not_in_collections, 
+ *  Filter_p_in_collections, Filter_p_not_in_tags, Filter_p_in_tags, 
+ *  Filter_p_in_products, Filter_p_not_in_products 
  * } from '@storecraft/core/api'
  */
 
@@ -11,7 +11,11 @@ import { to_objid_safe } from "./utils.funcs.js";
 
 /** @param {DiscountType} d */
 const is_order_discount = d => {
-  return (d.info.details.meta.id===enums.DiscountMetaEnum.order.id);
+  return (
+    (d.info.details.type===enums.DiscountMetaEnum.order.type) ||
+    // @ts-ignore
+    (d.info.details.meta?.type===enums.DiscountMetaEnum.order.type)
+  );
 }
 
 /** @param {DiscountType} d */
@@ -40,7 +44,7 @@ export const discount_to_mongo_conjunctions = d => {
   const filters = d.info.filters;
 
   for(const filter of filters) {
-    const op = filter.meta.op;
+    const op = filter.op ?? filter.meta.op;
 
     switch (op) {
       case enums.FilterMetaEnum.p_all.op:
@@ -48,58 +52,64 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_in_products.op:
         {
-          const cast = /** @type {FilterValue_p_in_products} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_products} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { handle: { $in: cast.map(it => it.handle) } }
+            { handle: { $in: value.map(it => it.handle) } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_products.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_products} */(
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_products} */ (
+            filter
           );
+
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { handle: { $nin: cast.map(it => it.handle) } }
+            { handle: { $nin: value.map(it => it.handle) } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_in_tags.op:
         {
-          const cast = /** @type {FilterValue_p_in_tags} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_tags} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { tags: { $in: cast } }
+            { tags: { $in: value } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_tags.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_tags} */(
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_tags} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
 
           conjunctions.push(
-            { tags: { $nin: cast } }
+            { tags: { $nin: value } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_in_collections} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_collections} */ (
+            filter
           );
-
+          const value = filter_cast?.value ?? [];
+          
           conjunctions.push(
             { 
               '_relations.collections.ids': { 
-                $in: cast.map(c => to_objid_safe(c.id)).filter(Boolean) 
+                $in: value.map(c => to_objid_safe(c.id)).filter(Boolean) 
               } 
             }
           );
@@ -107,14 +117,15 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_not_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_collections} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_collections} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
 
           conjunctions.push(
             { 
               '_relations.collections.ids': { 
-                $nin: cast.map(c => to_objid_safe(c.id)).filter(Boolean) 
+                $nin: value.map(c => to_objid_safe(c.id)).filter(Boolean) 
               } 
             }
           );
@@ -122,16 +133,19 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_in_price_range.op:
         {
-          const cast = /** @type {FilterValue_p_in_price_range} */ (
+          const filter_cast = /** @type {Filter_p_in_price_range} */ (
+            filter
+          );
+          const value = /** @type {Filter_p_in_price_range["value"]} */ (
             {
               from: 0,
               to: Number.POSITIVE_INFINITY,
-              ...(filter?.value ?? {})
+              ...(filter_cast?.value ?? {})
             }
           );
 
-          const from = extract_abs_number(cast.from);
-          const to = extract_abs_number(cast.to);
+          const from = extract_abs_number(value.from);
+          const to = extract_abs_number(value.to);
 
           const conj = { price: { $and: [] } };
 

package/src/con.products.js

@@ -308,107 +308,7 @@ const count = (driver) => count_regular(driver, col(driver));
 
 
 /**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
  * @param {MongoDB} driver 
- * @returns {db_col["list_all_product_collections"]}
- */
-const list_product_collections = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['collections']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-    
-    return sanitize_array(item?.collections ?? []);
-  }
-}
-
-/**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
- * 
- * 
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_product_variants"]}
- */
-const list_product_variants = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['variants']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    if(item && ('variants' in item)) {
-      
-      return sanitize_array(item?.variants ?? []);
-    }
-
-    return [];
-  }
-}
-
-/**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
- * 
- * 
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_related_products"]}
- */
-const list_related_products = (driver) => {
-  return async (product) => {
-    /** @type {import('@storecraft/core/database').RegularGetOptions} */
-    const options = {
-      expand: ['related_products']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.related_products ?? []);
-  }
-}
-
-
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_product_discounts"]}
- */
-const list_product_discounts = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['discounts']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.discounts ?? []);
-  }
-}
-
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["add_product_to_collection"]}
  */
 const add_product_to_collection = (driver) => {
   return async (product_id_or_handle, collection_handle_or_id) => {
@@ -437,9 +337,6 @@ const add_product_to_collection = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["remove_product_from_collection"]}
  */
 const remove_product_from_collection = (driver) => {
   return async (product_id_or_handle, collection_handle_or_id) => {
@@ -466,52 +363,56 @@ const remove_product_from_collection = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["changeStockOfBy"]}
  */
 const changeStockOfBy = (driver) => {
   return async (product_ids_or_handles, deltas) => {
 
-    /** 
-     * @type {AnyBulkWriteOperation<WithRelations<ProductType | VariantType>>[]}
-     */
-    let ops = []
-
-    product_ids_or_handles.forEach(
-      (id, ix) => {
-        ops.push(
-          {
-            updateOne: {
-              filter: handle_or_id(id),
-              update: {
-                $inc: { qty: Math.round(deltas[ix]) }
+    try {
+      /** 
+       * @type {AnyBulkWriteOperation<WithRelations<ProductType | VariantType>>[]}
+       */
+      let ops = []
+  
+      product_ids_or_handles.forEach(
+        (id, ix) => {
+          ops.push(
+            {
+              updateOne: {
+                filter: handle_or_id(id),
+                update: {
+                  $inc: { qty: Math.round(deltas[ix]) }
+                }
               }
             }
-          }
-        );
-
-        ops.push(
-          {
-            updateOne: {
-              filter: handle_or_id(id),
-              update: {
-                $max: { qty: 0 }
+          );
+  
+          ops.push(
+            {
+              updateOne: {
+                filter: handle_or_id(id),
+                update: {
+                  $max: { qty: 0 }
+                }
               }
             }
-          }
-        );
-
-      }
-    );
-
-    if(!ops.length)
-      return;
-
-    await driver.resources.products._col.bulkWrite(
-      ops
-    );
+          );
+  
+        }
+      );
+  
+      if(!ops.length)
+        return;
+  
+      await driver.resources.products._col.bulkWrite(
+        ops
+      );
+    } catch(e) {
+      console.log(e);
+      return false;
+    }
 
+    return true;
   }
 }
 
@@ -560,12 +461,6 @@ export const impl = (driver) => {
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
-    add_product_to_collection: add_product_to_collection(driver),
-    remove_product_from_collection: remove_product_from_collection(driver),
-    list_all_product_collections: list_product_collections(driver),
-    list_all_product_variants: list_product_variants(driver),
-    list_all_related_products: list_related_products(driver),
-    list_all_product_discounts: list_product_discounts(driver),
     list_used_products_tags: list_used_products_tags(driver),
     count: count(driver)
   }