@cuboapp/api-backend 1.0.3 → 1.0.5

package/package.json

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

package/src/helpers/index.ts

@@ -99,6 +99,8 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
           case 'string':
             if (value === 'null') {
               value = null
+            } else if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
+              value = value.split(',')
             }
             break
           case 'number':
@@ -132,7 +134,7 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
               value = null
             } else {
               if ([CUBO_CRUD_QUERY_CONDITION.IN, CUBO_CRUD_QUERY_CONDITION.NIN].includes(condition)) {
-                value = value.split(',')
+                value = value.split(',').map(Number)
               } else {
                 const potentialValue = precision === 0 ? parseInt(value) : parseFloat(value)
 

package/src/helpers/query.ts

@@ -127,6 +127,9 @@ export class ApiHelpersQuery<T extends CuboApiEntitiesMap<T>> {
       ${offsetString}
     `
 
+    // console.log('conditions', { conditions })
+    // console.log('sql', sql)
+
     return {
       withes,
       selects,

package/src/helpers/withes.ts

@@ -76,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 + '"')
         }

package/src/index.ts

@@ -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)
     }
 
@@ -333,6 +333,9 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     }
 
     const item: any = await this.getOne(entityAlias, req, opts)
+    if (!item) {
+      throw { status: 404, text: 'Entity not found' }
+    }
 
     const dto = await this.helpers.data.prepare('delete', entity!.fields, req.body || {}, opts?.performer_id)
     if (!Object.keys(dto)) {

package/src/types/db.ts

@@ -18,7 +18,16 @@ export type CuboCrudMethodOptions<E extends object = {}> = {
   transaction?: Transaction
   performer_id?: number
   extra?: any
-  excludeHooks?: ('beforeGetMany' | 'beforeGetOne' | 'afterCreate' | 'afterUpdate' | 'afterDelete' | 'afterGetMany' | 'afterGetOne')[]
+  excludeHooks?: (
+    | 'beforeGetMany'
+    | 'beforeGetOne'
+    | 'afterCreate'
+    | 'afterUpdate'
+    | 'afterDelete'
+    | 'afterGetMany'
+    | 'afterGetOne'
+    | 'beforeUpdate'
+  )[]
 
   log?: boolean