Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Wrong subselect being generated #116

Closed
wants to merge 2 commits into from
Closed

Fix: Wrong subselect being generated #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe8868
Update utils.js
schiwekM Oct 1, 2024
d7c6eaa
Fixed issue
schiwekM Oct 17, 2024
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
23 changes: 19 additions & 4 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const _keyColumns = (keys, alias) => {

const _alias = entity => entity.name.replace(`${entity._service.name}.`, '').replace('.', '_')

const _buildSubSelect = (model, { entity, relative, element, next }, row, previousCqn) => {
const _buildSubSelect = (model, { entity, relative, element, next }, row, dataSubjectEntity, previousCqn) => {
// relative is a parent or an entity itself

const keys = Object.values(entity.keys)
Expand All @@ -118,6 +118,21 @@ const _buildSubSelect = (model, { entity, relative, element, next }, row, previo

const childCqn = SELECT.from({ ref: [entityName], as }).columns(_keyColumns(keys, as))

//To avoid to much nesting check if data subject + entity have a property annotated as DataSubjectID, use that as on condition
if (
Object.keys(dataSubjectEntity.elements).some(k => dataSubjectEntity.elements[k]['@PersonalData.FieldSemantics'] === 'DataSubjectID' && !dataSubjectEntity.elements[k].is2one && !dataSubjectEntity.elements[k].is2many) &&
Object.keys(entity.elements).some(k => entity.elements[k]['@PersonalData.FieldSemantics'] === 'DataSubjectID' && !entity.elements[k].is2one && !entity.elements[k].is2many)
) {
const propDSE = Object.keys(dataSubjectEntity.elements).find(k => dataSubjectEntity.elements[k]['@PersonalData.FieldSemantics'] === 'DataSubjectID' && !dataSubjectEntity.elements[k].is2one && !dataSubjectEntity.elements[k].is2many)
const propE = Object.keys(entity.elements).find(k => entity.elements[k]['@PersonalData.FieldSemantics'] === 'DataSubjectID' && !entity.elements[k].is2one && !entity.elements[k].is2many)
const alisDSE = _alias(dataSubjectEntity);
childCqn.where([
{ref: [alisDSE, propDSE]},
'=',
{ref: [as, propE]},
].concat('and').concat(_addKeysToWhere(keys, row, as)))
return childCqn
}
const targetAlias = _alias(element._target)
const relativeAlias = _alias(relative)

Expand All @@ -126,7 +141,7 @@ const _buildSubSelect = (model, { entity, relative, element, next }, row, previo
if (previousCqn) childCqn.where('exists', previousCqn)
else childCqn.where(_addKeysToWhere(keys, row, as))

if (next) return _buildSubSelect(model, next, {}, childCqn)
if (next) return _buildSubSelect(model, next, {}, dataSubjectEntity, childCqn)

return childCqn
}
Expand All @@ -138,10 +153,10 @@ const _getDataSubjectIdQuery = ({ dataSubjectEntity, subs }, row, model) => {
const cqn = SELECT.one
.from({ ref: [dataSubjectEntity.name], as })
.columns(_keyColumns(keys, as))
.where(['exists', _buildSubSelect(model, subs[0], row)])
.where(['exists', _buildSubSelect(model, subs[0], row, dataSubjectEntity)])

// entity reused in different branches => must check all
for (let i = 1; i < subs.length; i++) cqn.or(['exists', _buildSubSelect(model, subs[i], row)])
for (let i = 1; i < subs.length; i++) cqn.or(['exists', _buildSubSelect(model, subs[i], row, dataSubjectEntity)])

return cqn
}
Expand Down
Loading