diff --git a/app/src/db/models/tables/objectModel.js b/app/src/db/models/tables/objectModel.js index 86dd0f35..3a9bb5a4 100644 --- a/app/src/db/models/tables/objectModel.js +++ b/app/src/db/models/tables/objectModel.js @@ -100,17 +100,18 @@ class ObjectModel extends Timestamps(Model) { query.withGraphJoined('version'); if (value) { + // join on version where isLatest = true query.modifyGraph('version', builder => { builder .select('version.*') .where('version.isLatest', value); }); } else { - // TODO: Consider modifying graph to join on all versions except latest + // join on ALL versions where isLatest = false const subquery = Version.query() .select('version.id') - .where('version.isLatest', true); - query.whereNotIn('version.id', builder => { + .where('version.isLatest', false); + query.whereIn('version.id', builder => { builder.intersect(subquery); }); }