@sap/cds 6.8.4 → 7.0.1

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

@@ -7,6 +7,7 @@ const ResourceKind = odata.uri.UriResource.ResourceKind
 const EdmPrimitiveTypeKind = odata.edm.EdmPrimitiveTypeKind
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { getSegmentKeyValue } = require('./utils')
+const normalizeTimestamp = require('../../../../common/utils/normalizeTimestamp')
 
 const _binaryOperatorToCQN = new Map([
   [BinaryOperatorKind.EQ, '='],
@@ -46,10 +47,10 @@ class ExpressionToCQN {
         return { val: parseFloat(value) }
       case EdmPrimitiveTypeKind.DateTimeOffset: {
         try {
-          let val = new Date(value).toISOString()
-          // cut off ms if cds.DateTime
-          if (expression._cdsType === 'cds.DateTime') val = val.replace(/\.\d\d\dZ$/, 'Z')
-          return { val }
+          if (expression._cdsType === 'cds.DateTime')
+            // cut off ms if cds.DateTime
+            return { val: new Date(value).toISOString().replace(/\.\d\d\dZ$/, 'Z') }
+          return { val: normalizeTimestamp(value) }
         } catch (e) {
           throw Object.assign(new Error(`The type 'Edm.DateTimeOffset' is not compatible with '${value}'`), {
             status: 400

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

@@ -6,7 +6,13 @@ const orderByToCQN = require('./orderByToCQN')
 const selectToCQN = require('./selectToCQN')
 const searchToCQN = require('./searchToCQN')
 const applyToCQN = require('./applyToCQN')
-const { convertUrlPathToCqn, getAllKeys, isPathSupported, getSegmentKeyValue } = require('./utils')
+const {
+  convertUrlPathToCqn,
+  convertUrlPathToViewCqn,
+  getAllKeys,
+  isPathSupported,
+  getPropertyParam
+} = require('./utils')
 
 const QueryOptions = require('../okra/odata-server').QueryOptions
 const {
@@ -33,11 +39,12 @@ const SUPPORTED_SEGMENT_KINDS = {
 }
 
 const expandToCQN = require('./expandToCQN')
-const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 
 const { getPageSize } = require('../../../../common/generic/paging')
 const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
+const { handleStreamProperties } = require('../../../../common/utils/streamProp')
+const { isNewStream } = require('../../../../common/utils/stream')
 
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
 
@@ -145,18 +152,6 @@ const _topSkip = (queryOptions, target, cqn) => {
   }
 }
 
-const _getPropertyParam = pathSegments => {
-  const index = pathSegments[pathSegments.length - 1].getKind() === VALUE ? 2 : 1
-  const prop = pathSegments[pathSegments.length - index].getProperty()
-  const name = prop && prop.getName()
-  return (
-    name &&
-    (pathSegments.length > 1
-      ? { ref: resolveStructuredName(pathSegments, pathSegments.length - 2, [name]) }
-      : { ref: [name] })
-  )
-}
-
 const _isCollectionOrToMany = kind => {
   return kind === ENTITY_COLLECTION || kind === NAVIGATION_TO_MANY
 }
@@ -249,29 +244,6 @@ const _addKeysToSelectIfNoStreaming = (entity, select, streaming) => {
   }
 }
 
-const _convertUrlPathToViewCqn = segments => {
-  const args = segments[0].getKeyPredicates().reduce((prev, curr) => {
-    const { keyName, val } = getSegmentKeyValue(curr)
-    prev[keyName.replace(/\//g, '_')] = { val }
-    return prev
-  }, {})
-
-  // REVISIT: Replace .getFullQualifiedName().toString() with findCsnTargetFor as done in convertUrlPathToCqn
-  return {
-    ref: [
-      {
-        id: segments[0]
-          .getEntitySet()
-          .getEntityType()
-          .getFullQualifiedName()
-          .toString()
-          .replace(/Parameters$/, ''),
-        args
-      }
-    ]
-  }
-}
-
 const _expandRecursive = (ref, entity, expands = []) => {
   if (ref.length > 1) {
     let innerExpandElement = expands.find(e => e.ref[0] === ref[0])
@@ -344,12 +316,35 @@ const readToCQN = (service, target, odataReq) => {
   const segments = uriInfo.getPathSegments()
   isPathSupported(SUPPORTED_SEGMENT_KINDS, segments)
 
+  if (isNewStream()) {
+    let propertyParam
+    if (isStreaming(segments)) {
+      propertyParam = getPropertyParam(segments)
+    } else if (segments[segments.length - 1]._isStreamByDollarValue) {
+      // REVISIT: Issue with multiple streaming properties ? Also in read.js
+      for (const k in target.elements) {
+        if (target.elements[k]['@Core.MediaType']) {
+          propertyParam = { ref: [k] }
+          break
+        }
+      }
+    }
+
+    if (propertyParam) {
+      const isView = target.params && Object.keys(target.params).length > 0
+      return STREAM.from(isView ? convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service)).column(
+        propertyParam.ref[0]
+      )
+    }
+  }
+
   const queryOptions = odataReq.getQueryOptions()
   const entity = service.model.definitions[ensureUnlocalized(target.name)]
-  const propertyParam = _getPropertyParam(segments)
+  const propertyParam = getPropertyParam(segments)
   const apply = _apply(uriInfo, queryOptions, entity, service.model)
   const select = _select(queryOptions, entity)
   const expand = expandToCQN(uriInfo.getQueryOption(QueryOptions.EXPAND), uriInfo.getFinalEdmType(), service)
+  const streaming = isStreaming(segments)
 
   if (Object.keys(apply).length) {
     _handleApply(apply, select)
@@ -359,7 +354,7 @@ const readToCQN = (service, target, odataReq) => {
     select.push(propertyParam)
 
     // add keys if no streaming, TODO: what if streaming via to-one
-    _addKeysToSelectIfNoStreaming(entity, select, isStreaming(segments))
+    _addKeysToSelectIfNoStreaming(entity, select, streaming)
   }
 
   if (select.length === 0) {
@@ -378,7 +373,9 @@ const readToCQN = (service, target, odataReq) => {
   _checkViewWithParamCall(isView, segments, kind, target.name)
 
   // keep target as input because of localized view
-  const cqn = SELECT.from(isView ? _convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
+  const cqn = SELECT.from(isView ? convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
+  if (!cqn.SELECT.columns) cqn.SELECT.columns = ['*']
+  if (!streaming) handleStreamProperties(target, cqn, service.model, true)
 
   const isCount =
     isCollectionOrToMany &&

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

@@ -3,7 +3,8 @@ const { UPDATE } = cds.ql
 
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { isStreaming } = require('../utils/stream')
-const { convertUrlPathToCqn } = require('./utils')
+const { convertUrlPathToCqn, getPropertyParam } = require('./utils')
+const { isNewStream } = require('../../../../common/utils/stream')
 
 const { ENTITY, NAVIGATION_TO_ONE, PRIMITIVE_PROPERTY, SINGLETON } =
   require('../okra/odata-server').uri.UriResource.ResourceKind
@@ -28,6 +29,11 @@ const updateToCQN = (service, data, odataReq) => {
   const segment = segments[segments.length - 1]
   const streaming = isStreaming(segments)
 
+  if (isNewStream() && streaming) {
+    const col = getPropertyParam(segments).ref[0]
+    return STREAM.into(convertUrlPathToCqn(segments, service)).data(data[col]).column(col)
+  }
+
   if (SUPPORTED_KINDS[segment.getKind()] || streaming) {
     return UPDATE(convertUrlPathToCqn(segments, service)).data(data)
   }

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

@@ -1,19 +1,7 @@
 const { getFeatureNotSupportedError } = require('../../../util/errors')
-
+const { resolveStructuredName } = require('../utils/handlerUtils')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 
-const CDL_KEYWORDS = new Set(require('@sap/cds-compiler').to.cdl.keywords)
-
-// TODO: Which EDM Types are missing?
-const notToBeConvertedForCompiler = new Set([
-  'Edm.Boolean',
-  'Edm.Int16',
-  'Edm.Int32',
-  'Edm.Int64',
-  'Edm.Decimal',
-  'Edm.Double'
-])
-
 const addLimit = (item, rows, offset) => {
   // ignore 0 offset -> truthy check
   if (rows != null || offset) {
@@ -29,21 +17,49 @@ const addLimit = (item, rows, offset) => {
   }
 }
 
-const convertKeyPredicatesToStringExpr = keyPredicates => {
+const _isNum = type => {
+  const nums = {
+    'Edm.Byte': 1,
+    'Edm.Int16': 1,
+    'Edm.Int32': 1,
+    'Edm.Double': 1
+  }
+
+  return type.toString() in nums
+}
+
+const _isBigNum = type => {
+  const bigNums = {
+    'Edm.Int64': 1,
+    'Edm.Decimal': 1
+  }
+
+  return type.toString() in bigNums
+}
+
+const _getValue = (value, type) => {
+  if (_isNum(type)) return Number(value)
+  if (_isBigNum(type)) {
+    const num = Number(value)
+    return Number.isSafeInteger(num) ? num : value
+  }
+  if (type === 'Edm.Boolean') return value === 'true'
+  return value
+}
+
+const convertKeyPredicatesToWhere = keyPredicates => {
+  const where = []
   if (keyPredicates.length) {
-    return `[${keyPredicates
-      .map(kp => {
-        const keyName = kp.getEdmRef().getName().replace(/\//g, '.')
-        let keyValue = kp.getText().replace(/'/g, "''")
-        if (!notToBeConvertedForCompiler.has(kp.getEdmRef().getProperty().getType().toString())) {
-          keyValue = `'${keyValue}'`
-        }
-        return `${CDL_KEYWORDS.has(keyName) ? `![${keyName}]` : keyName}=${keyValue}`
-      })
-      .join(' and ')}]`
+    keyPredicates.forEach(kp => {
+      if (where.length) where.push('and')
+      const keyName = kp.getEdmRef().getName().replace(/\//g, '.')
+      const type = kp.getEdmRef().getProperty().getType()
+      let keyValue = _getValue(kp.getText(), type.toString())
+      where.push({ ref: [keyName] }, '=', { val: keyValue })
+    })
   }
 
-  return ''
+  return where
 }
 
 const convertUrlPathToCqn = (segments, service) => {
@@ -52,29 +68,74 @@ const convertUrlPathToCqn = (segments, service) => {
       segment =>
         segment.getKind() !== 'COUNT' && segment.getKind() !== 'PRIMITIVE.PROPERTY' && segment.getKind() !== 'VALUE'
     )
-    .reduce((expr, segment, i) => {
+    .reduce((expr, segment) => {
       if (segment.getKind() === 'ENTITY' || segment.getKind() === 'ENTITY.COLLECTION') {
         const entity = segment.getEntitySet().getEntityType().getFullQualifiedName()
-        const keys = convertKeyPredicatesToStringExpr(segment.getKeyPredicates())
-
-        return `${findCsnTargetFor(entity.name, service.model, service.namespace).name}${keys}`
+        const where = convertKeyPredicatesToWhere(segment.getKeyPredicates())
+        let ref
+        if (where.length) {
+          ref = { ref: [{ id: findCsnTargetFor(entity.name, service.model, service.namespace).name, where }] }
+        } else {
+          ref = { ref: [findCsnTargetFor(entity.name, service.model, service.namespace).name] }
+        }
+        return ref
       }
 
       if (segment.getKind() === 'SINGLETON') {
         const singleton = segment.getSingleton().getEntityType().getFullQualifiedName()
-
-        return `${findCsnTargetFor(singleton.name, service.model, service.namespace).name}`
+        return { ref: [findCsnTargetFor(singleton.name, service.model, service.namespace).name] }
       }
 
       if (segment.getKind() === 'COMPLEX.PROPERTY') {
-        const complex = segment.getProperty().getName()
-        return `${expr}${i === 1 ? ':' : '.'}${complex}`
+        expr.ref.push(segment.getProperty().getName())
+        return expr
+      }
+
+      const where = convertKeyPredicatesToWhere(segment.getKeyPredicates())
+      let ref
+      if (where.length) {
+        ref = { id: segment.getNavigationProperty().getName(), where }
+      } else {
+        ref = segment.getNavigationProperty().getName()
       }
 
-      const navigation = segment.getNavigationProperty().getName()
-      const keys = convertKeyPredicatesToStringExpr(segment.getKeyPredicates())
-      return `${expr}${i === 1 ? ':' : '.'}${navigation}${keys}`
-    }, '')
+      if (!expr.ref) expr.ref = []
+      expr.ref.push(ref)
+      return expr
+    }, {})
+}
+
+const convertUrlPathToViewCqn = segments => {
+  const args = segments[0].getKeyPredicates().reduce((prev, curr) => {
+    const { keyName, val } = getSegmentKeyValue(curr)
+    prev[keyName.replace(/\//g, '_')] = { val }
+    return prev
+  }, {})
+
+  // REVISIT: Replace .getFullQualifiedName().toString() with findCsnTargetFor as done in convertUrlPathToCqn
+  return {
+    ref: [
+      {
+        id: segments[0]
+          .getEntitySet()
+          .getEntityType()
+          .getFullQualifiedName()
+          .toString()
+          .replace(/Parameters$/, ''),
+        args
+      }
+    ]
+  }
+}
+
+const getPropertyParam = segments => {
+  const index = segments[segments.length - 1].getKind() === 1 ? 2 : 1
+  const prop = segments[segments.length - index].getProperty()
+  const name = prop && prop.getName()
+  return (
+    name &&
+    (segments.length > 1 ? { ref: resolveStructuredName(segments, segments.length - 2, [name]) } : { ref: [name] })
+  )
 }
 
 const isSameArray = (arr1, arr2) => {
@@ -143,8 +204,10 @@ const getSegmentKeyValue = segmentParam => {
 module.exports = {
   addLimit,
   convertUrlPathToCqn,
+  convertUrlPathToViewCqn,
   isSameArray,
   getAllKeys,
   isPathSupported,
-  getSegmentKeyValue
+  getSegmentKeyValue,
+  getPropertyParam
 }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/errors/AbstractError.js

@@ -35,7 +35,11 @@ class AbstractError extends Error {
   setRootCause (rootCause) {
     if (rootCause) {
       if (!(rootCause instanceof Error)) {
-        throw new Error("Parameter 'rootCause' must be an instance of Error")
+        if (typeof rootCause === 'object' && rootCause.message) {
+          rootCause = Object.assign(new Error(rootCause.message), rootCause)
+        } else {
+          throw new Error("Parameter 'rootCause' must be an instance of Error")
+        }
       }
       this._rootCause = rootCause
     }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriTokenizer.js

@@ -2,12 +2,9 @@
 
 const UriSyntaxError = require('../errors/UriSyntaxError')
 
-const IDENTIFIER =
-  '(?:(?:_|\\p{Letter}|\\p{Letter_Number})' +
-  '(?:_|\\p{Letter}|\\p{Letter_Number}|\\p{Decimal_Number}' +
-  '|\\p{Nonspacing_Mark}|\\p{Spacing_Mark}|\\p{Connector_Punctuation}|\\p{Format}){0,127})'
+const IDENTIFIER = '([_\\p{L}\\p{Nl}][_\\p{L}\\p{Nl}\\p{Nd}\\p{Mn}\\p{Mc}\\p{Pc}\\p{Cf}]{0,127})'
 const IDENTIFIER_REGEXP = new RegExp('^' + IDENTIFIER, 'u')
-const QUALIFIED_NAME_REGEXP = new RegExp('^' + IDENTIFIER + '(?:\\.' + IDENTIFIER + ')+', 'u')
+const QUALIFIED_NAME_REGEXP = new RegExp('^' + IDENTIFIER + '(\\.' + IDENTIFIER + ')+', 'u')
 const PARAMETER_ALIAS_NAME_REGEXP = new RegExp('^@' + IDENTIFIER, 'u')
 
 const BOOLEAN_VALUE_REGEXP = new RegExp('^(?:true|false)', 'i')
@@ -696,9 +693,9 @@ class UriTokenizer {
    * @private
    */
   _nextWithRegularExpression (regexp) {
-    const parsed = regexp.exec(this._parseString.substring(this._index))
-    if (!parsed) return false
-    this._index += parsed[0].length
+    const matched = this._parseString.substring(this._index).match(regexp)
+    if (!matched) return false
+    this._index += matched[0].length
     return true
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/utils/ValueConverter.js

@@ -336,7 +336,8 @@ class ValueConverter {
    * output is requested in the formatParams parameter of the constructor of this class.
    */
   convertDecimal (value, precision, scale) {
-    this._valueValidator.validateDecimal(value, precision, scale)
+    // now done in runtime's assert framework
+    // this._valueValidator.validateDecimal(value, precision, scale)
 
     const bigValue = new big(value)
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/deserializer/ResourceJsonDeserializer.js

@@ -201,18 +201,19 @@ class ResourceJsonDeserializer {
     // because the first parameter of a bound action is the binding parameter
     // which is not part of the payload data.
     if (edmAction.isBound()) parameters.shift()
-
+    
+    if (parameters.length > 0) data = JSON.parse(value)
     for (const [paramName, edmParam] of parameters) {
-      if ((value === null || value === undefined) && !edmParam.isNullable()) {
-        throw new DeserializationError(`Parameter '${paramName}' is not nullable but payload is null`)
-      } else if (!data) {
-        data = JSON.parse(value)
-        if (typeof data !== 'object') {
-          throw new DeserializationError('Value for action parameters must be an object.')
-        }
+      if (!data && typeof data !== 'object') {
+        throw new DeserializationError('Value for action parameters must be an object.')
       }
 
       let paramValue = data[paramName]
+
+      if ((value === null || value === undefined || paramValue == null) && !edmParam.isNullable()) {
+        throw new DeserializationError(`Parameter '${paramName}' is not nullable`)
+      }
+
       if (paramValue === undefined) {
         // OData JSON Format Version 4.0 Plus Errata 03 - 17 Action Invocation:
         // "Any parameter values not specified in the JSON object are assumed to have the null value."

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

@@ -21,7 +21,7 @@ function OkraAdapter(srv, model = srv.model) {
 //
 //  REVISIT: Move to ExtensibilityService
 //
-if (cds.mtx || cds.requires.extensibility || cds.requires.toggles)
+if (cds.requires.extensibility || cds.requires.toggles)
   module.exports = srv => {
     const id = `${++unique} - ${srv.path}` // REVISIT: this is to allow running multiple express apps serving same endpoints, as done by some questionable tests
     return function ODataAdapter(req, res) {

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

@@ -3,13 +3,15 @@ const {
 } = require('../okra/odata-server')
 
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
-const { isStreaming } = require('./stream')
 const { convertStructured } = require('../../../../../common/utils/ucsn')
 const { deepCopy } = require('../../../../common/utils/copy')
 const { getSegmentKeyValue } = require('../odata-to-cqn/utils')
 
-const _isFunctionInvocation = req =>
-  req.getUriInfo().getLastSegment().getFunction() || req.getUriInfo().getLastSegment().getFunctionImport()
+const _isFunctionInvocation = odataReq => {
+  return (
+    odataReq.getUriInfo().getLastSegment().getFunction() || odataReq.getUriInfo().getLastSegment().getFunctionImport()
+  )
+}
 
 const _addStructuredProperties = ([structName, property, ...nestedProperties], paramData, value) => {
   paramData[structName] = paramData[structName] || {}
@@ -129,14 +131,14 @@ function _entityOrTypeName(navSourceSegment) {
     .getFullQualifiedName()
 }
 
-const _addForeignKeys = (service, req, data) => {
-  const pathSegments = req.getUriInfo().getPathSegments()
+const _addForeignKeys = (service, odataReq, data) => {
+  const pathSegments = odataReq.getUriInfo().getPathSegments()
   // retrieve keys/values from the path segment representing the navigation source
   const navSourceSegment = pathSegments[pathSegments.length - 2]
   const navSourceKeyValues = _getParamData(navSourceSegment.getKeyPredicates())
 
   // retrieve relevant foreign key properties of the target entity, including the corresponding source key properties
-  const navProperty = req.getUriInfo().getLastSegment().getNavigationProperty()
+  const navProperty = odataReq.getUriInfo().getLastSegment().getNavigationProperty()
 
   // REVISIT: cannot be removed yet because of navigation of draft to non draft would add IsActiveEntity to .data
   if (navProperty.getPartner() && navProperty.getPartner().getReferentialConstraints().size) {
@@ -179,10 +181,10 @@ const _getFunctionParameters = (lastSegment, keyValues, service, target) => {
   return paramValues
 }
 
-const _getCopiedData = (odataReq, streaming, lastSegment, service, target) => {
+const _getCopiedData = (odataReq, lastSegment, service, target) => {
   let data = odataReq.getBody() || {}
 
-  if (streaming || lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
+  if (lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
     return { [lastSegment.getProperty().getName()]: data }
   }
 
@@ -219,8 +221,10 @@ const _getCopiedData = (odataReq, streaming, lastSegment, service, target) => {
 const getData = (component, odataReq, service, target) => {
   const segments = odataReq.getUriInfo().getPathSegments()
   const lastSegment = odataReq.getUriInfo().getLastSegment()
-  const streaming = isStreaming(segments)
-  const keyPredicates = streaming ? segments[segments.length - 2].getKeyPredicates() : lastSegment.getKeyPredicates()
+  const keyPredicates =
+    lastSegment.getKind() === 'PRIMITIVE.PROPERTY'
+      ? segments[segments.length - 2].getKeyPredicates()
+      : lastSegment.getKeyPredicates()
   const keyValues = _getParamData(keyPredicates)
 
   if (component === DATA_READ_HANDLER && _isFunctionInvocation(odataReq)) {
@@ -235,7 +239,7 @@ const getData = (component, odataReq, service, target) => {
   }
 
   // copy so that original payload is preserved
-  const data = _getCopiedData(odataReq, streaming, lastSegment, service, target)
+  const data = _getCopiedData(odataReq, lastSegment, service, target)
 
   // Only to be done for post via navigation
   if (

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

@@ -8,6 +8,7 @@ const {
 const { getDeepSelect, getSimpleSelectCQN } = require('./handlerUtils')
 const { hasDeepUpdate } = require('../../../../common/composition/update')
 const { WRITE_EVENTS, CDS_EVENTS } = require('../../../../common/constants/events')
+const { addEtagColumns } = require('../../../../common/utils/etag')
 
 const setLocationHeader = (req, { model }) => {
   const { odataRes } = req._
@@ -67,6 +68,9 @@ const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: fa
   Object.defineProperty(query.SELECT, '_4odata', { value: true })
   _ensureKeysAreSelected(query)
 
+  // automatically add etag columns if not already there
+  addEtagColumns(query.SELECT.columns, req.target)
+
   // gracefully set location and no body if no read auth or not readable capability
   let result
   try {

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

@@ -7,6 +7,7 @@ const getTemplate = require('../../../../common/utils/template')
 const templateProcessor = require('../../../../common/utils/templateProcessor')
 const { omitValue, applyOmitValuesPreference } = require('./omitValues')
 const { setLocationHeader } = require('./readAfterWrite')
+const normalizeTimestamp = require('../../../../common/utils/normalizeTimestamp')
 
 const METADATA = {
   $context: '*@odata.context',
@@ -210,6 +211,7 @@ const _processCategory = (req, category, elementInfo, options, previousResult) =
 
     case '@cds.Boolean':
       if (row[key] != null) row[key] = !!row[key]
+      break
 
     // no default
   }
@@ -273,6 +275,7 @@ const _pick = options => (element, target) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element._type === 'cds.Decimal') categories.push('@cds.Decimal')
+  if (element._type === 'cds.Timestamp') categories.push('@cds.Timestamp')
   if (cds.db?.cqn2sql && element._type === 'cds.Boolean') categories.push('@cds.Boolean') // REVISIT: violates modularization -> do we still need that?
 
   categories.push(..._assocs(element, target))
@@ -373,8 +376,8 @@ const postProcessMinimal = (req, service, result) => {
   setLocationHeader(req, service)
 
   const etag = target._etag && target._etag.name
-  if (timestamp && etag && etag in result) {
-    return { '*@odata.etag': result[etag] === '$now' ? new Date(timestamp).toISOString() : result[etag] }
+  if (etag && etag in result) {
+    return { '*@odata.etag': result[etag] === '$now' ? normalizeTimestamp(timestamp) : result[etag] }
   }
 
   return null