@starbemtech/star-db-query-builder 1.0.13 → 1.0.15

package/coverage/clover.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1712321331534" clover="3.2.0">
-  <project timestamp="1712321331534" name="All files">
+<coverage generated="1713917118420" clover="3.2.0">
+  <project timestamp="1713917118420" name="All files">
     <metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0" elements="0" coveredelements="0" complexity="0" loc="0" ncloc="0" packages="0" files="0" classes="0"/>
   </project>
 </coverage>

package/coverage/lcov-report/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-04-05T12:48:51.531Z
+                at 2024-04-24T00:05:18.412Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@starbemtech/star-db-query-builder",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "A query builder to be used with mysql or postgres",
   "author": "Julio Sousa <julio.sousa@starbem.app>",
   "main": "./dist/index.js",

package/src/default/genericRepository.ts

@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid'
-import { QueryParams } from './types'
+import { QueryParams, QueryBuilder } from './types'
 import {
   createGroupByClause,
   createLimitClause,
@@ -145,7 +145,7 @@ export const update = async <P, R>({
   const values: any[] = Object.values(data)
 
   const setClause = generateSetClause(keys, dbClient.clientType)
-  let query = `UPDATE ${tableName} SET ${setClause} WHERE ${id}`
+  let query = `UPDATE ${tableName} SET ${setClause} WHERE id = '${id}'`
 
   if (dbClient.clientType === 'pg') {
     if (returning && returning.length > 0) {
@@ -195,3 +195,47 @@ export const deleteOne = async <T>({
     [id]
   )
 }
+
+export const joins = async <T>({
+  tableName,
+  dbClient,
+  select,
+  joins,
+  where,
+}: QueryParams<T>): Promise<T[]> => {
+  if (!tableName) throw new Error('Table name is required')
+  if (!dbClient) throw new Error('DB client is required')
+
+  const fields = Array.isArray(select) ? select : []
+  const selectFields = createSelectFields(fields, dbClient.clientType)
+  const [whereClause, params] = createWhereClause(where, 1, dbClient.clientType)
+
+  const queryBuilder: QueryBuilder = {
+    select: [selectFields],
+    from: tableName,
+    joins: joins,
+    where: whereClause,
+  }
+
+  const queryString = await buildQuery(queryBuilder)
+
+  const rows = await dbClient.query<T[]>(queryString, params)
+
+  return rows
+}
+
+async function buildQuery(params: QueryBuilder): Promise<string> {
+  let queryString = `SELECT ${params.select.join(', ')} FROM ${params.from}`
+
+  if (params.joins) {
+    for (const join of params.joins) {
+      queryString += ` ${join.type} JOIN ${join.table} ON ${join.on}`
+    }
+  }
+
+  if (params.where) {
+    queryString += `${params.where}`
+  }
+
+  return queryString
+}

package/src/default/types.ts

@@ -31,6 +31,7 @@ export type Condition<T> = OperatorCondition | LogicalCondition<T>
 interface LogicalCondition<T> {
   OR?: Conditions<T>[]
   AND?: Conditions<T>[]
+  JOINS?: Conditions<object>
 }
 
 export type Conditions<T> = {
@@ -41,6 +42,7 @@ export type DBClients = 'pg' | 'mysql'
 
 export type OrderBy = { field: string; direction: 'ASC' | 'DESC' }[]
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface QueryParams<T> {
   tableName: string
   dbClient: IDatabaseClient
@@ -50,4 +52,18 @@ export interface QueryParams<T> {
   orderBy?: OrderBy
   groupBy?: string[]
   limit?: number
+  joins?: JoinClause[]
+}
+
+interface JoinClause {
+  type: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL'
+  table: string
+  on: string
+}
+
+export interface QueryBuilder {
+  select: string[]
+  from?: string
+  joins?: JoinClause[]
+  where?: string
 }

package/src/default/utils.ts

@@ -63,12 +63,19 @@ export const createWhereClause = <T>(
                 : mysqlPlaceholderGenerator()
             )
             .join(', ')
+
           if (operator === 'BETWEEN') {
             whereParts.push(
               clientType === 'pg'
                 ? `"${key}" ${operator} ${placeholders.replace(', ', ' AND ')}`
                 : `${key} ${operator} ${placeholders.replace(', ', ' AND ')}`
             )
+          } else if (operator === 'IN') {
+            whereParts.push(
+              clientType === 'pg'
+                ? `"${key}" ${operator} ${placeholders.replace(', ', ' AND ')}`
+                : `${key} ${operator} (${placeholders})`
+            )
           } else {
             whereParts.push(
               clientType === 'pg'
@@ -83,14 +90,48 @@ export const createWhereClause = <T>(
               ? `"${key}" ${operator} ${pgPlaceholderGenerator(index++)}`
               : `${key} ${operator} ${mysqlPlaceholderGenerator()}`
           )
+
           values.push(value)
         }
-      } else {
-        console.error('Unsupported condition format: ', condition)
       }
     }
   }
 
+  if ('JOINS' in conditions) {
+    const logicalOperator = conditions.JOINS ? 'AND' : 'OR'
+    const compositeConditions = conditions.JOINS
+
+    if (Array.isArray(compositeConditions)) {
+      const subWhereParts = compositeConditions
+        .map((subCondition: any) => {
+          if (
+            typeof subCondition === 'object' &&
+            !Array.isArray(subCondition) &&
+            subCondition !== null
+          ) {
+            const key = Object.keys(subCondition)[0]
+            const condition = subCondition[key]
+
+            processCondition(key, condition)
+            return whereParts.pop()
+          }
+          return ''
+        })
+        .filter((part) => part)
+      whereParts.push(
+        clientType === 'pg'
+          ? `(${subWhereParts.join(` ${logicalOperator} `)})`
+          : `${subWhereParts.join(` ${logicalOperator} `)}`
+      )
+    }
+  } else {
+    Object.entries(conditions).forEach(([key, value]) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      processCondition(key, value)
+    })
+  }
+
   if ('OR' in conditions || 'AND' in conditions) {
     const logicalOperator = conditions.OR ? 'OR' : 'AND'
     const compositeConditions = conditions.OR || conditions.AND

package/src/services/payment/index.ts

@@ -21,7 +21,7 @@ export const getByUserAndSubscription = async <T>({
     `SELECT 
         ${fields}
       FROM payments.plan_association_users pa
-      INNER JOIN payments.plans ON pa.plan_id = plans.id
+      LEFT JOIN payments.plans ON pa.plan_id = plans.id
         ${whereClause}
         AND pa.status IN ('active', 'cancelation_requested', 'blocked')`,
     params