@cuboapp/api-backend 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",

package/src/helpers/query.ts

@@ -19,8 +19,10 @@ export class ApiHelpersQuery<T extends CuboApiEntitiesMap<T>> {
     const selects = queryDto?.selects !== undefined ? queryDto.selects : []
     const joins = queryDto?.joins !== undefined ? queryDto.joins : []
     const conditions = queryDto?.conditions !== undefined ? queryDto.conditions : []
+    const havings = queryDto?.havings !== undefined ? queryDto.havings : []
     const sorts = queryDto?.sorts !== undefined ? queryDto.sorts : []
     const replacements = queryDto?.replacements !== undefined ? queryDto?.replacements : {}
+    const groupBy = queryDto?.groupBy !== undefined ? queryDto?.groupBy : undefined
 
     const { sort, limit: _limit, page, with: _withes, ...query } = req.query || {}
 
@@ -94,7 +96,7 @@ export class ApiHelpersQuery<T extends CuboApiEntitiesMap<T>> {
 
     let offsetString = ''
     let limitString = ''
-    let groupByString = ''
+    let groupByString = queryDto?.groupBy ?? ''
 
     if (!isCount && perPage > 0) {
       if (filtersOffset > 0) {
@@ -119,16 +121,22 @@ export class ApiHelpersQuery<T extends CuboApiEntitiesMap<T>> {
       ${joins.join('\n')}
       ${conditions.length > 0 ? `where (${conditions.join(') and (')})` : ''}
       ${groupByString}
+      ${havings.length > 0 ? `having (${havings.join(') and (')})` : ''}
       ${sorts.length > 0 && !isCount ? 'order by ' + sorts.join(', ') : ''}
       ${limitString}
       ${offsetString}
     `
 
+    // console.log('conditions', { conditions })
+    // console.log('sql', sql)
+
     return {
       withes,
       selects,
       joins,
       conditions,
+      groupBy,
+      havings,
       sorts,
       replacements,
       sql

package/src/helpers/withes.ts

@@ -19,12 +19,14 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
       joins?: string[]
       sorts?: string[]
       conditions?: string[]
+      havings?: string[]
+      groupBy?: string
       conditionKey?: string
       conditionValue?: any
       sortKey?: string
       sortDirection?: 'asc' | 'desc'
     }
-  ): Promise<{ withes: CuboCrudWith[]; joins: string[]; selects?: string[]; conditions?: string[]; replacements?: string[] }> {
+  ): Promise<CuboCrudFindQuery> {
     const normalKey = key.replace(CUBO_CRUD_QUERY_KEY_REGEX, '')
 
     if (normalKey !== key) {
@@ -74,12 +76,18 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
           throw new Error('relation for key not found: "' + partKey + '"')
         }
 
+        let relationEntity: CuboEntity | undefined
+
         if (relation_entity_id) {
-          lastEntity = await this.helpers.entities.getById(relation_entity_id)
-        } else if (relation_entity_alias) {
-          lastEntity = await this.helpers.entities.getByAlias(relation_entity_alias)
+          relationEntity = await this.helpers.entities.getById(relation_entity_id)
+        }
+
+        if (!relationEntity && relation_entity_alias) {
+          relationEntity = await this.helpers.entities.getByAlias(relation_entity_alias)
         }
 
+        lastEntity = relationEntity
+
         if (!lastEntity) {
           throw new Error('entity for relation key not found: "' + partKey + '"')
         }
@@ -133,6 +141,8 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
       withes,
       joins: opts.joins,
       conditions: opts.conditions || undefined,
+      groupBy: opts.groupBy || undefined,
+      havings: opts.havings || undefined,
       replacements: opts.replacements || undefined
     }
 
@@ -225,7 +235,9 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
     const joins: string[] = [...(opts?.queryOptions?.joins || [])]
     const selects: string[] = [...(opts?.queryOptions?.selects || [])]
     const conditions: string[] = [...(opts?.queryOptions?.conditions || [])]
+    const havings: string[] = [...(opts?.queryOptions?.havings || [])]
     const replacements: Record<string, any> = { ...(opts?.queryOptions?.replacements || {}) }
+    const groupBy: string = opts?.queryOptions?.groupBy || undefined
 
     const withes: CuboCrudWith[] = []
     const sorts: string[] = []
@@ -260,6 +272,8 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
             joins,
             replacements,
             conditions,
+            groupBy,
+            havings,
             conditionKey: key,
             conditionValue
           })
@@ -279,6 +293,6 @@ export class ApiHelpersWithes<T extends CuboApiEntitiesMap<T>> {
 
     // console.log({ sorts, withes, joins, selects, conditions, replacements })
 
-    return { sorts, withes, joins, selects, conditions, replacements }
+    return { sorts, withes, joins, selects, conditions, groupBy, havings, replacements }
   }
 }

package/src/index.ts

@@ -223,7 +223,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       opts.queryOptions = await augmentation.beforeCreate(req, opts)
     }
 
-    const dto = await this.helpers.data.prepare('create', entity!.fields, req.body, opts?.user_id || 0)
+    const dto = await this.helpers.data.prepare('create', entity!.fields, req.body, opts?.performer_id || 0)
     if (!Object.keys(dto)) {
       throw { status: 400, text: 'No keys to update' }
     }
@@ -273,7 +273,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     const entity = await this.helpers.entities.getByAlias(entityAlias)
     const augmentation = this.augmentations?.[entityAlias]
 
-    if (augmentation?.beforeUpdate) {
+    if (augmentation?.beforeUpdate && !opts?.excludeHooks?.includes('beforeUpdate')) {
       opts.queryOptions = await augmentation.beforeUpdate(req, opts)
     }
 
@@ -283,7 +283,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       throw { status: 404, text: 'Entity not found' }
     }
 
-    const dto = await this.helpers.data.prepare('update', entity!.fields, req.body, opts?.user_id || 0)
+    const dto = await this.helpers.data.prepare('update', entity!.fields, req.body, opts?.performer_id || 0)
     if (!Object.keys(dto)) {
       throw { status: 400, text: 'No keys to update' }
     }
@@ -334,7 +334,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
 
     const item: any = await this.getOne(entityAlias, req, opts)
 
-    const dto = await this.helpers.data.prepare('delete', entity!.fields, req.body || {}, opts?.user_id)
+    const dto = await this.helpers.data.prepare('delete', entity!.fields, req.body || {}, opts?.performer_id)
     if (!Object.keys(dto)) {
       throw { status: 400, text: 'No keys to update' }
     }

package/src/types/basic.ts

@@ -23,7 +23,7 @@ export type CuboCrudRequest = {
 }
 
 export type CuboCrudOptions = {
-  user_id?: number
+  performer_id?: number
   transaction?: Transaction
 }
 
@@ -37,8 +37,10 @@ export type CuboCrudDto = {
 export type CuboCrudFindQuery = {
   selects: string[]
   conditions: string[]
+  havings: string[]
   replacements: Record<string, any>
   sorts: string[]
+  groupBy: string
   offset: number
   limit: number
 

package/src/types/db.ts

@@ -3,10 +3,12 @@ import { type Transaction } from 'sequelize'
 export type CuboCrudQueryOptions = {
   selects?: string[]
   conditions?: string[]
+  havings?: string[]
   replacements?: Record<string, any>
   joins?: string[]
   withes?: string[]
   sorts?: string[]
+  groupBy?: string
   withDeleted?: boolean
 
   extra?: any
@@ -14,9 +16,18 @@ export type CuboCrudQueryOptions = {
 
 export type CuboCrudMethodOptions<E extends object = {}> = {
   transaction?: Transaction
-  user_id?: number
+  performer_id?: number
   extra?: any
-  excludeHooks?: ('beforeGetMany' | 'beforeGetOne' | 'afterCreate' | 'afterUpdate' | 'afterDelete' | 'afterGetMany' | 'afterGetOne')[]
+  excludeHooks?: (
+    | 'beforeGetMany'
+    | 'beforeGetOne'
+    | 'afterCreate'
+    | 'afterUpdate'
+    | 'afterDelete'
+    | 'afterGetMany'
+    | 'afterGetOne'
+    | 'beforeUpdate'
+  )[]
 
   log?: boolean