Use isLatest db value in object search query

bcgov · Oct 16, 2023 · bfd2286 · bfd2286
1 parent ded5cee
commit bfd2286
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/app/src/db/models/tables/objectModel.js b/app/src/db/models/tables/objectModel.js
@@ -103,21 +103,13 @@ class ObjectModel extends Timestamps(Model) {
             query.modifyGraph('version', builder => {
               builder
                 .select('version.*')
-                .distinctOn('version.objectId')
-                .orderBy([
-                  { column: 'version.objectId' },
-                  { column: 'version.createdAt', order: 'desc' }
-                ]);
+                .where('version.isLatest', value);
             });
           } else {
             // TODO: Consider modifying graph to join on all versions except latest
             const subquery = Version.query()
               .select('version.id')
-              .distinctOn('objectId')
-              .orderBy([
-                { column: 'objectId' },
-                { column: 'version.createdAt', order: 'desc' }
-              ]);
+              .where('version.isLatest', true);
             query.whereNotIn('version.id', builder => {
               builder.intersect(subquery);
             });