@sap/cds 5.6.3 → 5.7.3

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

@@ -218,14 +218,6 @@ class ODataRequest extends cds.Request {
       }
     })
 
-    if (this._.req.performanceMeasurement) {
-      this.performanceMeasurement = this._.req.performanceMeasurement
-    }
-
-    if (this._.req.dynatrace) {
-      this.dynatrace = this._.req.dynatrace
-    }
-
     /*
      * req.isConcurrentResource
      */

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

@@ -89,7 +89,7 @@ const action = service => {
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
     cds.context = tx
 
-    let result, err, commit
+    let result, err
     try {
       result = await tx.dispatch(req)
 
@@ -107,13 +107,12 @@ const action = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else {
-        commit = true
         await tx.commit(result)
       }
     } catch (e) {
       err = e
-      if (!changeset && !commit) {
-        // ignore rollback error, which should never happen
+      if (!changeset) {
+        // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
         await tx.rollback(e).catch(() => {})
       } else if (changeset) {
         // for passing into rollback

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

@@ -32,11 +32,13 @@ const create = service => {
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
     cds.context = tx
 
-    let result, err, commit
+    let result, err
     try {
       result = await tx.dispatch(req)
 
-      if (!isReturnMinimal(req)) {
+      if (isReturnMinimal(req)) {
+        postProcessMinimal(req, result)
+      } else {
         // REVISIT: find better solution
         if (req._.readAfterWrite) {
           const dataInDb = await readAfterWrite(req, service)
@@ -44,15 +46,12 @@ const create = service => {
         }
 
         postProcess(req, odataRes, service, result)
-      } else {
-        postProcessMinimal(req, result)
       }
 
       if (changeset) {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else {
-        commit = true
         await tx.commit(result)
       }
 
@@ -61,8 +60,8 @@ const create = service => {
       }
     } catch (e) {
       err = e
-      if (!changeset && !commit) {
-        // ignore rollback error, which should never happen
+      if (!changeset) {
+        // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
         await tx.rollback(e).catch(() => {})
       } else if (changeset) {
         // for passing into rollback

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

@@ -28,7 +28,7 @@ const del = service => {
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
     cds.context = tx
 
-    let err, commit
+    let err
     try {
       await tx.dispatch(req)
       const result = null
@@ -37,13 +37,12 @@ const del = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else {
-        commit = true
         await tx.commit(result)
       }
     } catch (e) {
       err = e
-      if (!changeset && !commit) {
-        // ignore rollback error, which should never happen
+      if (!changeset) {
+        // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
         await tx.rollback(e).catch(() => {})
       } else if (changeset) {
         // for passing into rollback

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

@@ -1,4 +1,5 @@
 const cds = require('../../../../cds')
+const { isStandardError } = require('../../../../common/error/standardError')
 
 const { StatusCodes: HttpStatusCodes } = require('../okra/odata-commons/http/HttpStatusCode')
 
@@ -24,16 +25,6 @@ const ERROR_TO_HTTP_CODE = {
 
 const { normalizeError } = require('../../../../common/error/frontend')
 
-const _isStandardError = err => {
-  return (
-    err instanceof TypeError ||
-    err instanceof ReferenceError ||
-    err instanceof SyntaxError ||
-    err instanceof RangeError ||
-    err instanceof URIError
-  )
-}
-
 const _beautifyMessage = msg => (msg.endsWith('.') ? msg : msg + '.')
 
 const _buildRootCauseMessage = (message, rootCause) => {
@@ -79,7 +70,7 @@ const _betterOkraError = err => {
 const getErrorHandler = (crashOnError = true, srv) => {
   return (odataReq, odataRes, next, err) => {
     // REVISIT: crashOnError
-    if (_isStandardError(err) && crashOnError) {
+    if (isStandardError(err) && crashOnError) {
       err.__crashOnError = true
       throw err
     }

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

@@ -1,7 +1,10 @@
 const cds = require('../../../../cds')
+const LOG = cds.log('odata')
 
 const { toODataResult } = require('../utils/result')
 
+const { normalizeError } = require('../../../../common/error/frontend')
+
 let _mps
 
 const _get4Tenant = async (tenant, locale, service) => {
@@ -33,13 +36,14 @@ const _get4Toggles = async (tenant, locale, service, req) => {
  */
 const metadata = service => {
   return async (odataReq, odataRes, next) => {
-    try {
-      const req = odataReq.getIncomingRequest()
+    const req = odataReq.getIncomingRequest()
+
+    const tenant = req.user && req.user.tenant
 
-      const tenant = req.tenant
-      // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
-      const locale = odataRes.getContract().getLocale()
+    // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
+    const locale = odataRes.getContract().getLocale()
 
+    try {
       let edmx
 
       if (tenant) {
@@ -60,7 +64,13 @@ const metadata = service => {
 
       return next(null, toODataResult(edmx))
     } catch (e) {
-      return next(e)
+      if (LOG._error) {
+        e.message = 'Unable to get EDMX for tenant ' + tenant + ' due to error: ' + e.message
+        LOG.error(e)
+      }
+      // return 503 to client
+      const { error, statusCode } = normalizeError(Object.assign(e, { statusCode: 503 }), req)
+      return next(Object.assign(error, { statusCode }))
     }
   }
 }

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

@@ -1,7 +1,8 @@
 const cds = require('../../../../cds')
+
 const { SELECT } = cds.ql
+
 const ODataRequest = require('../ODataRequest')
-const { rewriteExpandAsterisk } = require('../../../../common/utils/rewriteAsterisks')
 
 const {
   QueryOptions,
@@ -13,15 +14,14 @@ const {
   }
 } = require('../okra/odata-server')
 
-const getError = require('../../../../common/error')
-const { getSapMessages } = require('../../../../common/error/frontend')
 const { isCustomOperation, skipToken } = require('../utils/request')
 const { actionAndFunctionQueries, getActionOrFunctionReturnType } = require('../utils/handlerUtils')
 const { validateResourcePath } = require('../utils/request')
 const { toODataResult, postProcess } = require('../utils/result')
 const { isStreaming, getStreamProperties } = require('../utils/stream')
 const { resolveStructuredName } = require('../utils/handlerUtils')
-const { ensureNoDraftsSuffix } = require('../../../../common/utils/draft')
+const getError = require('../../../../common/error')
+const { getSapMessages } = require('../../../../common/error/frontend')
 
 /**
  * Checks whether a bound function or function import is invoked.
@@ -32,6 +32,10 @@ const { ensureNoDraftsSuffix } = require('../../../../common/utils/draft')
  */
 const _isFunction = segments => [BOUND_FUNCTION, FUNCTION_IMPORT].includes(segments[segments.length - 1].getKind())
 
+const _selectOrExpandInQueryOptions = queryOptions => {
+  return queryOptions && (queryOptions.$select || queryOptions.$expand)
+}
+
 /**
  * Invoke a function.
  *
@@ -49,7 +53,12 @@ const _invokeFunction = async (tx, req, odataReq) => {
     tx.model.definitions
   )
 
-  if (functionReturnType && functionReturnType.kind === 'entity' && odataReq.getQueryOptions()) {
+  // if $select or $expand is present, do it
+  if (
+    functionReturnType &&
+    functionReturnType.kind === 'entity' &&
+    _selectOrExpandInQueryOptions(odataReq.getQueryOptions())
+  ) {
     await actionAndFunctionQueries(req, odataReq, result, tx, functionReturnType)
   }
 
@@ -283,13 +292,14 @@ const _readCollection = async (tx, req, odataReq) => {
  *
  * @param {object} tx
  * @param {object} req
- * @param {Array} segments
  * @returns {Promise}
  * @private
  */
-const _readStream = async (tx, req, segments) => {
+const _readStream = async (tx, req) => {
   req.query._streaming = true
 
+  const { contentType, contentDisposition } = await getStreamProperties(req, tx.model)
+
   let result = await tx.dispatch(req)
 
   // REVISIT: compat, should actually be treated as object
@@ -313,13 +323,12 @@ const _readStream = async (tx, req, segments) => {
     })
   }
 
-  const { contentType, contentDisposition } = await getStreamProperties(segments, tx, req)
-
   const headers = req._.odataReq.getHeaders()
+
   if (
+    contentType &&
     headers &&
     headers.accept &&
-    contentType &&
     !headers.accept.includes('*/*') &&
     !headers.accept.includes(contentType) &&
     !headers.accept.includes(contentType.split('/')[0] + '/*')
@@ -328,9 +337,9 @@ const _readStream = async (tx, req, segments) => {
   }
 
   if (contentType) streamObj['*@odata.mediaContentType'] = contentType
-  if (contentDisposition) {
+  if (contentDisposition)
     req._.odataRes.setHeader('Content-Disposition', `attachment; filename="${encodeURIComponent(contentDisposition)}"`)
-  }
+
   return streamObj
 }
 
@@ -368,10 +377,6 @@ const _readAndTransform = (tx, req, odataReq) => {
   }
 
   if (_isCollection(segments)) {
-    if (odataReq.getUriInfo().getQueryOption(QueryOptions.COUNT)) {
-      req.query.SELECT.count = true
-    }
-
     return _readCollection(tx, req, odataReq)
   }
 
@@ -384,11 +389,11 @@ const _readAndTransform = (tx, req, odataReq) => {
       }
     }
 
-    return _readStream(tx, req, segments)
+    return _readStream(tx, req)
   }
 
   if (isStreaming(segments)) {
-    return _readStream(tx, req, segments)
+    return _readStream(tx, req)
   }
 
   if (req.target._isSingleton) {
@@ -418,43 +423,6 @@ const _removeKeysForParams = result => {
   return options
 }
 
-const _getTarget = (ref, target, definitions) => {
-  if (cds.env.effective.odata.proxies) {
-    const target_ = target.elements[ref[0]]
-
-    if (ref.length === 1) {
-      return definitions[ensureNoDraftsSuffix(target_.target)]
-    }
-
-    return _getTarget(ref.slice(1), target_, definitions)
-  }
-
-  const target_ = target.elements[ref.join('_')]
-  return definitions[ensureNoDraftsSuffix(target_.target)]
-}
-
-const _getRestrictedExpand = (columns, target, definitions) => {
-  if (!columns || !target || columns === '*') return
-
-  const annotation = target['@Capabilities.ExpandRestrictions.NonExpandableProperties']
-  const restrictions = annotation && annotation.map(element => element['='])
-
-  rewriteExpandAsterisk(columns, target)
-
-  for (const col of columns) {
-    if (col.expand) {
-      if (restrictions && restrictions.length !== 0) {
-        const ref = col.ref.join('_')
-        const ref_ = restrictions.find(element => element.replace(/\./g, '_') === ref)
-        if (ref_) return ref_
-      }
-
-      const restricted = _getRestrictedExpand(col.expand, _getTarget(col.ref, target, definitions), definitions)
-      if (restricted) return restricted
-    }
-  }
-}
-
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -478,21 +446,11 @@ const read = service => {
       return next(e)
     }
 
-    // REVISIT: this should be in common/generic/auth.js with the rest of the access control stuff
-    const restricted = _getRestrictedExpand(
-      req.query.SELECT && req.query.SELECT.columns,
-      req.target,
-      service.model.definitions
-    )
-    if (restricted) {
-      return next(getError(400, 'EXPAND_IS_RESTRICTED', [restricted]))
-    }
-
     const changeset = odataReq.getAtomicityGroupId()
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
     cds.context = tx
 
-    let result, err, commit
+    let result, err
     let additional = {}
     try {
       // REVISIT: refactor _readAndTransform
@@ -509,13 +467,12 @@ const read = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else {
-        commit = true
         await tx.commit(result)
       }
     } catch (e) {
       err = e
-      if (!changeset && !commit) {
-        // ignore rollback error, which should never happen
+      if (!changeset) {
+        // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
         await tx.rollback(e).catch(() => {})
       } else if (changeset) {
         // for passing into rollback

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

@@ -2,8 +2,6 @@ const cds = require('../../../../cds')
 
 const { UNAUTHORIZED, FORBIDDEN, getRequiresAsArray } = require('../../../../common/utils/auth')
 
-const measurePerformance = require('../../perf/performance')
-
 module.exports = srv => {
   const requires = getRequiresAsArray(srv.definition)
 
@@ -55,11 +53,6 @@ module.exports = srv => {
       odataReq.setApplicationData({ req })
     }
 
-    // in case of batch request with sap-statistics=true also measure performance of batched requests
-    if (odataReq.getBatchApplicationData()) {
-      measurePerformance(req, res)
-    }
-
     next()
   }
 }

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

@@ -14,13 +14,6 @@ const { toODataResult, postProcess, postProcessMinimal } = require('../utils/res
 const { hasOmitValuesPreference } = require('../utils/omitValues')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
-/*
-const { isStreaming } = require('../utils/stream')
-const { findCsnTargetFor } = require('../../../../common/utils/csn')
-const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../../../fiori/utils/where')
-const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
-*/
-
 const _isUpsertAllowed = target => {
   return !(cds.env.runtime && cds.env.runtime.allow_upsert === false) && !(target && target._isDraftEnabled)
 }
@@ -121,58 +114,6 @@ const _readAfterWriteAndVirtuals = async (req, service, result) => {
 const _shouldReadPreviousResult = req =>
   req.event === 'UPDATE' && !isReturnMinimal(req) && hasOmitValuesPreference(req.headers.prefer, 'defaults')
 
-/*
-const _getEntity = (segments, model) => {
-  let entityName, namespace
-  const previous = segments[segments.length - 2]
-  if (previous.getKind() === 'ENTITY') {
-    entityName = previous.getEntitySet().getName()
-    namespace = previous.getEdmType().getFullQualifiedName().namespace
-  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
-    entityName = previous.getTarget().getName()
-    namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
-  }
-
-  if (entityName) {
-    return findCsnTargetFor(entityName, model, namespace)
-  }
-}
-
-const _getMediaType = entity => {
-  if (entity._hasPersistenceSkip) return
-
-  return Object.values(entity.elements).find(ele => ele['@Core.IsMediaType'])
-}
-
-const _getMediaTypeCQN = (mediaType, contentType, entity, req) => {
-  const where = req.query.UPDATE.entity.ref[0].where
-  const isActive = isActiveEntityRequested(where)
-  const data = {}
-  data[mediaType.name] = contentType
-  const cqn = UPDATE(entity).set(data)
-  cqn.UPDATE.where = removeIsActiveEntityRecursively(where)
-  if (!isActive) {
-    cqn.UPDATE.entity = ensureDraftsSuffix(entity.name)
-  }
-
-  return cqn
-}
-
-const _handleMediaType = async (odataReq, model, tx, req) => {
-  const segments = odataReq.getUriInfo().getPathSegments()
-  const contentType = odataReq._inRequest.headers['content-type']
-  if (isStreaming(segments) && contentType) {
-    const entity = _getEntity(segments, model)
-    if (entity && !entity['@cds.persistence.skip']) {
-      const mediaType = _getMediaType(entity)
-      if (mediaType) {
-        await tx.run(_getMediaTypeCQN(mediaType, contentType, entity, req))
-      }
-    }
-  }
-}
-*/
-
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -199,11 +140,8 @@ const update = service => {
     // putting a property?
     const primitive = odataReq.getUriInfo().getLastSegment().getKind() === 'PRIMITIVE.PROPERTY'
 
-    let result, err, commit
+    let result, err
     try {
-      // // REVISIT: should be handled somewhere else
-      // await _handleMediaType(odataReq, service.model, tx, req)
-
       let previousResult
       if (_shouldReadPreviousResult(req)) {
         previousResult = await _readAfterWriteAndVirtuals(req, service, result)
@@ -227,7 +165,6 @@ const update = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else {
-        commit = true
         await tx.commit(result)
       }
 
@@ -236,8 +173,8 @@ const update = service => {
       }
     } catch (e) {
       err = e
-      if (!changeset && !commit) {
-        // ignore rollback error, which should never happen
+      if (!changeset) {
+        // REVISIT: rollback needed if error occured before commit attempted -> how to distinguish?
         await tx.rollback(e).catch(() => {})
       } else if (changeset) {
         // for passing into rollback

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

@@ -64,7 +64,10 @@ class ExpressionToCQN {
     const nav =
       pathSegments.length > 2 ? pathSegments.slice(0, pathSegments.length - 2).map(this._segmentFromMember) : []
     const navName = this._segmentFromMember(pathSegments[pathSegments.length - 2])
-    const condition = this._segmentFromMember(pathSegments[pathSegments.length - 1])
+    let condition = this._segmentFromMember(pathSegments[pathSegments.length - 1])
+
+    // in case of functions, condition is an object
+    if (condition && !Array.isArray(condition)) condition = [condition]
 
     return pathSegments[pathSegments.length - 1].getKind() === 'ALL.EXPRESSION'
       ? ['not', 'exists', { ref: [...nav, { id: navName, where: ['not', { xpr: condition }] }] }]
@@ -84,6 +87,8 @@ class ExpressionToCQN {
       case ResourceKind.ALL_EXPRESSION:
       case ResourceKind.ANY_EXPRESSION:
         return segment.getExpression() ? this.parse(segment.getExpression()) : undefined
+      case ResourceKind.COUNT:
+        return '$count'
       default:
         throw getFeatureNotSupportedError(`Segment kind "${segment.getKind()}" in $filter query option`)
     }
@@ -95,6 +100,21 @@ class ExpressionToCQN {
     if (!segment) return []
 
     if (segment.getKind() === ResourceKind.NAVIGATION_TO_ONE) {
+      const name = this._segmentFromMember(segment)
+      const where =
+        nextSegments &&
+        nextSegments.length &&
+        nextSegments[nextSegments.length - 1].getKind() === ResourceKind.COUNT &&
+        segment.getKeyPredicates().reduce((prev, curr) => {
+          if (prev.length > 0) prev.push('and')
+          prev.push({ ref: [curr.getEdmRef().getName()] }, '=', { val: curr.getText() })
+          return prev
+        }, [])
+
+      return [where ? { id: name, where } : name, ...this._getMemberRecursively(nextSegments)]
+    }
+
+    if (segment.getKind() === ResourceKind.NAVIGATION_TO_MANY) {
       return [this._segmentFromMember(segment), ...this._getMemberRecursively(nextSegments)]
     }
 
@@ -102,6 +122,10 @@ class ExpressionToCQN {
       return [...this._getMemberRecursively(nextSegments)]
     }
 
+    if (segment.getKind() === ResourceKind.COUNT) {
+      return [this._segmentFromMember(segment), ...this._getMemberRecursively(nextSegments)]
+    }
+
     if (segment.getKind() === ResourceKind.COMPLEX_PROPERTY) {
       if (nextSegments.length) {
         return [this._segmentFromMember(segment), ...this._getMemberRecursively(nextSegments)]
@@ -130,6 +154,10 @@ class ExpressionToCQN {
         return entry
       }
     }
+    if (members.length > 1 && members[members.length - 1] === '$count') {
+      return { func: 'count', args: [{ ref: members.slice(0, members.length - 1) }], as: '$count' }
+    }
+
     return { ref: members }
   }
 

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

@@ -12,6 +12,8 @@ const ExpressionToCQN = require('./ExpressionToCQN')
 const { getColumns } = require('../../../services/utils/columns')
 const { addLimit, isSameArray } = require('./utils')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
+const getError = require('../../../../common/error')
+
 /**
  * Check which element(s) of the entity has been expanded.
  *
@@ -28,7 +30,11 @@ const _getExpandItem = (isAll, expandItems, name) => {
 
   return expandItems.find(item => {
     const pathSegments = item.getPathSegments()
-    return pathSegments[pathSegments.length - 1].getNavigationProperty().getName() === name
+    if (pathSegments[pathSegments.length - 1].getKind() === 'COUNT') {
+      throw getError(501, 'EXPAND_COUNT_UNSUPPORTED')
+    }
+    const navigation = pathSegments[pathSegments.length - 1].getNavigationProperty()
+    return navigation && navigation.getName() === name
   })
 }
 

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

@@ -14,7 +14,7 @@ const { _expand } = require('../utils/handlerUtils')
 const { resolveStructuredName } = require('../utils/handlerUtils')
 const { isStreaming } = require('../utils/stream')
 const { convertUrlPathToCqn, getAllKeys } = require('./utils')
-const { getMaxPageSize } = require('../../../../common/utils/page')
+const { getMaxPageSize, getDefaultPageSize } = require('../../../../common/utils/page')
 const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 
 const {
@@ -137,11 +137,11 @@ const _apply = (uriInfo, queryOptions, entity, model) => {
   return {}
 }
 
-const _topSkip = (queryOptions, maxPageSize, cqn) => {
+const _topSkip = (queryOptions, target, cqn) => {
   if (queryOptions && (queryOptions.$top || queryOptions.$skip || queryOptions.$skiptoken)) {
-    const top = queryOptions.$top ? parseInt(queryOptions.$top) : Number.MAX_SAFE_INTEGER
+    const top = queryOptions.$top ? parseInt(queryOptions.$top) : getDefaultPageSize(target)
     const skip = parseInt(queryOptions.$skip || 0) + parseInt(queryOptions.$skiptoken || 0)
-    cqn.limit(Math.min(top, maxPageSize), skip)
+    cqn.limit(Math.min(top, getMaxPageSize(target)), skip)
   }
 }
 
@@ -184,6 +184,7 @@ const _extendCqnWithApply = (cqn, apply, entity) => {
 
   // REVISIT only execute on HANA?
   cqn.SELECT.columns = _groupByPathExpressionsToExpand(cqn, entity)
+  if (cqn.SELECT.count) cqn.SELECT.__countAggregated = true
 }
 
 const _containsSelectedColumn = (o, selectColumns) => {
@@ -340,6 +341,7 @@ const _handleApply = (apply, select) => {
  * @param {object} odataReq - OKRA's req
  * @private
  */
+// eslint-disable-next-line complexity
 const readToCQN = (service, target, odataReq) => {
   const uriInfo = odataReq.getUriInfo()
   const segments = uriInfo.getPathSegments()
@@ -390,6 +392,8 @@ const readToCQN = (service, target, odataReq) => {
   const cqn = SELECT.from(isView ? _convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
   addValidationQueryIfRequired(segments, isView, cqn, service, kind)
 
+  if (isCollectionOrToMany && queryOptions && queryOptions[QueryOptions.COUNT]) cqn.SELECT.count = true
+
   if (Object.keys(apply).length) {
     _extendCqnWithApply(cqn, apply, entity)
   }
@@ -400,7 +404,7 @@ const readToCQN = (service, target, odataReq) => {
   }
 
   if (isCollectionOrToMany) {
-    _topSkip(queryOptions, getMaxPageSize(target), cqn)
+    _topSkip(queryOptions, target, cqn)
     _orderby(uriInfo, cqn)
   }
 

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

@@ -55,13 +55,13 @@ const convertUrlPathToCqn = (segments, service) => {
         const entity = segment.getEntitySet().getEntityType().getFullQualifiedName()
         const keys = convertKeyPredicatesToStringExpr(segment.getKeyPredicates())
 
-        return `${findCsnTargetFor(entity.name, service.model, service.name).name}${keys}`
+        return `${findCsnTargetFor(entity.name, service.model, service.namespace).name}${keys}`
       }
 
       if (segment.getKind() === 'SINGLETON') {
         const singleton = segment.getSingleton().getEntityType().getFullQualifiedName()
 
-        return `${findCsnTargetFor(singleton.name, service.model, service.name).name}`
+        return `${findCsnTargetFor(singleton.name, service.model, service.namespace).name}`
       }
 
       if (segment.getKind() === 'COMPLEX.PROPERTY') {