@storecraft/database-sql-base 1.0.12 → 1.0.14

package/index.js

@@ -40,35 +40,35 @@ const assert = (b, msg) => {
 export class SQL {
 
   /** @type {boolean} */ 
-  #_is_ready;
+  #is_ready;
 
   /** @type {App<any, any, any>} */ 
-  #_app;
+  #app;
 
   /** @type {ConfigType} */ 
-  #_config;
+  #config;
 
   /** @type {Kysely<Database>} */ 
-  #_client;
+  #client;
   
   /** @type {db_driver["resources"]} */ 
-  #_resources;
+  #resources;
 
   /**
    * 
    * @param {ConfigType} [config] config 
    */
   constructor(config) {
-    this.#_is_ready = false;
-    this.#_config = config;
+    this.#is_ready = false;
+    this.#config = config;
 
     assert(
-      this.#_config.dialect, 
+      this.#config.dialect, 
       'No Dialect found !'
     );
 
     assert(
-      this.#_config.dialect_type, 
+      this.#config.dialect_type, 
       'No Dialect Type specified !'
     );
   }
@@ -87,9 +87,9 @@ export class SQL {
     if(this.isReady)
       return this;
 
-    this.#_app = app;
+    this.#app = app;
     
-    this.#_resources = {
+    this.#resources = {
       auth_users: auth_users(this),
       collections: collections(this),
       customers: customers(this),
@@ -106,7 +106,7 @@ export class SQL {
       search: search(this),
     }
     
-    this.#_is_ready = true; 
+    this.#is_ready = true; 
 
     return this;
   }
@@ -118,9 +118,10 @@ export class SQL {
 
   /**
    * `database` resources
+   * @type {db_driver["resources"]}
    */
   get resources () {
-    return this.#_resources;
+    return this.#resources;
   }
   
   get name() { 
@@ -128,11 +129,11 @@ export class SQL {
   }
 
   get app() { 
-    return this.#_app; 
+    return this.#app; 
   }
 
   get client() { 
-    this.#_client = this.#_client ?? new Kysely(
+    this.#client = this.#client ?? new Kysely(
       {
         dialect: this.config.dialect, 
         plugins: [
@@ -142,19 +143,19 @@ export class SQL {
       }
     );
 
-    return this.#_client; 
+    return this.#client; 
   }
 
   get config() { 
-    return this.#_config; 
+    return this.#config; 
   }
 
   get isReady() { 
-    return this.#_is_ready; 
+    return this.#is_ready; 
   }
 
   get dialectType() { 
-    return this.#_config.dialect_type; 
+    return this.#config.dialect_type; 
   }
 
   get isSqlite() { 

package/migrations.mysql/00003_alter_auth_users.js

@@ -0,0 +1 @@
+export * from '../migrations.shared/00003_alter_auth_users.js'

package/migrations.postgres/00003_alter_auth_users.js

@@ -0,0 +1 @@
+export * from '../migrations.shared/00003_alter_auth_users.js'

package/migrations.shared/00003_alter_auth_users.js

@@ -0,0 +1,37 @@
+/**
+ * @import { Database } from '../types.sql.tables.js'
+ */
+import { Kysely } from 'kysely'
+
+/**
+ * 
+ * @param {Kysely<Database>} db 
+ */
+export async function up(db) {
+
+  await db.schema
+  .alterTable('auth_users')
+  .addColumn('firstname', 'text')
+  .execute();
+
+  await db.schema
+  .alterTable('auth_users')
+  .addColumn('lastname', 'text')
+  .execute();
+}
+
+/**
+ * 
+ * @param {Kysely<Database>} db 
+ */
+export async function down(db) {
+  await db.schema
+  .alterTable('auth_users')
+  .dropColumn('firstname')
+  .execute();
+
+  await db.schema
+  .alterTable('auth_users')
+  .dropColumn('lastname')
+  .execute();
+}

package/migrations.sqlite/00003_alter_auth_users.js

@@ -0,0 +1 @@
+export * from '../migrations.shared/00003_alter_auth_users.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",

package/src/con.auth_users.js

@@ -8,6 +8,7 @@ import {
   regular_upsert_me, where_id_or_handle_table, with_media, with_tags
 } from './con.shared.js'
 import { query_to_eb, query_to_sort } from './utils.query.js';
+import { remove as remove_customer_and_auth_user } from './con.customers.js';
 
 
 export const table_name = 'auth_users';
@@ -31,17 +32,19 @@ const upsert = (driver) => {
             confirmed_mail: item.confirmed_mail ? 1 : 0,
             email: item.email,
             handle: item.email,
-            password: item.password,
+            password: item.password ?? null,
             created_at: item.created_at,
             updated_at: item.updated_at,
             id: item.id,
+            attributes: JSON.stringify(item.attributes),
+            description: item.description,
+            active: item.active ? 1 : 0,
             roles: JSON.stringify(item.roles),
             firstname: item.firstname,
             lastname: item.lastname
           });
         }
       );
-      return t.numInsertedOrUpdatedRows>0;
     } catch(e) {
       console.log(e);
       return false;
@@ -74,7 +77,8 @@ const getByEmail = (driver) => {
   return async (email) => {
     return driver.client
       .selectFrom('auth_users')
-      .selectAll().where('email', '=', email)
+      .selectAll()
+      .where('email', '=', email)
       .executeTakeFirst()
       .then(sanitize);
   }
@@ -85,21 +89,18 @@ const getByEmail = (driver) => {
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
-  return async (id_or_email) => {
-    try {
-      await driver.client.transaction().execute(
-        async (trx) => {
-            
-          // entities
-          // delete me
-          await delete_me(trx, table_name, id_or_email);
-        }
-      );
-    } catch(e) {
-      console.log(e);
-      return false;
-    }
-    return true;
+  return async (handle_or_id) => {
+    // delete related auth user
+    // customers and auth_users have the same object-id and handle
+    let customer_handle_or_id = handle_or_id;
+    if(handle_or_id.startsWith('au_')) {
+      // found an id
+      const object_id = handle_or_id.split('_').at(-1);
+      customer_handle_or_id = 'cus_' + object_id;
+    } 
+    return remove_customer_and_auth_user(driver)(
+      customer_handle_or_id
+    );
   }
 }
 /**
@@ -148,8 +149,8 @@ const list = (driver) => {
 
 /** 
  * @param {SQL} driver
- * @return {db_col}}
- * */
+ * @return {db_col}
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.collections.js

@@ -3,18 +3,18 @@
  */
 import { SQL } from '../index.js'
 import { report_document_media } from './con.images.js'
-import { delete_entity_values_by_value_or_reporter, delete_me, 
+import { 
+  delete_entity_values_by_value_or_reporter_and_context, delete_me, 
   delete_media_of, delete_search_of, delete_tags_of, 
   insert_media_of, insert_search_of, insert_tags_of, 
-  select_entity_ids_by_value_or_reporter, 
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
   count_regular,
-  with_search} from './con.shared.js'
+  with_search
+} from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
-
 export const table_name = 'collections'
 
 /**
@@ -88,16 +88,16 @@ const remove = (driver) => {
         async (trx) => {
             
           // entities
-          await delete_tags_of(trx, id_or_handle);
-          await delete_search_of(trx, id_or_handle);
-          await delete_media_of(trx, id_or_handle);
+          await delete_tags_of(trx, id_or_handle, id_or_handle, table_name);
+          await delete_search_of(trx, id_or_handle, id_or_handle, table_name);
+          await delete_media_of(trx, id_or_handle, id_or_handle, table_name);
           // PRODUCTS -> COLLECTIONS
-          await delete_entity_values_by_value_or_reporter('products_to_collections')(
+          await delete_entity_values_by_value_or_reporter_and_context('products_to_collections')(
             trx, id_or_handle, id_or_handle
           );
           // STOREFRONT => COLLECTIONS
-          await delete_entity_values_by_value_or_reporter('storefronts_to_other')(
-            trx, id_or_handle, id_or_handle
+          await delete_entity_values_by_value_or_reporter_and_context('storefronts_to_other')(
+            trx, id_or_handle, id_or_handle, table_name
           );
 
           // delete me
@@ -120,7 +120,8 @@ const remove = (driver) => {
 const list = (driver) => {
   return async (query) => {
 
-    const items = await driver.client.selectFrom(table_name)
+    const items = await driver.client
+      .selectFrom(table_name)
       .selectAll()
       .select(eb => [
         with_tags(eb, eb.ref('collections.id'), driver.dialectType),
@@ -151,19 +152,27 @@ const list_collection_products = (driver) => {
 
     const items = await driver.client
       .selectFrom('products')
-      .selectAll()
-      .select(eb => [
-        with_media(eb, eb.ref('products.id'), driver.dialectType),
-        with_tags(eb, eb.ref('products.id'), driver.dialectType),
-      ])
+      .innerJoin(
+        'products_to_collections', 
+        'products_to_collections.entity_id', 
+        'products.id'
+      )
+      .selectAll('products')
+      .select(
+        eb => [
+          with_media(eb, eb.ref('products.id'), driver.dialectType),
+          with_tags(eb, eb.ref('products.id'), driver.dialectType),
+        ]
+      )
       .where(
         (eb) => eb.and(
           [
             query_to_eb(eb, query, 'products'),
-            eb('products.id', 'in', 
-              eb => select_entity_ids_by_value_or_reporter( // select all the product ids by collection id
-                eb, 'products_to_collections', handle_or_id
-              )
+            eb.or(
+              [
+                eb('products_to_collections.reporter', '=', handle_or_id),
+                eb('products_to_collections.value', '=', handle_or_id)
+              ]
             )
           ].filter(Boolean)
         )
@@ -172,12 +181,104 @@ const list_collection_products = (driver) => {
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
+      // .compile();
+      // console.log(items[0])
+
     if(query.limitToLast) items.reverse();
 
     return sanitize_array(items);
   }
 }
 
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["count_collection_products"]}
+ */
+const count_collection_products = (driver) => {
+  return async (handle_or_id, query={}) => {
+
+    const result = await driver.client
+      .selectFrom('products')
+      // .select('products.id')
+      .select(
+        (eb) => eb.fn.countAll().as('count')
+      )
+      .innerJoin(
+        'products_to_collections', 
+        'products_to_collections.entity_id', 
+        'products.id'
+      )
+      .where(
+        (eb) => eb.and(
+          [
+            query_to_eb(eb, query, 'products'),
+            eb.or(
+              [
+                eb('products_to_collections.reporter', '=', handle_or_id),
+                eb('products_to_collections.value', '=', handle_or_id)
+              ]
+            )
+          ].filter(Boolean)
+        )
+      )
+      .executeTakeFirst();
+
+    // console.log({result})
+
+    return Number(result.count);
+  }
+}
+
+
+// SELECT 
+//   entity_to_tags_projections.value as tag 
+// FROM products 
+// INNER JOIN 
+//   products_to_collections ON products.id = products_to_collections.entity_id
+// INNER JOIN 
+//   entity_to_tags_projections ON products.id = entity_to_tags_projections.entity_id
+// WHERE products_to_collections.reporter = 'playstation-4-games'
+// GROUP BY tag
+
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["list_used_products_tags"]}
+ */
+const list_used_products_tags = (driver) => {
+  return async (handle_or_id) => {
+
+    const items = await driver.client
+      .selectFrom('products')
+      .innerJoin(
+        'products_to_collections', 
+        'products_to_collections.entity_id', 
+        'products.id'
+      )
+      .innerJoin(
+        'entity_to_tags_projections', 
+        'entity_to_tags_projections.entity_id', 
+        'products.id'
+      )
+      .select('entity_to_tags_projections.value as tag')
+      .where(
+        (eb) => eb.or(
+          [
+            eb('products_to_collections.reporter', '=', handle_or_id),
+            eb('products_to_collections.value', '=', handle_or_id)
+          ]
+        )
+      )
+      .groupBy('tag')
+      .execute();
+
+      // .compile();
+      // console.log(items[0])
+
+    return items.map(e => e.tag);
+  }
+}
+
+
 /** 
  * @param {SQL} driver
  * 
@@ -187,13 +288,13 @@ const list_collection_products = (driver) => {
 export const impl = (driver) => {
 
   return {
-
     get: get(driver),
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
     list_collection_products: list_collection_products(driver),
+    count_collection_products: count_collection_products(driver),
+    list_used_products_tags: list_used_products_tags(driver),
     count: count_regular(driver, table_name),
-
   }
 }

package/src/con.customers.js

@@ -87,26 +87,31 @@ const getByEmail = (driver) => {
  * @param {SQL} driver 
  * @returns {db_col["remove"]}
  */
-const remove = (driver) => {
-  return async (id) => {
+export const remove = (driver) => {
+  return async (handle_or_id) => {
     try {
       await driver.client.transaction().execute(
         async (trx) => {
 
-          const valid_auth_id = `au_${id.split('_').at(-1)}`
           // entities
-          await delete_search_of(trx, id);
-          await delete_media_of(trx, id);
-          await delete_tags_of(trx, id);
-
-          // delete related auth user
-          await trx
-          .deleteFrom('auth_users')
-          .where('auth_users.id', '=', valid_auth_id)
-          .executeTakeFirst();
+          await delete_tags_of(trx, handle_or_id, handle_or_id, table_name);
+          await delete_search_of(trx, handle_or_id, handle_or_id, table_name);
+          await delete_media_of(trx, handle_or_id, handle_or_id, table_name);
+          
+          { // delete related auth user
+            // customers and auth_users have the same object-id and handle
+            let auth_user_handle_or_id = handle_or_id;
+            if(handle_or_id.startsWith('cus_')) {
+              // found an id
+              const object_id = handle_or_id.split('_').at(-1);
+              auth_user_handle_or_id = 'au_' + object_id;
+            } 
+
+            await delete_me(trx, 'auth_users', auth_user_handle_or_id);
+          }
              
-          // delete me
-          await delete_me(trx, table_name, id);
+          // delete customer
+          await delete_me(trx, table_name, handle_or_id);
         }
       );
     } catch(e) {
@@ -150,8 +155,6 @@ const list = (driver) => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["list_customer_orders"]}
  */
 const list_customer_orders = (driver) => {
@@ -187,6 +190,37 @@ const list_customer_orders = (driver) => {
   }
 }
 
+/**
+ * @param {SQL} driver 
+ * @returns {db_col["count_customer_orders"]}
+ */
+const count_customer_orders = (driver) => {
+  return async (id, query) => {
+
+    const result = await driver.client
+      .selectFrom('orders')
+      .select(
+        (eb) => eb.fn.countAll().as('count')
+      )
+      .where(
+        (eb) => eb.and(
+          [
+            query_to_eb(eb, query, table_name),
+            eb.or(
+              [
+                eb('_customer_id', '=', id),
+                eb('_customer_email', '=', id),
+              ]
+            )
+          ].filter(Boolean)
+        )
+      )
+      .executeTakeFirst();
+
+    return Number(result.count);
+  }
+}
+
 /** 
  * @param {SQL} driver
  * @return {db_col}}
@@ -200,6 +234,7 @@ export const impl = (driver) => {
     remove: remove(driver),
     list: list(driver),
     list_customer_orders: list_customer_orders(driver),
+    count_customer_orders: count_customer_orders(driver),
     count: count_regular(driver, table_name),
   }
 }