Skip to content

Regression: Fix defaultFields for null values #18360

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

Merged
sampaiodiego merged 2 commits into from
Jul 24, 2020
Merged

Regression: Fix defaultFields for null values #18360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e73b7cb
fix defaultFields for null values
sampaiodiego Jul 23, 2020
3b86112
Add missing return
sampaiodiego Jul 24, 2020
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
35 changes: 24 additions & 11 deletions app/models/server/models/_BaseDb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,35 +125,48 @@ export class BaseDb extends EventEmitter {
}

_ensureDefaultFields(options) {
if ((options?.fields == null || Object.keys(options?.fields).length === 0) && this.baseModel.defaultFields) {
options.fields = this.baseModel.defaultFields;
if (!this.baseModel.defaultFields) {
return options;
}

if (!options) {
return { fields: this.baseModel.defaultFields };
}

if (options.fields != null && Object.keys(options.fields).length > 0) {
return options;
}

return {
...options,
fields: this.baseModel.defaultFields,
};
}

_doNotMixInclusionAndExclusionFields(options) {
this._ensureDefaultFields(options);
const optionsDef = this._ensureDefaultFields(options);

if (options && options.fields) {
const keys = Object.keys(options.fields);
const removeKeys = keys.filter((key) => options.fields[key] === 0);
if (optionsDef && optionsDef.fields) {
const keys = Object.keys(optionsDef.fields);
const removeKeys = keys.filter((key) => optionsDef.fields[key] === 0);
if (keys.length > removeKeys.length) {
removeKeys.forEach((key) => delete options.fields[key]);
removeKeys.forEach((key) => delete optionsDef.fields[key]);
}
}
}

find(query = {}, options = {}) {
this._doNotMixInclusionAndExclusionFields(options);
return this.model.find(query, options);
const optionsDef = this._doNotMixInclusionAndExclusionFields(options);
return this.model.find(query, optionsDef);
}

findById(_id, options) {
return this.find({ _id }, options);
}

findOne(query = {}, options = {}) {
this._doNotMixInclusionAndExclusionFields(options);
return this.model.findOne(query, options);
const optionsDef = this._doNotMixInclusionAndExclusionFields(options);
return this.model.findOne(query, optionsDef);
}

findOneById(_id, options) {
Expand Down
27 changes: 21 additions & 6 deletions app/models/server/raw/BaseRaw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,42 @@ export class BaseRaw {
}

_ensureDefaultFields(options) {
if ((options?.fields == null || Object.keys(options?.fields).length === 0) && this.defaultFields) {
options.fields = this.defaultFields;
if (!this.defaultFields) {
return options;
}

if (!options) {
return { projection: this.defaultFields };
}

// TODO: change all places using "fields" for raw models and remove the additional condition here
if ((options.projection != null && Object.keys(options.projection).length > 0)
|| (options.fields != null && Object.keys(options.fields).length > 0)) {
return options;
}

return {
...options,
projection: this.defaultFields,
};
}

findOneById(_id, options = {}) {
return this.findOne({ _id }, options);
}

findOne(query = {}, options = {}) {
this._ensureDefaultFields(options);
return this.col.findOne(query, options);
const optionsDef = this._ensureDefaultFields(options);
return this.col.findOne(query, optionsDef);
}

findUsersInRoles() {
throw new Error('overwrite-function', 'You must overwrite this function in the extended classes');
}

find(query = {}, options = {}) {
this._ensureDefaultFields(options);
return this.col.find(query, options);
const optionsDef = this._ensureDefaultFields(options);
return this.col.find(query, optionsDef);
}

update(...args) {
Expand Down