Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/setModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,18 @@ async function compileModel(path) {
return exposed
}

compiled.services
.flatMap(srv => srv.endpoints.map(endpoint => ({ srv, endpoint })))
.map(({ srv, endpoint }) => {
const entities = _entities_in(srv)
compiled.services.forEach(srv => {
const entities = _entities_in(srv)
srv.exposedEntities = entities.map(e => srv.name + '.' + e)
srv.endpoints.forEach(endpoint => {
for (const e of entities) {
const path = endpoint.path + e.replace(/\./g, '_')
const def = compiled.definitions[srv.name + '.' + e]
def.endpoints ??= []
def.endpoints.push({ kind: endpoint.kind, path })
// Add fully qualified entity names to each service as 'exposedEntities'
}
})

for (const service of compiled.services) {
service.exposedEntities = _entities_in(service, compiled)
}
})

const endTime = Date.now()
const compileDuration = endTime - startTime
Expand Down
2 changes: 2 additions & 0 deletions tests/tools.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ test.describe('tools', () => {
assert.equal(result[0].name, 'AdminService', 'Should find Adminservice.Books service')
assert.equal(result[0].endpoints[0].kind, 'odata', 'Should contain odata endpoint kind')
assert.equal(result[0].endpoints[0].path, 'odata/v4/admin/', 'Should contain endpoint path')
assert(Array.isArray(result[0].exposedEntities), 'Should contain exposed entities')
assert.equal(result[0].exposedEntities[0], 'AdminService.Books', 'Should contain exposed entities')
})

test('search_cds_definitions: fuzzy search for Books entity', async () => {
Expand Down