@sap/cds 7.3.1 → 7.4.1

package/libx/_runtime/cds-services/adapter/odata-v4/utils/data.js

@@ -3,15 +3,13 @@ const {
 } = require('../okra/odata-server')
 
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
-const { convertStructured } = require('../../../../../common/utils/ucsn')
+const { convertStructured } = require('../../../../common/utils/ucsn')
 const { deepCopy } = require('../../../../common/utils/copy')
 const { getSegmentKeyValue } = require('../odata-to-cqn/utils')
+const { MULTIPLE_ERRORS } = require('../../../../common/error/constants')
 
-const _isFunctionInvocation = odataReq => {
-  return (
-    odataReq.getUriInfo().getLastSegment().getFunction() || odataReq.getUriInfo().getLastSegment().getFunctionImport()
-  )
-}
+const _isFunctionInvocation = odataReq =>
+  odataReq.getUriInfo().getLastSegment().getFunction() || odataReq.getUriInfo().getLastSegment().getFunctionImport()
 
 const _addStructuredProperties = ([structName, property, ...nestedProperties], paramData, value) => {
   paramData[structName] = paramData[structName] || {}
@@ -168,16 +166,21 @@ const _getFunctionParameters = (lastSegment, keyValues, service, target) => {
   for (const key in keyValues) {
     paramValues[key] = keyValues[key]
   }
+  const errors = []
   if (lastSegment.getKind() === 'BOUND.FUNCTION') {
     const targetFunction = target && target.actions && target.actions[lastSegment.getFunction().getName()]
     if (!targetFunction.params) return {}
-    convertStructured(service, targetFunction, paramValues)
+    convertStructured(service, targetFunction, paramValues, { errors })
   } else if (lastSegment.getKind() === 'FUNCTION.IMPORT') {
     const { namespace, name } = lastSegment.getFunctionImport().getFullQualifiedName()
     const targetFunction = service.model && service.model.definitions[`${namespace}.${name}`]
     if (!targetFunction.params) return {}
-    convertStructured(service, targetFunction, paramValues)
+    convertStructured(service, targetFunction, paramValues, { errors })
   }
+
+  if (errors.length > 1) throw Object.assign(new Error(MULTIPLE_ERRORS), { details: errors })
+  if (errors.length === 1) throw errors[0]
+
   return paramValues
 }
 

package/libx/_runtime/common/code-ext/worker.js

@@ -1,11 +1,6 @@
 const cds = require('../../cds')
 const LOG = cds.log()
 const { parentPort, workerData } = require('worker_threads')
-const SELECT = require('../../../../lib/ql/SELECT')
-const INSERT = require('../../../../lib/ql/INSERT')
-const UPSERT = require('../../../../lib/ql/UPSERT')
-const UPDATE = require('../../../../lib/ql/UPDATE')
-const DELETE = require('../../../../lib/ql/DELETE')
 const queryExecutor = require('./workerQueryExecutor')
 const WorkerReq = require('./WorkerReq')
 const { timeout } = require('./config')
@@ -19,42 +14,36 @@ parentPort.on('message', function onWorkerMessageReceived(message) {
   const { VM } = require('vm2')
   const workerReq = new WorkerReq(contextId, reqData)
 
-  class WorkerSELECT extends SELECT {
+  class WorkerSELECT extends SELECT.class {
     then(r, e) {
       return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
     }
   }
 
-  class WorkerINSERT extends INSERT {
+  class WorkerINSERT extends INSERT.class {
     then(r, e) {
       return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
     }
   }
 
-  class WorkerUPSERT extends UPSERT {
+  class WorkerUPSERT extends UPSERT.class {
     then(r, e) {
       return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
     }
   }
 
-  class WorkerUPDATE extends UPDATE {
+  class WorkerUPDATE extends UPDATE.class {
     then(r, e) {
       return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
     }
   }
 
-  class WorkerDELETE extends DELETE {
+  class WorkerDELETE extends DELETE.class {
     then(r, e) {
       return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
     }
   }
 
-  Object.defineProperty(WorkerSELECT.prototype, 'cmd', { value: 'SELECT' })
-  Object.defineProperty(WorkerINSERT.prototype, 'cmd', { value: 'INSERT' })
-  Object.defineProperty(WorkerUPSERT.prototype, 'cmd', { value: 'UPSERT' })
-  Object.defineProperty(WorkerUPDATE.prototype, 'cmd', { value: 'UPDATE' })
-  Object.defineProperty(WorkerDELETE.prototype, 'cmd', { value: 'DELETE' })
-
   const vm = new VM({
     console: 'inherit',
     timeout, // specifies the number of milliseconds to execute code before terminating execution

package/libx/_runtime/common/generic/auth/capabilities.js

@@ -15,15 +15,24 @@ const _getNavigationRestriction = (target, path, annotation, req) => {
   const [restriction, operation] = annotation.split('.')
   for (const r of target['@Capabilities.NavigationRestrictions.RestrictedProperties']) {
     // prefix check to support both notations: { InsertRestrictions: { Insertable: false } } and { InsertRestrictions.Insertable: false }
+    // however, { InsertRestrictions.Insertable: false } is actually not supported bc compiler does not expand shorthands inside an annotation
     if (r.NavigationProperty['='] === path && Object.keys(r).some(k => k.startsWith(restriction))) {
       const capability = r[annotation] ?? r[restriction]?.[operation]
-      return _getRestriction(req, capability, r.ReadRestrictions?.['ReadByKeyRestrictions.Readable'])
+      const capabilityReadByKey =
+        r.ReadRestrictions?.['ReadByKeyRestrictions.Readable'] ?? r.ReadRestrictions?.ReadByKeyRestrictions?.Readable
+      return _getRestriction(req, capability, capabilityReadByKey)
     }
   }
 }
 
 const _localName = entity => entity.name.replace(entity._service.name + '.', '')
 
+const _getNav = from => {
+  if (from?.SELECT) return _getNav(from.SELECT.from)
+  if (from?.ref) return from.ref.map(el => el.id || el)
+  return []
+}
+
 function handler(req) {
   // TODO: Determine auth-relevant entity
   const annotation = RESTRICTIONS[req.event]
@@ -32,7 +41,7 @@ function handler(req) {
 
   const action = annotation.split('.').pop().toUpperCase()
   const from = cqnFrom(req)
-  const nav = (from?.ref && from.ref.map(el => el.id || el)) || []
+  const nav = _getNav(from)
 
   let navRestriction
   if (nav.length > 1) {

package/libx/_runtime/common/i18n/messages.properties

@@ -86,6 +86,7 @@ DRAFT_ALREADY_EXISTS=A draft for this entity already exists
 DRAFT_NOT_EXISTING=No draft for this entity exists
 DRAFT_LOCKED_BY_ANOTHER_USER=The entity is locked by user "{0}"
 DRAFT_MODIFICATION_ONLY_VIA_ROOT=A draft can only be modified via its root entity
+DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS=Entity cannot be deleted because a draft exists
 
 # singleton
 SINGLETON_NOT_NULLABLE=The singleton entity is not nullable

package/libx/_runtime/common/utils/postProcessing.js

@@ -77,7 +77,7 @@ const postProcess = (query, result, service, onlySelectAliases = false) => {
     if (!onlySelectAliases) {
       const transition =
         query.SELECT && query.SELECT._transitions && query.SELECT._transitions[query.SELECT._transitions.length - 1]
-      if (transition) return revertData(result, transition, service)
+      if (transition && result) return revertData(result, transition, service)
     }
 
     return result

package/libx/_runtime/common/utils/resolveView.js

@@ -239,7 +239,22 @@ const _newWhereRef = (newWhereElement, transition, alias, tableName, isSubSelect
 
   if (newRef[0] === alias) {
     const mapped = transition.mapping.get(newRef[1])
-    if (mapped) newRef[1] = mapped.ref[0]
+    if (mapped) {
+      const tableAlias =
+        transition.queryTarget.query?.SELECT?.from.as ??
+        transition.queryTarget.query?.SELECT?.from.ref.at(-1).split('.').pop()
+      const newMapped = []
+
+      if (tableAlias && mapped.ref[0] === tableAlias) {
+        // remove table alias from mapped array
+        newMapped.push(...mapped.ref.slice(1))
+      } else {
+        newMapped.push(...mapped.ref)
+      }
+
+      // we assume it's a foreign key or single element
+      newRef[1] = newMapped.join('_')
+    }
   } else if (newRef[0] === tableName) {
     newRef[0] = transition.target.name
     const mapped = transition.mapping.get(newRef[1])
@@ -267,6 +282,10 @@ const _newWhere = (where = [], transition, tableName, alias, isSubselect = false
       return { xpr: _newWhere(whereElement.xpr, transition, tableName, alias, isSubselect) }
     }
 
+    if (whereElement.list) {
+      return { list: _newWhere(whereElement.list, transition, tableName, alias, isSubselect) }
+    }
+
     const newWhereElement = { ...whereElement }
     if (!whereElement.ref && !whereElement.SELECT && !whereElement.func) return whereElement
 
@@ -763,14 +782,14 @@ const findQueryTarget = q => {
   return q.SELECT && q.SELECT._transitions
     ? q.SELECT._transitions[q.SELECT._transitions.length - 1].target
     : q.INSERT
-    ? q.INSERT._transitions[q.INSERT._transitions.length - 1].target
-    : q.UPDATE
-    ? q.UPDATE._transitions[q.UPDATE._transitions.length - 1].target
-    : q.UPSERT
-    ? q.UPSERT._transitions[q.UPSERT._transitions.length - 1].target
-    : q.DELETE
-    ? q.DELETE._transitions[q.DELETE._transitions.length - 1].target
-    : undefined
+      ? q.INSERT._transitions[q.INSERT._transitions.length - 1].target
+      : q.UPDATE
+        ? q.UPDATE._transitions[q.UPDATE._transitions.length - 1].target
+        : q.UPSERT
+          ? q.UPSERT._transitions[q.UPSERT._transitions.length - 1].target
+          : q.DELETE
+            ? q.DELETE._transitions[q.DELETE._transitions.length - 1].target
+            : undefined
 }
 
 module.exports = {

package/libx/{common → _runtime/common}/utils/ucsn.js

@@ -1,6 +1,7 @@
-const cds = require('../../_runtime/cds')
-const getTemplate = require('../../_runtime/common/utils/template')
-const templateProcessor = require('../../_runtime/common/utils/templateProcessor')
+const cds = require('../../cds')
+const getError = require('../error')
+const getTemplate = require('./template')
+const templateProcessor = require('./templateProcessor')
 const IS_PROXY = Symbol('flat2structProxy')
 
 const proxifyIfFlattened = (definition, payload) => {
@@ -61,7 +62,9 @@ const _processor = ({ row, key, plain: { category }, element }) => {
   }
 }
 
-const _cleanup = (row, definition, cleanupNull, cleanupStruct, prefix = []) => {
+// REVISIT: check function complexity
+// eslint-disable-next-line complexity
+const _cleanup = (row, definition, cleanupNull, cleanupStruct, errors, prefix = []) => {
   if (!row || !definition) return
   const elements = definition.elements || definition.params
   for (const key of Object.keys(row)) {
@@ -69,8 +72,11 @@ const _cleanup = (row, definition, cleanupNull, cleanupStruct, prefix = []) => {
     const element = elements[key] || (cleanupStruct && elements[`${prefix.join('_')}_${key}`])
     if (!element) {
       if (cleanupStruct && typeof row[key] === 'object' && !Array.isArray(row[key])) {
-        _cleanup( row[key], definition, cleanupNull, cleanupStruct, [...prefix, key])
+        _cleanup(row[key], definition, cleanupNull, cleanupStruct, errors, [...prefix, key])
       } else {
+        if (errors) {
+          errors.push(getError(400, 'Property ' + key + ' does not exist in ' + definition.name))
+        }
         delete row[key]
       }
       continue
@@ -79,20 +85,22 @@ const _cleanup = (row, definition, cleanupNull, cleanupStruct, prefix = []) => {
     if (element.isAssociation) {
       if (element.is2many) {
         for (const r of row[key]) {
-          _cleanup(r, element._target, cleanupNull, cleanupStruct, [])
+          _cleanup(r, element._target, cleanupNull, cleanupStruct, errors, [])
         }
       } else {
-        _cleanup(row[key], element._target, cleanupNull, cleanupStruct, [])
+        _cleanup(row[key], element._target, cleanupNull, cleanupStruct, errors, [])
       }
     } else if (element.elements) {
-      _cleanup(row[key], element, cleanupNull, cleanupStruct, prefix)
-      if (!Object.keys(row).length) delete row[key]
+      _cleanup(row[key], element, cleanupNull, cleanupStruct, errors, prefix)
+      if (!Object.keys(row).length) {
+        delete row[key]
+      }
       if (cleanupNull && Object.values(row[key]).every(v => v == null)) row[key] = null
     }
   }
 }
 
-function convertStructured(service, definition, data, { cleanupNull = false, cleanupStruct = false } = {}) {
+function convertStructured(service, definition, data, { cleanupNull = false, cleanupStruct = false, errors } = {}) {
   if (!definition) return
   // REVISIT check `structs` mode only for now as uCSN is not yet available
   const flatAccess = cds.env.features.compat_flat_access
@@ -105,7 +113,7 @@ function convertStructured(service, definition, data, { cleanupNull = false, cle
     }
   }
   for (const row of arrayData) {
-    _cleanup(row, definition, cleanupNull, cleanupStruct)
+    _cleanup(row, definition, cleanupNull, cleanupStruct, errors)
   }
 }
 

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -10,7 +10,7 @@ const { getCQNUnionFrom } = require('../../common/utils/union')
 
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
-const { filterKeys } = require('../../fiori/utils/handler')
+const { entity_keys } = require('../../fiori/utils/handler')
 
 const getError = require('../../common/error')
 
@@ -1282,10 +1282,10 @@ class JoinCQNFromExpanded {
         element.ref[0] === alias
           ? [...element.ref]
           : element.ref.length === 1
-          ? [alias, element.ref[0]]
-          : this._isPathExpressionToOne(element.ref, expandedEntity)
-          ? [alias, ...element.ref]
-          : [alias, element.ref[1]]
+            ? [alias, element.ref[0]]
+            : this._isPathExpressionToOne(element.ref, expandedEntity)
+              ? [alias, ...element.ref]
+              : [alias, element.ref[1]]
 
       return (sort && { ref, sort }) || { ref }
     })
@@ -1293,7 +1293,7 @@ class JoinCQNFromExpanded {
 
   _getHasDraftEntityXpr(expandedEntity, tableAlias) {
     const draftTable = ensureDraftsSuffix(expandedEntity.name)
-    const where = filterKeys(expandedEntity.keys).reduce((res, keyName) => {
+    const where = entity_keys(expandedEntity).reduce((res, keyName) => {
       if (res.length !== 0) res.push('and')
       res.push({ ref: [draftTable, keyName] }, '=', { ref: [tableAlias, keyName] })
       return res

package/libx/_runtime/db/expand/rawToExpanded.js

@@ -97,10 +97,10 @@ class RawToExpanded {
           ? null
           : !!entry[mappings.IsActiveEntity]
         : 'IsActiveEntity' in entry
-        ? entry.IsActiveEntity === null
-          ? null
-          : !!entry.IsActiveEntity
-        : null
+          ? entry.IsActiveEntity === null
+            ? null
+            : !!entry.IsActiveEntity
+          : null
       : null
 
     // A raw row contains more elements than the config. Iterating over config is faster.

package/libx/_runtime/db/sql-builder/InsertBuilder.js

@@ -62,7 +62,12 @@ class InsertBuilder extends BaseBuilder {
     // replace $ values
     // REVISIT: better
     if (this._obj.INSERT.entries) {
-      dollar.entries(this._obj.INSERT.entries, this._options.user, this._options.now)
+      dollar.entries(
+        this._obj.INSERT.entries,
+        this._options.user,
+        this._options.now,
+        this._csn?.definitions?.[this._obj.INSERT.into.ref?.[0] || this._obj.INSERT.into]?.elements
+      )
     } else if (this._obj.INSERT.values) {
       dollar.values(this._obj.INSERT.values, this._options.user, this._options.now)
     } else if (this._obj.INSERT.rows) {

package/libx/_runtime/db/sql-builder/UpdateBuilder.js

@@ -64,7 +64,12 @@ class UpdateBuilder extends BaseBuilder {
     // replace $ values
     // REVISIT: better
     if (this._obj.UPDATE.data) {
-      dollar.data(this._obj.UPDATE.data, this._options.user, this._options.now)
+      dollar.data(
+        this._obj.UPDATE.data,
+        this._options.user,
+        this._options.now,
+        this._csn?.definitions?.[this._obj.UPDATE.entity?.ref?.[0] || this._obj.UPDATE.entity]?.elements
+      )
     }
 
     const entityName = this._entity()

package/libx/_runtime/db/sql-builder/dollar.js

@@ -1,8 +1,8 @@
 const replaceManagedData = require('../../common/utils/dollar')
 
-const _object = (row, user, now) => {
+const _object = (row, user, now, elements) => {
   Object.keys(row).forEach(k => {
-    replaceManagedData(row, k, user, now)
+    if (elements?.[k]?.['@cds.on.insert'] || elements?.[k]?.['@cds.on.update']) replaceManagedData(row, k, user, now)
   })
 }
 
@@ -12,9 +12,9 @@ const _array = (row, user, now) => {
   }
 }
 
-const entries = (_entries, user, now) => {
-  if (!Array.isArray(_entries)) _object(_entries, user, now)
-  else for (const row of _entries) _object(row, user, now)
+const entries = (_entries, user, now, elements) => {
+  if (!Array.isArray(_entries)) _object(_entries, user, now, elements)
+  else for (const row of _entries) _object(row, user, now, elements)
 }
 
 const values = (_values, user, now) => {
@@ -25,8 +25,8 @@ const rows = (_rows, user, now) => {
   for (const row of _rows) _array(row, user, now)
 }
 
-const data = (_data, user, now) => {
-  _object(_data, user, now)
+const data = (_data, user, now, elements) => {
+  _object(_data, user, now, elements)
 }
 
 module.exports = {

package/libx/_runtime/fiori/generic/activate.js

@@ -4,7 +4,7 @@ const { INSERT, SELECT, UPDATE, DELETE } = cds.ql
 const {
   ensureNoDraftsSuffix,
   ensureDraftsSuffix,
-  filterKeys,
+  entity_keys,
   getDeleteDraftAdminCqn,
   getCompositionTargets
 } = require('../utils/handler')
@@ -14,7 +14,7 @@ const { getColumns } = require('../../cds-services/services/utils/columns')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getRootCQN = (context, requestActiveData) => {
-  const keys = filterKeys(context.target.keys)
+  const keys = entity_keys(context.target)
   const keyData = getKeyData(keys, context.query.SELECT.from.ref[0].where)
   const columns = getColumns(context.target, { onlyNames: true, filterVirtual: true })
   return SELECT.from(

package/libx/_runtime/fiori/generic/edit.js

@@ -1,11 +1,11 @@
 const cds = require('../../cds')
+const getLockInfo = require('../utils/lockInfo')
 const { INSERT, SELECT, DELETE } = cds.ql
 
 const { getCompositionTree } = require('../../common/composition')
 const { getColumns } = require('../../cds-services/services/utils/columns')
-const { getTransition } = require('../../common/utils/resolveView')
-const { draftIsLocked, ensureDraftsSuffix, ensureNoDraftsSuffix, getSubCQNs, filterKeys } = require('../utils/handler')
-const { isActiveEntityRequested, getKeyData } = require('../utils/where')
+const { draftIsLocked, ensureDraftsSuffix, ensureNoDraftsSuffix, getSubCQNs } = require('../utils/handler')
+const { isActiveEntityRequested } = require('../utils/where')
 
 const _getDraftColumns = draftUUID => ({
   IsActiveEntity: false,
@@ -32,33 +32,20 @@ const _getInsertAdminDataCQN = ({ user }, draftUUID, time) => {
   return INSERT.into('DRAFT.DraftAdministrativeData').entries(_getAdminData({ user }, draftUUID, time))
 }
 
-const _getLockWhere = (where, columnsMap) => {
-  if (columnsMap.size === 0) return where
-  const whereKeys = Object.keys(where)
-  const lockWhere = {}
-
-  whereKeys.forEach(key => {
-    const mappedKey = columnsMap.get(key)
-    const lockKey = mappedKey ? mappedKey.ref[0] : key // REVISIT: Why the mapped key is empty?
-    lockWhere[lockKey] = where[key]
-  })
-
-  return lockWhere
-}
-
-const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) => {
+async function _lockAndSelectActive(req, lockRecordCQN, selectCQNs, draftExistsCQN) {
   try {
-    await dbtx.run(lockRecordCQN)
+    await this.run(lockRecordCQN)
   } catch (e) {
-    const drafts = await dbtx.run(draftExistsCQN)
+    const drafts = await this.run(draftExistsCQN)
     if (drafts.length) req.reject(409, 'DRAFT_ALREADY_EXISTS')
     req.reject(409, 'ENTITY_LOCKED')
   }
 
-  const promisesResults = await Promise.allSettled([dbtx.run(draftExistsCQN), ...selectCQNs.map(cqn => dbtx.run(cqn))])
+  const cqns = [this.run(draftExistsCQN), ...selectCQNs.map(cqn => this.run(cqn))]
+  const promisesResults = await Promise.allSettled(cqns)
   const firstRejected = promisesResults.find(r => r.status === 'rejected')
   if (firstRejected) req.reject(firstRejected.reason)
-  return promisesResults.map(r => r.value)
+  return promisesResults.map(result => result.value)
 }
 
 /**
@@ -76,29 +63,16 @@ const fioriGenericEdit = async function (req, next) {
   if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
 
   const { definitions } = this.model
+  const lockInfo = getLockInfo(req)
+  const rootWhere = lockInfo.rootWhere
 
-  // TODO replace with generic where filter
-  const keys = filterKeys(req.target.keys)
-  const data = getKeyData(keys, req.query.SELECT.from.ref[0].where)
-  const rootWhere = keys.reduce((res, key) => {
-    res[key] = data[key]
-    return res
-  }, {})
-
-  // cds.db and not "this" as we want to resolve as db here
-  const transition = getTransition(req.target, cds.db)
-  const lockWhere = _getLockWhere(rootWhere, transition.mapping)
-
-  // gets the underlying target entity, as record locking can't be
-  // applied to localized views
-  const lockTargetEntity = transition.target
-
-  // Lock the root record of the active entity to prevent simultaneous access to it,
-  // thus preventing duplicate draft entities from being created or overwritten.
-  // Only allows one active entity to be processed at a time, locking out other
-  // users who need to edit the same record simultaneously.
-  // .forUpdate(): lock the record, a wait of 0 is equivalent to no wait
-  const lockRecordCQN = SELECT.from(lockTargetEntity, [1]).where(lockWhere).forUpdate({ wait: 0 })
+  // Ensure exclusive access to the root record of the active entity by applying a lock,
+  // which effectively prevents the creation or overwriting of duplicate draft entities.
+  // This lock mechanism enforces a strict processing order for active entities,
+  // allowing only one entity to be worked on at any given time.
+  // By using .forUpdate() with a wait value of 0, we immediately lock the record,
+  // ensuring there is no waiting time for other users attempting to edit the same record concurrently.
+  const activeLockCQN = SELECT.from(lockInfo.target, [1]).where(lockInfo.where).forUpdate({ wait: 0 })
 
   const columnNames = getColumns(req.target, { onlyNames: true, filterVirtual: true })
   const rootCQN = SELECT.from(req.target, columnNames).where(rootWhere)
@@ -121,7 +95,13 @@ const fioriGenericEdit = async function (req, next) {
 
   const dbtx = cds.tx(req)
   // REVISIT: Use service.read with expand **
-  const [draftExists, ...results] = await _select(lockRecordCQN, draftExistsCQN, [...selectCQNs], req, dbtx)
+  const [draftExists, ...results] = await _lockAndSelectActive.call(
+    dbtx,
+    req,
+    activeLockCQN,
+    [...selectCQNs],
+    draftExistsCQN
+  )
 
   if (!results[0].length) req.reject(404)
 

package/libx/_runtime/fiori/generic/read.js

@@ -14,7 +14,7 @@ const {
   getEnrichedCQN,
   removeDraftUUIDIfNecessary,
   replaceRefWithDraft,
-  filterKeys
+  entity_keys
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
 const { adaptStreamCQN } = require('../utils/stream')
@@ -104,9 +104,7 @@ const _getTableName = (
   }
 }
 
-const _getTargetKeys = ({ target }) => {
-  return filterKeys(target.keys)
-}
+const _getTargetKeys = ({ target }) => entity_keys(target)
 
 const DRAFT_COLUMNS_CASTED = [
   {
@@ -382,7 +380,7 @@ const _allActive = (req, columns) => {
     _getDefaultDraftProperties({ hasDraft: null })
   )
 
-  const ids = filterKeys(req.target.keys)
+  const ids = entity_keys(req.target)
   const isCount = columns.some(element => element.func === 'count')
   const xpr = {
     xpr: [