@sap/cds 8.8.2 → 8.9.0

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

@@ -1,11 +1,9 @@
-const cds = require('../../cds')
+const cds = require('../../../../lib')
 let LOG = cds.log('app')
-let _event
-const PERSISTENCE_TABLE = '@cds.persistence.table'
+
 const { rewriteAsterisks } = require('../../common/utils/rewriteAsterisks')
 
 const getError = require('../error')
-const { getEntityNameFromDeleteCQN } = require('../utils/cqn')
 
 const _setInverseTransition = (mapping, ref, mapped) => {
   const existing = mapping.get(ref)
@@ -34,7 +32,7 @@ const _inverseTransition = transition => {
       const ref0 = value.ref[0]
       if (value.ref.length > 1) {
         // ignore flattened columns like author.name
-        if (transition.target.elements[ref0]?.isAssociation) continue
+        if (transition.target.elements[ref0].isAssociation) continue
 
         const nested = inverseTransition.mapping.get(ref0) || {}
         if (!nested.transition) nested.transition = { mapping: new Map() }
@@ -57,15 +55,15 @@ const _inverseTransition = transition => {
   return inverseTransition
 }
 
-const revertData = (data, transition, service) => {
+const revertData = (data, transition, service, options) => {
   if (!transition || !transition.mapping.size) return data
   const inverseTransition = _inverseTransition(transition)
   return Array.isArray(data)
-    ? data.map(entry => _newData(entry, inverseTransition, true, service))
-    : _newData(data, inverseTransition, true, service)
+    ? data.map(entry => _newData(entry, inverseTransition, true, service, options))
+    : _newData(data, inverseTransition, true, service, options)
 }
 
-const _newSubData = (val, key, transition, el, inverse, service) => {
+const _newSubData = (val, key, transition, el, inverse, service, options) => {
   if ((!Array.isArray(val) && typeof val === 'object') || (Array.isArray(val) && val.length !== 0)) {
     let mapped = transition.mapping.get(key)
     if (!mapped) {
@@ -74,14 +72,14 @@ const _newSubData = (val, key, transition, el, inverse, service) => {
     }
 
     if (!mapped.transition) {
-      const subTransition = getTransition(el._target, service)
+      const subTransition = getTransition(el._target, service, undefined, options?.event, { abort: options?.abort })
       mapped.transition = inverse ? _inverseTransition(subTransition) : subTransition
     }
 
     if (Array.isArray(val)) {
-      return val.map(singleVal => _newData(singleVal, mapped.transition, inverse, service))
+      return val.map(singleVal => _newData(singleVal, mapped.transition, inverse, service, options))
     } else {
-      return _newData(val, mapped.transition, inverse, service)
+      return _newData(val, mapped.transition, inverse, service, options)
     }
   }
   return val //Case of empty array
@@ -105,7 +103,7 @@ const _newNestedData = (queryTarget, newData, ref, value) => {
   }
 }
 
-const _newData = (data, transition, inverse, service) => {
+const _newData = (data, transition, inverse, service, options) => {
   if (data === null) return null
 
   // no transition -> nothing to do
@@ -131,12 +129,12 @@ const _newData = (data, transition, inverse, service) => {
     let value = data[key]
     if (isAssoc) {
       if (value || (value === null && service.name === 'db')) {
-        value = _newSubData(value, key, transition, el, inverse, service)
+        value = _newSubData(value, key, transition, el, inverse, service, options)
       }
     }
 
     if (!isAssoc && mapped.transition) {
-      value = _newSubData(value, key, transition, el, inverse)
+      value = _newSubData(value, key, transition, el, inverse, undefined, options)
       Object.assign(newData, value)
     }
 
@@ -154,14 +152,14 @@ const _newData = (data, transition, inverse, service) => {
   return newData
 }
 
-const _newColumns = (columns = [], transition, service, withAlias = false) => {
+const _newColumns = (columns = [], transition, service, withAlias = false, options) => {
   const newColumns = []
 
   columns.forEach(column => {
     let newColumn
     if (column.func) {
       newColumn = { ...column }
-      newColumn.args = _newColumns(column.args, transition, service, withAlias)
+      newColumn.args = _newColumns(column.args, transition, service, withAlias, options)
       newColumns.push(newColumn)
       return newColumns
     }
@@ -200,9 +198,9 @@ const _newColumns = (columns = [], transition, service, withAlias = false) => {
 
       // reuse _newColumns with new transition
       const expandTarget = def._target
-      const subtransition = getTransition(expandTarget, service)
+      const subtransition = getTransition(expandTarget, service, undefined, options.event, { abort: options.abort })
       mapped.transition = subtransition
-      newColumn.expand = _newColumns(column.expand, subtransition, service, withAlias)
+      newColumn.expand = _newColumns(column.expand, subtransition, service, withAlias, options)
     }
 
     newColumns.push(newColumn)
@@ -269,8 +267,8 @@ const _newWhereRef = (newWhereElement, transition, alias, tableName) => {
   newWhereElement.ref = newRef
 }
 
-const _newEntries = (entries = [], transition, service) =>
-  entries.map(entry => _newData(entry, transition, false, service))
+const _newEntries = (entries = [], transition, service, options) =>
+  entries.map(entry => _newData(entry, transition, false, service, options))
 
 const _newWhere = (where = [], transition, tableName, alias, isSubselect = false) => {
   const newWhere = where.map(whereElement => {
@@ -355,7 +353,7 @@ const _rewriteQueryPath = (path, transitions) => {
   })
 }
 
-const _newUpdate = (query, transitions, service) => {
+const _newUpdate = (query, transitions, service, options) => {
   const targetTransition = transitions.at(-1)
   const targetName = targetTransition.target.name
   const newUpdate = Object.create(query.UPDATE)
@@ -366,8 +364,8 @@ const _newUpdate = (query, transitions, service) => {
         ref: _rewriteQueryPath(query.UPDATE.entity, transitions)
       }
     : targetName
-  if (newUpdate.data) newUpdate.data = _newData(newUpdate.data, targetTransition, false, service)
-  if (newUpdate.with) newUpdate.with = _newData(newUpdate.with, targetTransition, false, service)
+  if (newUpdate.data) newUpdate.data = _newData(newUpdate.data, targetTransition, false, service, options)
+  if (newUpdate.with) newUpdate.with = _newData(newUpdate.with, targetTransition, false, service, options)
   if (newUpdate.where) {
     newUpdate.where = _newWhere(
       newUpdate.where,
@@ -384,7 +382,7 @@ const _newUpdate = (query, transitions, service) => {
   return newUpdate
 }
 
-const _newSelect = (query, transitions, service) => {
+const _newSelect = (query, transitions, service, options) => {
   const targetTransition = transitions.at(-1)
   const newSelect = Object.create(query.SELECT)
   newSelect.from = {
@@ -398,12 +396,21 @@ const _newSelect = (query, transitions, service) => {
       _4db: service.isDatabaseService,
       target: targetTransition.queryTarget
     })
-    newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
+    newSelect.columns = _newColumns(
+      newSelect.columns,
+      targetTransition,
+      service,
+      service.kind !== 'app-service',
+      options
+    )
   }
 
-  if (newSelect.having) newSelect.having = _newColumns(newSelect.having, targetTransition)
-  if (newSelect.groupBy) newSelect.groupBy = _newColumns(newSelect.groupBy, targetTransition)
-  if (newSelect.orderBy) newSelect.orderBy = _newColumns(newSelect.orderBy, targetTransition)
+  if (newSelect.having)
+    newSelect.having = _newColumns(newSelect.having, targetTransition, undefined, undefined, options)
+  if (newSelect.groupBy)
+    newSelect.groupBy = _newColumns(newSelect.groupBy, targetTransition, undefined, undefined, options)
+  if (newSelect.orderBy)
+    newSelect.orderBy = _newColumns(newSelect.orderBy, targetTransition, undefined, undefined, options)
   if (newSelect.where) {
     newSelect.where = _newWhere(
       newSelect.where,
@@ -421,7 +428,7 @@ const _newSelect = (query, transitions, service) => {
   return newSelect
 }
 
-const _newInsert = (query, transitions, service) => {
+const _newInsert = (query, transitions, service, options) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
   const newInsert = Object.create(query.INSERT)
@@ -438,7 +445,7 @@ const _newInsert = (query, transitions, service) => {
   }
 
   if (newInsert.columns) newInsert.columns = _newInsertColumns(newInsert.columns, targetTransition)
-  if (newInsert.entries) newInsert.entries = _newEntries(newInsert.entries, targetTransition, service)
+  if (newInsert.entries) newInsert.entries = _newEntries(newInsert.entries, targetTransition, service, options)
   Object.defineProperty(newInsert, '_transitions', {
     enumerable: false,
     value: transitions
@@ -447,7 +454,7 @@ const _newInsert = (query, transitions, service) => {
   return newInsert
 }
 
-const _newUpsert = (query, transitions, service) => {
+const _newUpsert = (query, transitions, service, options) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
   const newUpsert = Object.create(query.UPSERT)
@@ -459,7 +466,7 @@ const _newUpsert = (query, transitions, service) => {
       }
     : targetName
   if (newUpsert.columns) newUpsert.columns = _newInsertColumns(newUpsert.columns, targetTransition)
-  if (newUpsert.entries) newUpsert.entries = _newEntries(newUpsert.entries, targetTransition, service)
+  if (newUpsert.entries) newUpsert.entries = _newEntries(newUpsert.entries, targetTransition, service, options)
   Object.defineProperty(newUpsert, '_transitions', {
     enumerable: false,
     value: transitions
@@ -481,12 +488,8 @@ const _newDelete = (query, transitions) => {
     : targetName
 
   if (newDelete.where) {
-    newDelete.where = _newWhere(
-      newDelete.where,
-      targetTransition,
-      getEntityNameFromDeleteCQN(query),
-      query.DELETE.from.as
-    )
+    const from = typeof query.DELETE.from === 'string' ? query.DELETE.from : query.DELETE.from.ref[0]
+    newDelete.where = _newWhere(newDelete.where, targetTransition, from, query.DELETE.from.as)
   }
 
   Object.defineProperty(newDelete, '_transitions', {
@@ -497,9 +500,6 @@ const _newDelete = (query, transitions) => {
   return newDelete
 }
 
-const _isPersistenceTable = target =>
-  Object.prototype.hasOwnProperty.call(target, PERSISTENCE_TABLE) && target[PERSISTENCE_TABLE]
-
 const _findRenamed = (cqnColumns, column) =>
   cqnColumns.find(
     cqnColumn =>
@@ -508,7 +508,7 @@ const _findRenamed = (cqnColumns, column) =>
         (column.as === cqnColumn.as && Object.prototype.hasOwnProperty.call(cqnColumn, 'val')))
   )
 
-const _queryColumns = (target, columns = [], persistenceTable = false, force = false) => {
+const _queryColumns = (target, columns = [], isAborted) => {
   if (!(target && target.query && target.query.SELECT)) return columns
 
   const cqnColumns = target.query.SELECT.columns || []
@@ -527,11 +527,7 @@ const _queryColumns = (target, columns = [], persistenceTable = false, force = f
       if (!renamed.ref || renamed.ref.some(e => typeof e !== 'string') || renamed.xpr) return res
       if (isTargetAliased && renamed.ref[0] === from.as) renamed.ref.shift()
 
-      // If the entity is annotated with the annotation `@cds.persistence.table`
-      // and elements aliases exist, the aliases must be used as column references.
-      // The reason is that in this scenario, the cds compiler generate a table
-      // instead of a view. If forced, skip this.
-      column.ref = !force && persistenceTable ? [renamed.as] : [...renamed.ref]
+      column.ref = isAborted ? [renamed.as] : [...renamed.ref]
     }
 
     res.push(column)
@@ -552,12 +548,7 @@ const _mappedValue = (col, alias) => {
   return [key, { val: col.val }]
 }
 
-const getDBTable = target => {
-  if (target.query && target.query._target && !_isPersistenceTable(target)) {
-    return getDBTable(target.query._target)
-  }
-  return target
-}
+const getDBTable = target => cds.ql.resolve.table(target)
 
 const _appendForeignKeys = (newColumns, target, columns, { as, ref = [] }) => {
   const el = target.elements[as] || target.query._target.elements[ref.at(-1)]
@@ -584,55 +575,46 @@ const _appendForeignKeys = (newColumns, target, columns, { as, ref = [] }) => {
   return newColumns
 }
 
-const _checkForForbiddenViews = queryTarget => {
+const _checkForForbiddenViews = (queryTarget, event) => {
   const select = queryTarget && queryTarget.query && queryTarget.query.SELECT
 
   if (select) {
     if (!select.from || select.from.join || select.from.length > 1) {
       throw getError({
         code: 501,
-        message: `${_event || 'INSERT|UPDATE|DELETE'} on views with join and/or union is not supported`,
+        message: `${event || 'INSERT|UPDATE|DELETE'} on views with join and/or union is not supported`,
         target: queryTarget.name
       })
     }
 
     if (select.where) {
       LOG._debug &&
-        LOG.debug(`Ignoring where clause during ${_event || 'INSERT|UPDATE|DELETE'} on view "${queryTarget.name}".`)
+        LOG.debug(`Ignoring where clause during ${event || 'INSERT|UPDATE|DELETE'} on view "${queryTarget.name}".`)
     }
   }
 }
 
-const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) => {
+const _getTransitionData = (target, columns, service, options) => {
+  let { abort, skipForbiddenViewCheck, event } = options
+  // REVISIT revert after cds-dbs pr
+  if (!abort) abort = cds.ql.resolve.abortDB
   // REVISIT: Find less param polluting way to skip forbidden view check for reads
-  if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
-  const targetStartsWithSrvName = service.definition?.name && target.name.startsWith(`${service.definition.name}.`)
-  const persistenceTable = _isPersistenceTable(target)
-  const isDatabaseService = service.isDatabaseService
-  columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
-
-  // REVISIT: Change once we expose database service
-  if (persistenceTable && isDatabaseService) {
-    return { target, transitionColumns: columns }
-  }
+  if (!skipForbiddenViewCheck) _checkForForbiddenViews(target, event)
+  const isAborted = abort(target)
+  columns = _queryColumns(target, columns, isAborted)
 
-  // stop projection resolving if it starts with the service name prefix
-  if (!isDatabaseService && targetStartsWithSrvName) {
-    return { target, transitionColumns: columns }
-  }
+  if (isAborted) return { target, transitionColumns: columns }
 
-  // continue projection resolving if the target is a projection
-  if (target.query && target.query._target) {
+  if (!target.query?._target) {
+    // for cross service in x4 and DRAFT.DraftAdministrativeData we cannot abort properly
+    // therefore return last resolved target
+    if (cds.env.features.restrict_service_scope === false) return { target, transitionColumns: columns }
+    return undefined
+  } else {
     const newTarget = target.query._target
-
-    if (isDatabaseService || !(service.definition?.name && newTarget.name.startsWith(`${service.definition.name}.`))) {
-      return _getTransitionData(newTarget, columns, service, skipForbiddenViewCheck)
-    }
-
-    return { target: newTarget, transitionColumns: columns }
+    // continue projection resolving for projections
+    return _getTransitionData(newTarget, columns, service, options)
   }
-
-  return { target, transitionColumns: columns }
 }
 
 /**
@@ -642,14 +624,19 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
  * @param service
  * @param skipForbiddenViewCheck
  */
-const getTransition = (queryTarget, service, skipForbiddenViewCheck, event) => {
-  if (event) _event = event
+const getTransition = (queryTarget, service, skipForbiddenViewCheck, event, options) => {
   // Never resolve unknown targets (e.g. for drafts)
   if (!queryTarget) {
     return { target: queryTarget, queryTarget, mapping: new Map() }
   }
 
-  const { target: _target, transitionColumns } = _getTransitionData(queryTarget, [], service, skipForbiddenViewCheck)
+  const transitionData = _getTransitionData(queryTarget, [], service, {
+    skipForbiddenViewCheck,
+    event,
+    abort: options?.abort
+  })
+  if (!transitionData) return undefined
+  const { target: _target, transitionColumns } = transitionData
   const query = queryTarget.query
   const alias = query && query.SELECT && query.SELECT.from && query.SELECT.from.as
   const mappedColumns = transitionColumns.map(column => _mappedValue(column, alias))
@@ -657,11 +644,15 @@ const getTransition = (queryTarget, service, skipForbiddenViewCheck, event) => {
   return { target: _target, queryTarget, mapping }
 }
 
-const _entityTransitionsForTarget = (from, model, service) => {
+const _entityTransitionsForTarget = (from, model, service, options) => {
   let previousEntity
 
   if (typeof from === 'string') {
-    return model.definitions[from] && [getTransition(model.definitions[from], service)]
+    return (
+      model.definitions[from] && [
+        getTransition(model.definitions[from], service, undefined, options.event, { abort: options.abort })
+      ]
+    )
   }
 
   return from.ref.map((f, i) => {
@@ -671,7 +662,7 @@ const _entityTransitionsForTarget = (from, model, service) => {
       const entity = model.definitions[element]
       if (entity) {
         previousEntity = entity
-        return getTransition(entity, service)
+        return getTransition(entity, service, undefined, options.event, { abort: options.abort })
       }
     }
 
@@ -680,7 +671,7 @@ const _entityTransitionsForTarget = (from, model, service) => {
       if (entity) {
         // > assoc
         previousEntity = entity
-        return getTransition(entity, service)
+        return getTransition(entity, service, undefined, options.event, { abort: options.abort })
       }
 
       // > struct
@@ -694,7 +685,8 @@ const _entityTransitionsForTarget = (from, model, service) => {
   })
 }
 
-const _newQuery = (query, event, model, service) => {
+const _newQuery = (query, model, service, options) => {
+  const { event } = options
   const [_prop, _func] = {
     SELECT: ['from', _newSelect],
     INSERT: ['into', _newInsert],
@@ -703,30 +695,32 @@ const _newQuery = (query, event, model, service) => {
     DELETE: ['from', _newDelete]
   }[event]
   const newQuery = Object.create(query)
-  const transitions = _entityTransitionsForTarget(query[event][_prop], model, service)
-  newQuery[event] = (transitions?.[0] && _func(newQuery, transitions, service)) || { ...query[event] }
+  const transitions = _entityTransitionsForTarget(query[event][_prop], model, service, options)
+  if (!service.isDatabaseService && cds.env.features.restrict_service_scope !== false && transitions.some(t => !t))
+    return undefined
+  newQuery[event] = (transitions?.[0] && _func(newQuery, transitions, service, options)) || { ...query[event] }
   return newQuery
 }
 
-const resolveView = (query, model, service) => {
+const resolveView = (query, model, service, abort) => {
   // swap logger
   const _LOG = LOG
   LOG = cds.log(service.kind) // REVISIT: Avoid obtaining loggers per request!
 
   // If the query is a projection, one must follow it
   // to let the underlying service know its true entity.
-  if (query.kind) _event = query.kind
-  else if (query.SELECT) _event = 'SELECT'
-  else if (query.INSERT) _event = 'INSERT'
-  else if (query.UPSERT) _event = 'UPSERT'
-  else if (query.UPDATE) _event = 'UPDATE'
-  else if (query.DELETE) _event = 'DELETE'
+  let event
+  if (query.kind) event = query.kind
+  else if (query.SELECT) event = 'SELECT'
+  else if (query.INSERT) event = 'INSERT'
+  else if (query.UPSERT) event = 'UPSERT'
+  else if (query.UPDATE) event = 'UPDATE'
+  else if (query.DELETE) event = 'DELETE'
 
-  const newQuery = _newQuery(query, _event, model, service)
+  const newQuery = _newQuery(query, model, service, { abort, event: event })
 
-  // restore logger and clear _event
+  // restore logger
   LOG = _LOG
-  _event = undefined
 
   return newQuery
 }

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

@@ -2,7 +2,7 @@ const { getNavigationIfStruct } = require('./structured')
 const getColumns = require('../../db/utils/columns')
 const { ensureNoDraftsSuffix } = require('./draft')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
-const cds = require('../../cds')
+const cds = require('../../../../lib')
 
 const isAsteriskColumn = col => col === '*' || (col.ref && col.ref[0] === '*' && !col.expand)
 

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

@@ -2,7 +2,6 @@ const cds = require('../../cds')
 const LOG = cds.log('odata')
 const { SELECT } = cds.ql
 const { deepCopy } = require('./copy')
-const { getTransition } = require('./resolveView')
 
 const _getStreamProperties = (req, query) => {
   // new odata parser sets streaming property in SELECT.from
@@ -29,7 +28,7 @@ const _getStreamProperties = (req, query) => {
         LOG.warn(
           `@Core.MediaType in entity "${req.target.name}" points to property "${contentTypeProperty}" which was renamed or is not part of the projection. You must update the annotation value.`
         )
-      const mapping = getTransition(req.target, cds.db).mapping
+      const mapping = cds.ql.resolve.transitions(req.query, cds.db).mapping
       const key = [...mapping.entries()].find(({ 1: val }) => val.ref[0] === contentTypeProperty)
       contentTypeProperty = key && key.length && key[0]
     }
@@ -52,7 +51,7 @@ const _getStreamProperties = (req, query) => {
           LOG.warn(
             `@Core.ContentDisposition.Filename in entity "${req.target.name}" points to property "${contentDispositionProperty}" which was renamed or is not part of the projection. You must update the annotation value.`
           )
-        const mapping = getTransition(req.target, cds.db).mapping
+        const mapping = cds.ql.resolve.transitions(req.query, cds.db).mapping
         const key = [...mapping.entries()].find(({ 1: val }) => val.ref[0] === contentDispositionProperty)
         contentDispositionProperty = key && key.length && key[0]
       }

package/libx/_runtime/db/utils/columns.js

@@ -1,4 +1,4 @@
-const cds = require('../../cds')
+const cds = require('../../../../lib')
 const resolveStructured = require('../../common/utils/resolveStructured')
 
 const _isStreamProperty = element => {

package/libx/_runtime/fiori/lean-draft.js

@@ -2,8 +2,6 @@ const { Readable, PassThrough } = require('stream')
 const cds = require('../cds'),
   { Object_keys } = cds.utils
 
-const { getTransition } = require('../common/utils/resolveView')
-
 const { getPageSize, commonGenericPaging } = require('../common/generic/paging')
 const { handler: commonGenericSorting } = require('../common/generic/sorting')
 const { addEtagColumns } = require('../common/utils/etag')
@@ -639,6 +637,9 @@ cds.ApplicationService.prototype.handle = async function (req) {
         'location',
         '../' + calculateLocationHeader(req.target, this, read_result || { ...res, IsActiveEntity: true })
       )
+
+      if (read_result == null) req.res.status(204)
+
       return read_result
     }
 
@@ -804,7 +805,7 @@ const Read = {
     // DraftAdministrativeData is only accessible via drafts
     if (_isCount(query)) return run(query)
     if (query._target.name.endsWith('.DraftAdministrativeData')) {
-      if (query.SELECT.from.ref?.length === 1) throw new Error('Invalid draft request') // only via drafts
+      if (query.SELECT.from.ref?.length === 1) throw cds.error('INVALID_DRAFT_REQUEST', { statusCode: 400 }) // only via drafts
       return run(query._drafts)
     }
     if (!query._target._isDraftEnabled) return run(query)
@@ -852,7 +853,7 @@ const Read = {
     LOG.debug('List Editing Status: Unchanged')
 
     const draftsQuery = query._drafts
-    if (!draftsQuery) throw new Error('Invalid draft request')
+    if (!draftsQuery) throw cds.error('INVALID_DRAFT_REQUEST', { statusCode: 400 }) // only via drafts
     draftsQuery.SELECT.count = undefined
     draftsQuery.SELECT.orderBy = undefined
     draftsQuery.SELECT.limit = null
@@ -868,7 +869,7 @@ const Read = {
   ownDrafts: async function (run, query) {
     LOG.debug('List Editing Status: Own Draft')
 
-    if (!query._drafts) throw new Error('Invalid draft request')
+    if (!query._drafts) throw cds.error('INVALID_DRAFT_REQUEST', { statusCode: 400 }) // only via drafts
 
     // read active from draft
     if (!query._drafts._target?.name.endsWith('.drafts')) {
@@ -1069,7 +1070,7 @@ const Read = {
 
   activesFromDrafts: async function (run, query, { isLocked = true }) {
     const draftsQuery = query._drafts
-    if (!draftsQuery) throw new Error('Invalid draft request')
+    if (!draftsQuery) throw cds.error('INVALID_DRAFT_REQUEST', { statusCode: 400 }) // only via drafts
 
     const additionalCols = draftsQuery.SELECT.columns
       ? draftsQuery.SELECT.columns.filter(
@@ -1668,7 +1669,7 @@ async function onEdit(req) {
       res[key] = keyData[key]
       return res
     }, {})
-    const transition = getTransition(req.target, cds.db)
+    const transition = cds.ql.resolve.transitions(req.query, cds.db)
 
     // gets the underlying target entity, as record locking can't be
     // applied to localized views
@@ -1781,6 +1782,9 @@ async function onEdit(req) {
       'location',
       '../' + calculateLocationHeader(req.target, this, read_result || { ...res, IsActiveEntity: false })
     )
+
+    if (read_result == null) req.res.status(204)
+
     return read_result
   } else {
     return { ...res, IsActiveEntity: false } // REVISIT: Flatten?

package/libx/_runtime/messaging/common-utils/connections.js

@@ -23,12 +23,16 @@ const connect = (client, LOG, keepAlive) => {
       .once('connected', function () {
         client.removeAllListeners('error')
 
-        client.on('error', err => {
+        client.once('error', err => {
           if (LOG._error) {
             err.message = 'Client error: ' + err.message
             LOG.error(err)
           }
-          client.disconnect()
+          if (keepAlive) {
+            client.removeAllListeners('error')
+            client.removeAllListeners('connected')
+            _connectUntilConnected(client, LOG, 0)
+          }
         })
 
         if (keepAlive) {

package/libx/_runtime/messaging/kafka.js

@@ -13,8 +13,7 @@ class KafkaService extends cds.MessagingService {
 
     this._cachedKeyFns = new Map()
 
-    // TODO: Make configurable
-    this.appId = appId()
+    this.consumerGroup = this.options.consumerGroup || appId() + '/' + this.options.topic
 
     if (!this.options.local && !this.options.credentials) {
       throw new Error(
@@ -95,7 +94,7 @@ class KafkaService extends cds.MessagingService {
   }
 
   async startListening() {
-    const consumer = this.client.consumer({ groupId: this.appId })
+    const consumer = this.client.consumer({ groupId: this.consumerGroup })
     await consumer.connect()
 
     // In the future, we might allow to support the annotation @kafka.topic
@@ -216,7 +215,7 @@ async function _getConfig(srv) {
   const brokers = allBrokers.split(',')
 
   return {
-    clientId: srv.appId,
+    clientId: srv.consumerGroup,
     // logLevel: 4,
     connectionTimeout: 15000,
     authenticationTimeout: 15000,

package/libx/_runtime/remote/Service.js

@@ -3,12 +3,13 @@ const cds = require('../cds')
 const { run, getReqOptions } = require('./utils/client')
 const { getCloudSdk, getCloudSdkConnectivity, getCloudSdkResilience } = require('./utils/cloudSdkProvider')
 const { hasAliasedColumns } = require('./utils/data')
-const { resolveView, getTransition, findQueryTarget } = require('../common/utils/resolveView')
+const { findQueryTarget } = require('../common/utils/resolveView')
 const postProcess = require('../common/utils/postProcess')
 const { formatVal } = require('../../odata/utils')
 
-const _setHeaders = (defaultHeaders, req) => {
+const _getHeaders = (defaultHeaders, req) => {
   return Object.assign(
+    {},
     defaultHeaders,
     Object.keys(req.headers).reduce((acc, cur) => {
       acc[cur.toLowerCase()] = req.headers[cur]
@@ -254,10 +255,16 @@ class RemoteService extends cds.Service {
         throw new Error(`"url" or "destination" property must be configured in "credentials" of "${this.name}".`)
 
       const reqOptions = getReqOptions(req, query, this)
-      reqOptions.headers = _setHeaders(reqOptions.headers, req)
+      reqOptions.headers = _getHeaders(reqOptions.headers, req)
+
+      // ensure request correlation (even with systems that use x-correlationid)
+      const correlationId = reqOptions.headers['x-correlation-id'] || cds.context?.id //> prefer custom header over context id
+      reqOptions.headers['x-correlation-id'] = correlationId
+      reqOptions.headers['x-correlationid'] = correlationId
 
       const { kind, destination, destinationOptions } = this
-      const resolvedTarget = resolvedTargetOfQuery(query) || getTransition(req.target, this).target
+      const resolvedTarget =
+        resolvedTargetOfQuery(query) || cds.ql.resolve.transitions(query, this)?.target || req.target
       const returnType = req._returnType
       const additionalOptions = { destination, kind, resolvedTarget, returnType, destinationOptions }
 
@@ -289,7 +296,8 @@ class RemoteService extends cds.Service {
       // we need to post process if alias was explicitly set in query
       if (_isSelectWithAliasedColumns(req.query)) result = postProcess(req.query, result, this, true)
     } else {
-      const query = resolveView(req.query, this.model, this)
+      const query = cds.ql.resolve(req.query, this)
+      if (!query) throw new Error(`Target ${req.target.name} cannot be resolved for service ${this.name}`)
       const target = findQueryTarget(query) || req.target
       // we need to provide target explicitly because it's cached within ensure_target
       const _req = new cds.Request({ query, target, _resolved: true, headers: req.headers, method: req.method })