@sap/cds 5.8.2 → 5.9.0

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/UriHelper.js

@@ -6,6 +6,7 @@ const AbstractError = commons.errors.AbstractError
 const UriSyntaxError = commons.errors.UriSyntaxError
 const IllegalArgumentError = commons.errors.IllegalArgumentError
 const NotImplementedError = commons.errors.NotImplementedError
+const EdmPrimitiveTypeKind = require('../../odata-commons/edm/EdmPrimitiveTypeKind')
 
 /**
  * UriHelper has utility methods for reading and constructing URIs.
@@ -103,7 +104,9 @@ class UriHelper {
     for (const key of keys) {
       url = url ? url + ',' : ''
       if (keys.length > 1) url += encodeURIComponent(key.name) + '='
-      url += encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
+      url += key.type === EdmPrimitiveTypeKind.Binary
+        ? CommonsUriHelper.toUriLiteral(key.value, key.type)
+        : encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
     }
     return '(' + url + ')'
   }

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

@@ -1,18 +1,7 @@
-const cds = require('../../../cds')
-
-const OData = require('./OData')
 const Dispatcher = require('./Dispatcher')
 
-const { alias2ref } = require('../../../common/utils/csn')
-
 const to = service => {
-  const edm = service._edm || cds.compile.to.edm(service.model, { service: service.definition.name })
-  alias2ref(service, edm)
-
-  const odata = new OData(edm, service.model, service.options)
-  odata.addCDSServiceToChannel(service)
-
-  return new Dispatcher(odata).getService()
+  return new Dispatcher(service).getService()
 }
 
 module.exports = to

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

@@ -4,7 +4,8 @@ const {
 
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 const { isStreaming } = require('./stream')
-const { deepCopyObject, deepCopyArray } = require('../../../../common/utils/copy')
+const { convertStructured } = require('../../../../../common/utils/ucsn')
+const { deepCopy } = require('../../../../common/utils/copy')
 
 const _isFunctionInvocation = req =>
   req.getUriInfo().getLastSegment().getFunction || req.getUriInfo().getLastSegment().getFunctionImport
@@ -146,7 +147,7 @@ const _addForeignKeys = (service, req, data) => {
   }
 }
 
-const _getFunctionParameters = (lastSegment, keyValues) => {
+const _getFunctionParameters = (lastSegment, keyValues, service, target) => {
   const functionParameters = lastSegment.getFunctionParameters()
   const paramValues = _getParamData(functionParameters)
 
@@ -154,18 +155,41 @@ const _getFunctionParameters = (lastSegment, keyValues) => {
   for (const key in keyValues) {
     paramValues[key] = keyValues[key]
   }
+  if (lastSegment.getKind() === 'BOUND.FUNCTION') {
+    const targetFunction = target && target.actions && target.actions[lastSegment.getFunction().getName()]
+    if (!targetFunction.params) return {}
+    convertStructured(service, targetFunction, paramValues)
+  } 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)
+  }
   return paramValues
 }
 
-const _getCopiedData = (odataReq, streaming, lastSegment) => {
+const _getCopiedData = (odataReq, streaming, lastSegment, service, target) => {
   let data = odataReq.getBody() || {}
 
   if (streaming || lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
-    data = { [lastSegment.getProperty().getName()]: data }
-    return data
+    return { [lastSegment.getProperty().getName()]: data }
   }
 
-  return Array.isArray(data) ? deepCopyArray(data) : deepCopyObject(data)
+  data = deepCopy(data)
+
+  if (lastSegment.getKind() === 'BOUND.ACTION') {
+    const targetAction = target.actions && target.actions[lastSegment.getAction().getName()]
+    if (!targetAction || !targetAction.params) return {}
+    convertStructured(service, targetAction, data)
+  } else if (lastSegment.getKind() === 'ACTION.IMPORT') {
+    const { namespace, name } = lastSegment.getActionImport().getFullQualifiedName()
+    const targetAction = service.model && service.model.definitions[`${namespace}.${name}`]
+    if (!targetAction || !targetAction.params) return {}
+    convertStructured(service, targetAction, data)
+  } else {
+    convertStructured(service, target, data)
+  }
+  return data
 }
 
 /**
@@ -181,7 +205,7 @@ const _getCopiedData = (odataReq, streaming, lastSegment) => {
  * @returns {object | Array}
  * @private
  */
-const getData = (component, odataReq, service) => {
+const getData = (component, odataReq, service, target) => {
   const segments = odataReq.getUriInfo().getPathSegments()
   const lastSegment = odataReq.getUriInfo().getLastSegment()
   const streaming = isStreaming(segments)
@@ -189,7 +213,7 @@ const getData = (component, odataReq, service) => {
   const keyValues = _getParamData(keyPredicates)
 
   if (component === DATA_READ_HANDLER && _isFunctionInvocation(odataReq)) {
-    return _getFunctionParameters(lastSegment, keyValues)
+    return _getFunctionParameters(lastSegment, keyValues, service, target)
   }
 
   if (component === DATA_DELETE_HANDLER || component === DATA_READ_HANDLER) {
@@ -200,7 +224,7 @@ const getData = (component, odataReq, service) => {
   }
 
   // copy so that original payload is preserved
-  const data = _getCopiedData(odataReq, streaming, lastSegment)
+  const data = _getCopiedData(odataReq, streaming, lastSegment, service, target)
 
   // Only to be done for post via navigation
   if (

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

@@ -0,0 +1,50 @@
+const cds = require('../../../../cds')
+const OData = require('../OData')
+
+const { alias2ref } = require('../../../../common/utils/csn')
+const { BASE_TENANT } = require('../../../../common/utils/extensibilityUtils')
+
+const SYSTEM_SERVICES = ['cds_r.ExtensibilityService', 'cds_r.ModelProviderService']
+
+function createOdataService(service) {
+  const name = (service.definition && service.definition.name) || service.name
+  const edm = cds.compile.to.edm(service.model, { service: name })
+  alias2ref(service, edm)
+
+  const odataService = new OData(edm, service.model, service.options)
+  odataService.addCDSServiceToChannel(service)
+
+  return odataService
+}
+
+async function createNewService(name, csn, defaultOptions) {
+  const options = Object.assign({}, defaultOptions, { reflectedModel: csn })
+
+  const service = new cds.ApplicationService(name, csn, options)
+  await service.init()
+  if (options.impl) service.impl(options.impl)
+
+  return createOdataService(service)
+}
+
+const getModelHash = (tenant, features) => {
+  if (!features) features = []
+
+  let hash
+  if (cds.requires.multitenancy && tenant) {
+    hash = tenant
+  } else {
+    hash = BASE_TENANT
+  }
+
+  hash += ':' + features.join(';')
+
+  return hash
+}
+
+module.exports = {
+  SYSTEM_SERVICES,
+  createOdataService,
+  createNewService,
+  getModelHash
+}

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

@@ -2,13 +2,13 @@ const cds = require('../../../../cds')
 const { SELECT } = cds.ql
 
 const { getDeepSelect } = require('../../../services/utils/handlerUtils')
-const { DRAFT_COLUMNS } = require('../../../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../../../common/constants/draft')
 const { filterKeys } = require('../../../../fiori/utils/handler')
 
 const _getColumns = target => {
   const columns = []
   for (const k in target.elements) {
-    if (!target.elements[k].isAssociation && !DRAFT_COLUMNS.includes(k)) columns.push(k)
+    if (!target.elements[k].isAssociation && !(k in DRAFT_COLUMNS_MAP)) columns.push(k)
   }
   return columns
 }

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

@@ -9,7 +9,15 @@ const {
 const getError = require('../../../../common/error')
 
 const _unboundActionsAndFunctions = ['ACTION.IMPORT', 'FUNCTION.IMPORT']
+const _unboundCustomOperationKinds = _unboundActionsAndFunctions.reduce((acc, cur) => {
+  acc[cur] = 1
+  return acc
+}, {})
 const _actionsAndFunctions = [..._unboundActionsAndFunctions, 'BOUND.ACTION', 'BOUND.FUNCTION']
+const _boundCustomOperationKinds = _actionsAndFunctions.reduce((acc, cur) => {
+  acc[cur] = 1
+  return acc
+}, {})
 
 /**
  * Checks if a custom operation was requested.
@@ -20,10 +28,9 @@ const _actionsAndFunctions = [..._unboundActionsAndFunctions, 'BOUND.ACTION', 'B
  * @private
  */
 const isCustomOperation = (pathSegments, includingBound = true) => {
-  const customOperationKinds = includingBound ? _actionsAndFunctions : _unboundActionsAndFunctions
   const kind = pathSegments[pathSegments.length - 1].getKind()
-
-  if (customOperationKinds.includes(kind)) {
+  const kinds = includingBound ? _boundCustomOperationKinds : _unboundCustomOperationKinds
+  if (kind in kinds) {
     return kind
   }
 }

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

@@ -118,7 +118,7 @@ const convertDecimal = (row, key, options) => {
 }
 
 const addAssociationToRow = (row, foreignKey, foreignKeyElement) => {
-  const assocName = foreignKeyElement['@odata.foreignKey4']
+  const assocName = foreignKeyElement._foreignKey4
   const assoc = foreignKeyElement.parent.elements[assocName]
 
   if (!row[assocName]) {
@@ -128,7 +128,8 @@ const addAssociationToRow = (row, foreignKey, foreignKeyElement) => {
   const keyOfAssociatedEntity = foreignKey.replace(`${assocName}_`, '')
 
   // REVISIT: structured keys, see xtests in structured-x4
-  if (assoc._target.keys[keyOfAssociatedEntity] && assoc._target.keys[keyOfAssociatedEntity]['@odata.foreignKey4']) {
+  const assocTargetKey = assoc._target.keys[keyOfAssociatedEntity]
+  if (assocTargetKey && assocTargetKey._foreignKey4) {
     // assoc as key
     row[assocName][keyOfAssociatedEntity] = row[foreignKey]
     delete row[foreignKey]
@@ -173,7 +174,7 @@ const _processCategory = (category, processArgs, req, options, previousResult) =
       if (options.decimals && row[key]) convertDecimal(row, key, options)
       break
 
-    case '@odata.foreignKey4':
+    case 'foreignKey':
       addAssociationToRow(row, key, element)
       break
 
@@ -221,13 +222,13 @@ const _isContainedOrBackLink = element =>
   (element._isContained || (element._anchor && element._anchor._isContained))
 
 const _assocs = (element, target) => {
-  const assocName = element['@odata.foreignKey4']
+  const assocName = element._foreignKey4
   const assoc = assocName && target.elements[assocName]
 
   if (cds.env.effective.odata.refs) {
     // expand assoc keys except of up_ backlinks
-    if (element['@odata.foreignKey4'] && !_isUpAssoc(assoc)) {
-      return ['@odata.foreignKey4']
+    if (assoc && !_isUpAssoc(assoc)) {
+      return ['foreignKey']
     }
 
     if (element['@odata.containment.ignore']) {
@@ -247,7 +248,7 @@ const _pick = options => (element, target, parent) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
 
-  if (element.type === 'cds.Decimal') categories.push('@cds.Decimal')
+  if (element._type === 'cds.Decimal') categories.push('@cds.Decimal')
 
   categories.push(..._assocs(element, target))
 
@@ -320,10 +321,7 @@ const postProcess = (req, res, service, result, previousResult) => {
       const args = {
         processFn,
         row,
-        template,
-        pathOptions: {
-          includeKeyValues: false
-        }
+        template
       }
 
       templateProcessor(args)

package/libx/_runtime/cds-services/adapter/rest/RestRequest.js

@@ -19,15 +19,18 @@ class RestRequest extends cds.Request {
   constructor(parsed, data, req, res, service) {
     const { event, target } = parsed
 
+    // for functions, data is in params (if provided)
+    if (parsed.kind === 'function' && parsed.params) data = parsed.params
+
     /*
      * query
      */
     const query = restToCqn(parsed, data, req, service)
 
     /*
-     * method, params, headers
+     * method, headers
      */
-    const { method, params, headers } = req
+    const { method, headers } = req
 
     /*
      * super
@@ -37,7 +40,7 @@ class RestRequest extends cds.Request {
     const _model = service.model
     // REVISIT: public API for query options (express style req.query already in use)?
     const _queryOptions = req.query
-    super({ event, target, data, query, user, method, params, headers, req, res, _model, _queryOptions })
+    super({ event, target, data, query, user, method, headers, req, res, _model, _queryOptions })
 
     // REVISIT: validate associations for deep insert
     flattenDeepToOneAssociations(this, this.model)

package/libx/_runtime/cds-services/adapter/rest/handlers/operation.js

@@ -53,8 +53,10 @@ module.exports = service => {
       if (err) next(err)
       else {
         // only set status if not yet modified
-        if (restRes.statusCode === 200 && status) restRes.status(status)
-        restRes.send(toRestResult(body))
+        const { statusCode } = restRes
+        if (statusCode === 200 && status) restRes.status(status)
+        if (body === undefined) restRes.status(statusCode === 200 ? 204 : statusCode).end()
+        else restRes.send(toRestResult(body))
       }
     }
   }

package/libx/_runtime/cds-services/adapter/rest/rest-to-cqn/utils.js

@@ -22,7 +22,7 @@ const createCqlString = (target, key, keyValue) => {
   let keyString = ''
 
   if (keyValue !== undefined) {
-    keyString = `[${key}=${_convertKeyForCompiler(keyValue, target.keys[key].type)}]`
+    keyString = `[${key}=${_convertKeyForCompiler(keyValue, target.keys[key]._type)}]`
   }
 
   return `${target.name}${keyString}`

package/libx/_runtime/cds-services/adapter/rest/utils/binary.js

@@ -2,7 +2,7 @@ const _isKeyTypeBinary = (entity, key) => {
   return (
     entity.elements &&
     entity.elements[key] &&
-    (entity.elements[key].type === 'cds.Binary' || entity.elements[key].type === 'cds.LargeBinary')
+    (entity.elements[key]._type === 'cds.Binary' || entity.elements[key]._type === 'cds.LargeBinary')
   )
 }
 

package/libx/_runtime/cds-services/adapter/rest/utils/key-value-utils.js

@@ -22,10 +22,9 @@ const getConvertedValue = (type, value) => {
 
 module.exports = {
   getKeyValuePair: (entity, value) => {
+    if (value === undefined) return {}
     const key = _keyFromEntity(entity)
-    return {
-      [key.name]: getConvertedValue(key.type, value)
-    }
+    return { [key.name]: getConvertedValue(key._type, value) }
   },
   getConvertedValue
 }

package/libx/_runtime/cds-services/adapter/rest/utils/parse-url.js

@@ -19,7 +19,9 @@ const _normalizeAndSplitUrl = req => {
 }
 
 const _enrichCustomOperation = (csnElement, customOperationName) => {
-  return Object.assign({ name: customOperationName }, csnElement)
+  const obj = { name: customOperationName }
+  Object.setPrototypeOf(obj, csnElement)
+  return obj
 }
 
 const _initializeParsed = event => {
@@ -93,9 +95,9 @@ const _validateAndConvertParamValues = (csnElement, params = {}) => {
     if (!csnElementParam) {
       throw getError(400, 'INVALID_PARAMETER', [param])
     }
-    const convertedParam = getConvertedValue(csnElementParam.type, params[param])
+    const convertedParam = getConvertedValue(csnElementParam._type, params[param])
     if (Number.isNaN(convertedParam)) {
-      throw getError(400, 'INVALID_PARAMETER_VALUE_TYPE', [param, csnElementParam.type])
+      throw getError(400, 'INVALID_PARAMETER_VALUE_TYPE', [param, csnElementParam._type])
     }
     params[param] = convertedParam
   }
@@ -123,7 +125,7 @@ const _setConvenienceProperties = parsed => {
     parsed.isCollection = false
   } else if (lastElement.kind === 'entity') {
     parsed.isCollection = true
-  } else if (lastElement.type === 'cds.Association' || lastElement.type === 'cds.Composition') {
+  } else if (lastElement.isAssociation) {
     parsed.isCollection = true
   } else {
     parsed.operation = lastElement

package/libx/_runtime/cds-services/adapter/rest/utils/result.js

@@ -13,6 +13,7 @@ const toRestResult = result => {
       count: result.$count,
       value: result
     }
+    // need to convert number to string because express interprets integer as status code
   } else if (typeof result === 'number') {
     restResult = result.toString()
   }

package/libx/_runtime/cds-services/adapter/rest/utils/validation-checks.js

@@ -84,14 +84,11 @@ const validateReturnType = (operation, data) => {
   // in case of inline return type: { elements: ... } and no explicit name of return type
   const returnType = operation.returns.items ? operation.returns.items : operation.returns
 
-  if (typeof data === 'undefined') {
-    const { kind, name } = operation
-    // REVISIT: use i18n
-    throw getError(`'undefined' is invalid according to return type definition of custom ${kind} '${name}'.`)
-  }
+  if (typeof data === 'undefined') return true
 
   let checkResult
 
+  // .type of action/function behaves different to .type of other csn elements
   // Return type contains primitives
   if (cds.builtin.types[returnType.type]) {
     const check = CDS_TYPE_CHECKS[returnType.type]
@@ -100,6 +97,12 @@ const validateReturnType = (operation, data) => {
       ? _checkArray(returnType.type, check, data)
       : _checkSingle(returnType.type, check, data)
   } else {
+    if (typeof data !== 'object') {
+      throw new Error(
+        `Invalid scalar value ${typeof data === 'string' ? `"${data}"` : data} for return type "${returnType.type}"`
+      )
+    }
+
     // Only check complex objects, ignore non-modelled data
     data = (Array.isArray(data) ? data : [data]).filter(entry => typeof entry === 'object' && !Array.isArray(entry))
 

package/libx/_runtime/cds-services/services/Service.js

@@ -7,6 +7,11 @@ const { postProcess } = require('../../common/utils/postProcessing')
 
 const _isSimpleCqnQuery = q => typeof q === 'object' && q !== null && !Array.isArray(q) && Object.keys(q).length > 0
 
+// for getRestrictions()
+const { getNormalizedRestrictions, getApplicableRestrictions } = require('./utils/restrictions')
+const WRITE_EVENTS = { CREATE: 1, NEW: 1, UPDATE: 1, PATCH: 1, DELETE: 1, CANCEL: 1, EDIT: 1 }
+const CRUD = Object.assign({ READ: 1 }, WRITE_EVENTS)
+
 /**
  * Generic Service Event Handler.
  */
@@ -108,6 +113,41 @@ class ApplicationService extends cds.Service {
     }
   }
 
+  /**
+   * Returns the applicable restrictions for the current request as follows:
+   * - null: unrestricted access
+   * - []: no access
+   * - [{ grant: '...', to: ['...'], where: '...' }, ...]: applicable restrictions with grant normalized to strings,
+   *     i.e., grant: ['CREATE', 'UPDATE'] in model becomes [{ grant: 'CREATE' }, { grant: 'UPDATE' }]
+   * - Promise resovling to any of the above (needed for CAS overrides)
+   *
+   * @param {object} definition - then csn definition of an entity or an (un)bound action or function
+   * @param {string} event - the event name
+   * @param {import('../../../../lib/req/user')} user - the current user
+   * @returns {Promise | Array | null}
+   */
+  getRestrictions(definition, event, user) {
+    let restrictions = getNormalizedRestrictions(definition, this.model.definitions, event)
+    if ((!restrictions || !restrictions.length) && (event in CRUD || !definition.parent)) {
+      // > unrestricted entity or unbound
+      return null
+    }
+    if (event in CRUD && restrictions.every(r => r.grant !== '*' && !(r.grant in CRUD))) {
+      // > only bounds are restricted
+      return null
+    }
+    if (!(event in CRUD) && (!restrictions || !restrictions.length) && definition.parent) {
+      // > bound without own restrictions -> get from parent
+      restrictions = getNormalizedRestrictions(definition.parent, this.model.definitions, event)
+      if (!restrictions || !restrictions.length) {
+        // > unrestricted bound
+        return null
+      }
+    }
+    // return the applicable restrictions (grant and to fit to request and user)
+    return getApplicableRestrictions(restrictions, event, user)
+  }
+
   // Overload .handle in order to resolve projections up to a definition that is known by the remote service instance.
   // Result is post processed according to the inverse projection in order to reflect the correct result of the original query.
   async handle(req) {

package/libx/_runtime/cds-services/services/utils/columns.js

@@ -2,8 +2,9 @@ const cds = require('../../../cds')
 // requesting logger without module on purpose!
 const LOG = cds.log()
 
-const { DRAFT_COLUMNS_UNION } = require('../../../common/constants/draft')
+const { DRAFT_COLUMNS_UNION_MAP } = require('../../../common/constants/draft')
 
+// REVISIT: Can we combine that with db/utils/columns.js?
 /**
  * This method gets all columns for an entity.
  * It includes the generated foreign keys from managed associations, structured elements and complex and custom types.
@@ -30,7 +31,7 @@ const getColumns = (
     if (element.isAssociation) continue
     if (filterVirtual && element.virtual) continue
     if (removeIgnore && element['@cds.api.ignore']) continue
-    if (skipDraft && DRAFT_COLUMNS_UNION.includes(each)) continue
+    if (skipDraft && each in DRAFT_COLUMNS_UNION_MAP) continue
     if (keysOnly && !element.key) continue
     columns.push(onlyNames ? each : element)
   }
@@ -82,7 +83,7 @@ const getSearchableColumns = entity => {
     // - The @cds.search annotation is provided, the column name is not included, and the column
     // is typed as string.
     // - The @cds.search annotation is not provided, and the column is typed as string
-    return annotatedColumnValue === undefined && column.type === defaultSearchableType
+    return annotatedColumnValue === undefined && column._type === defaultSearchableType
   })
 
   // if the @cds.search annotation is provided -->

package/libx/_runtime/cds-services/services/utils/compareJson.js

@@ -1,4 +1,4 @@
-const { DRAFT_COLUMNS } = require('../../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../../common/constants/draft')
 
 const _deepEqual = (val1, val2) => {
   if (val1 && typeof val1 === 'object' && val2 && typeof val2 === 'object') {
@@ -19,7 +19,7 @@ const _getIdxCorrespondingEntryWithSameKeys = (source, entry, keys) =>
   source.findIndex(sourceEntry => keys.every(key => _deepEqual(sourceEntry[key], entry[key])))
 
 const _getKeysOfEntity = entity =>
-  Object.keys(entity.keys).filter(key => !DRAFT_COLUMNS.includes(key) && !entity.elements[key].isAssociation)
+  Object.keys(entity.keys).filter(key => !(key in DRAFT_COLUMNS_MAP) && !entity.elements[key].isAssociation)
 
 const _getCompositionsOfEntity = entity => Object.keys(entity.elements).filter(e => entity.elements[e].isComposition)
 
@@ -29,7 +29,7 @@ const _createToBeDeletedEntries = (oldEntry, entity, keys, compositions) => {
   }
 
   for (const prop in oldEntry) {
-    if (DRAFT_COLUMNS.includes(prop)) {
+    if (prop in DRAFT_COLUMNS_MAP) {
       continue
     }
     if (keys.includes(prop)) {
@@ -162,7 +162,7 @@ const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
     }
 
     // if value did not change --> ignored
-    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || DRAFT_COLUMNS.includes(prop)) {
+    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || prop in DRAFT_COLUMNS_MAP) {
       continue
     }
 

package/libx/_runtime/cds-services/services/utils/differ.js

@@ -6,7 +6,7 @@ const { compareJson } = require('./compareJson')
 const { selectDeepUpdateData } = require('../../../common/composition')
 const { ensureDraftsSuffix } = require('../../../fiori/utils/handler')
 
-const { DRAFT_COLUMNS } = require('../../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../../common/constants/draft')
 const { cqn2cqn4sql, convertPathExpressionToWhere } = require('../../../common/utils/cqn2cqn4sql')
 const { revertData } = require('../../../common/utils/resolveView')
 const { removeIsActiveEntityRecursively } = require('../../../fiori/utils/where')
@@ -25,7 +25,7 @@ module.exports = class {
           ref: [element.name],
           expand: this._createSelectColumnsForDelete(element._target)
         })
-      } else if (!element._isAssociationStrict && !DRAFT_COLUMNS.includes(element.name)) {
+      } else if (!element._isAssociationStrict && !(element.name in DRAFT_COLUMNS_MAP)) {
         columns.push({ ref: [element.name] })
       }
     }
@@ -58,7 +58,7 @@ module.exports = class {
       } catch (e) {
         // NOTE: unofficial compat flag!
         if (cds.env.features.throw_diff_error !== false) throw e
-        else LOG._error && LOG.error('Unable to calculate diff due to error: ' + e.message, e)
+        else LOG.error('Unable to calculate diff due to error: ' + e.message, e)
       }
     }
     const newQuery = cqn2cqn4sql(req.query, this._srv.model)

package/libx/_runtime/cds-services/services/utils/handlerUtils.js

@@ -3,7 +3,7 @@ const { SELECT } = cds.ql
 
 const { processDeep } = require('../../util/dataProcessUtils')
 
-const { DRAFT_COLUMNS } = require('../../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../../common/constants/draft')
 
 const _isAssociationToOneManaged = element => element._isAssociationEffective && element.is2one && !element.on
 
@@ -18,7 +18,7 @@ const _getWheres = (key, data) => {
 const allKeysAreProvided = req => {
   const data = req.data && (Array.isArray(req.data) ? req.data : [req.data])
   for (const key of Object.values(req.target.keys || {})) {
-    if (key._isAssociationStrict || DRAFT_COLUMNS.includes(key.name)) {
+    if (key._isAssociationStrict || key.name in DRAFT_COLUMNS_MAP) {
       continue
     }
     for (const d of data) {
@@ -53,7 +53,7 @@ const _getSelectCQN = (req, columns) => {
   const data = req.data && (Array.isArray(req.data) ? req.data : [req.data])
 
   for (const key of Object.values(req.target.keys || {})) {
-    if (key._isAssociationStrict || DRAFT_COLUMNS.includes(key.name)) {
+    if (key._isAssociationStrict || key.name in DRAFT_COLUMNS_MAP) {
       continue
     }
 
@@ -168,7 +168,7 @@ const getDeepSelect = req => {
   const cols = []
 
   for (const each in elements) {
-    if (DRAFT_COLUMNS.includes(each)) continue
+    if (each in DRAFT_COLUMNS_MAP) continue
     const e = elements[each]
     if (!e.isAssociation) cols.push(each)
     else if (e._isCompositionEffective) {