@storecraft/database-sql-base 1.0.24 → 1.3.0

package/src/con.discounts.js

@@ -14,6 +14,10 @@ import {
   delete_tags_of, insert_media_of, insert_search_of, 
   insert_tags_of, regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, count_regular, with_search,
+  products_with_collections,
+  products_with_discounts,
+  products_with_variants,
+  products_with_related_products,
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, withQuery, withSort } from './utils.query.js'
@@ -72,16 +76,17 @@ const upsert = (driver) => {
             .columns(['entity_handle', 'entity_id', 'value', 'reporter'])
             .expression(eb => 
               eb.selectFrom('products')
-                .select(eb => [
-                    'handle as entity_handle',
-                    'id as entity_id',
-                    eb.val(item.id).as('value'),
-                    eb.val(item.handle).as('reporter')
-                  ]
-                )
-                .where(
-                  eb => eb.and(discount_to_conjunctions(eb, item))
-                )
+              .select(
+                eb => [
+                  'handle as entity_handle',
+                  'id as entity_id',
+                  eb.val(item.id).as('value'),
+                  eb.val(item.handle).as('reporter')
+                ]
+              )
+              .where(
+                eb => eb.and(discount_to_conjunctions(eb, item))
+              )
             ).execute();
 
             for(const extra_search of extra_search_for_products) {
@@ -261,10 +266,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-      // .orderBy(query_to_sort(query, table_name))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 
@@ -279,6 +280,17 @@ const list = (driver) => {
 const list_discount_products = (driver) => {
   return async (handle_or_id, query={}) => {
 
+    const expand = query.expand ?? ['*'];
+    const expand_collections = expand.includes('*') || 
+      expand.includes('collections');
+    const expand_discounts = expand.includes('*') || 
+      expand.includes('discounts');
+    // @ts-ignore
+    const expand_variants = expand.includes('*') || 
+      expand.includes('variants');
+    const expand_related_products = expand.includes('*') || 
+      expand.includes('related_products');
+
     const items = await withSort(
       driver.client
       .selectFrom('products')
@@ -291,7 +303,27 @@ const list_discount_products = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('products.id'), driver.dialectType),
         with_tags(eb, eb.ref('products.id'), driver.dialectType),
-      ])
+
+        expand_collections && 
+        products_with_collections(
+          eb, eb.ref('products.id'), driver.dialectType
+        ),
+
+        expand_discounts && 
+        products_with_discounts(
+          eb, eb.ref('products.id'), driver.dialectType
+        ),
+
+        expand_variants && 
+        products_with_variants(
+          eb, eb.ref('products.id'), driver.dialectType
+        ),
+
+        expand_related_products && 
+        products_with_related_products(
+          eb, eb.ref('products.id'), driver.dialectType
+        ),              
+      ].filter(Boolean))
       .where(
         (eb) => eb.and(
           [
@@ -309,9 +341,6 @@ const list_discount_products = (driver) => {
       query, 'products'
     ).execute();
 
-      // .orderBy(query_to_sort(query, 'products'))
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 

package/src/con.images.js

@@ -203,15 +203,6 @@ const list = (driver) => {
       query, table_name
     ).execute()
 
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, 'images')) // ts complains because `usage` field is absent
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 

package/src/con.notifications.js

@@ -129,15 +129,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, 'notifications'))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 

package/src/con.orders.js

@@ -150,15 +150,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-      // .where(
-      //   (eb) => {
-      //     return query_to_eb(eb, query, table_name);
-      //   }
-      // )
-      // .orderBy(query_to_sort(query, table_name))
-      // .limit(query.limitToLast ?? query.limit ?? 10)
-      // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 

package/src/con.products.js

@@ -34,7 +34,6 @@ import {
 export const table_name = 'products'
 
 /**
- * 
  * @param {db_col["$type_upsert"]} item 
  */
 const is_variant = item => {
@@ -54,8 +53,6 @@ const is_variant = item => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -243,8 +240,6 @@ const get = (driver) => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["getBulk"]}
  */
 const getBulk = (driver) => {
@@ -375,8 +370,6 @@ const remove = (driver) => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["list"]}
  */
 const list = (driver) => {
@@ -424,15 +417,6 @@ const list = (driver) => {
       query, table_name
     ).execute();
 
-    // .where(
-    //   (eb) => {
-    //     return query_to_eb(eb, query, table_name);
-    //   }
-    // )
-    // .orderBy(query_to_sort(query, table_name))
-    // .limit(query.limitToLast ?? query.limit ?? 10)
-    // .execute();
-
     if(query.limitToLast) 
       items.reverse();
 

package/src/con.search.js

@@ -22,7 +22,8 @@ const tables = [
   'notifications',
   'discounts',
   'orders',
-  'templates'
+  'templates',
+  'chats'
 ]
 
 /**
@@ -42,7 +43,7 @@ const prefix_to_resource = {
   'tag': 'tags',
   'template': 'templates',
   'post': 'posts',
-  
+  'chat': 'chats',
 }
 
 const resource_to_props = {
@@ -58,6 +59,7 @@ const resource_to_props = {
   'tags': ['id', 'handle'],
   'templates': ['id', 'handle', 'title'],
   'posts': ['id', 'handle', 'title'],
+  'chats': ['id', 'customer_email', 'customer_id'],
 }
 
 /**