EXPERIMENT: undo changes for GetAllLogsUseCase

Author: NarrowsProjects

lib/database/repositories/Repository.js

@@ -13,6 +13,7 @@
 
 const { dataSource } = require('../DataSource.js');
 const { QueryBuilder } = require('../utilities/QueryBuilder.js');
+const { OldQueryBuilder } = require('../utilities/OldQueryBuilder.js');
 
 /**
  * Sequelize implementation of the Repository.
@@ -39,8 +40,8 @@ class Repository {
             findQuery.selectOnly();
         }
 
-        if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.count(findQuery);
@@ -53,7 +54,9 @@ class Repository {
      * @returns {Promise<array>} Promise object representing the full mock data
      */
     async findAll(findQuery = {}) {
-        return this.model.findAll(findQuery instanceof QueryBuilder ? findQuery.toImplementation() : findQuery);
+        return this.model.findAll(findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder
+            ? findQuery.toImplementation(this.model)
+            : findQuery);
     }
 
     /**
@@ -67,9 +70,9 @@ class Repository {
             findQuery = dataSource.createQueryBuilder();
         }
 
-        if (findQuery instanceof QueryBuilder) {
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
             findQuery.set('distinct', true);
-            findQuery = findQuery.toImplementation();
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.findAndCountAll(findQuery);
@@ -82,8 +85,8 @@ class Repository {
      * @returns {Promise<Object|null>} Promise object representing the full mock data
      */
     async findOne(findQuery = {}) {
-        if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
+            findQuery = findQuery.toImplementation(this.model);
         }
         findQuery.limit = 1;
         return this.model.findOne(findQuery);
@@ -132,8 +135,8 @@ class Repository {
      * @returns {Promise<*[]>} promise with list of removed entities
      */
     async removeAll(findQuery) {
-        if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         const entities = await this.findAll(findQuery);
@@ -151,8 +154,8 @@ class Repository {
      * @returns {Promise|Null} Promise object representing the full mock data
      */
     async removeOne(findQuery) {
-        if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
+            findQuery = findQuery.toImplementation(this.model);
         }
         findQuery.limit = 1;
 
@@ -183,8 +186,8 @@ class Repository {
      * @return {Promise<void>} promise that resolves when the patch has been applied
      */
     async updateAll(patch, findQuery) {
-        if (findQuery instanceof QueryBuilder) {
-            findQuery = findQuery.toImplementation();
+        if (findQuery instanceof QueryBuilder || findQuery instanceof OldQueryBuilder) {
+            findQuery = findQuery.toImplementation(this.model);
         }
 
         return this.model.update(patch, findQuery);

lib/database/utilities/OldQueryBuilder.js

@@ -12,7 +12,6 @@
  */
 
 const { Op } = require('sequelize');
-const { QueryBuilder } = require('./QueryBuilder');
 
 /**
  * Sequelize implementation of the WhereQueryBuilder.
@@ -429,13 +428,12 @@ class WhereAssociationQueryBuilder extends WhereQueryBuilder {
 /**
  * Sequelize implementation of the QueryBuilder.
  */
-class OldQueryBuilder extends QueryBuilder {
+class OldQueryBuilder {
     /**
      * Creates a new `QueryBuilder` instance.
      * @param {Sequelize} sequelize the sequelize implementation
      */
     constructor(sequelize) {
-        super(sequelize);
         this._sequelize = sequelize;
         this.options = { where: {}, replacements: {} };
     }

lib/database/utilities/index.js

@@ -11,6 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
+const { OldQueryBuilder: BaseOldQueryBuilder } = require('./OldQueryBuilder');
 const { QueryBuilder: BaseQueryBuilder } = require('./QueryBuilder');
 const TransactionHelper = require('./TransactionHelper');
 
@@ -28,8 +29,22 @@ module.exports = (sequelize) => {
         }
     }
 
+    /**
+     * For compatibility, provide a class to instantiate from here
+     * @deprecated use createQueryBuilder instead
+     */
+    class OldQueryBuilder extends BaseOldQueryBuilder {
+        /**
+         * Constructor
+         */
+        constructor() {
+            super(sequelize);
+        }
+    }
+
     return {
         QueryBuilder,
+        OldQueryBuilder,
 
         /**
          * @deprecated use datasource instead

lib/usecases/run/GetAllRunsUseCase.js

@@ -11,7 +11,7 @@
  * or submit itself to any jurisdiction.
  */
 
-const { repositories: { RunRepository }, utilities: { QueryBuilder } } = require('../../database');
+const { repositories: { RunRepository }, utilities: { QueryBuilder, OldQueryBuilder } } = require('../../database');
 
 const { runAdapter } = require('../../database/adapters/index.js');
 const { ApiConfig } = require('../../config/index.js');
@@ -39,7 +39,7 @@ class GetAllRunsUseCase {
      * @return {Promise} Promise object represents the result of this use case.
      */
     async execute(dto = {}) {
-        const filteringQueryBuilder = new QueryBuilder();
+        const filteringQueryBuilder = new OldQueryBuilder();
         const { query = {} } = dto;
         const { filter, page = {}, sort = { runNumber: 'desc' }, include: { effectiveQcFlags = false } = {} } = query;
 
@@ -242,6 +242,7 @@ class GetAllRunsUseCase {
                     fn('coalesce', col('time_trg_start'), col('time_o2_start')),
                     fn('coalesce', fn('coalesce', col('time_trg_end'), col('time_o2_end')), fn('now')),
                 );
+
                 // Duration limit is handled in milliseconds by the API, but the query works on microseconds
                 filteringQueryBuilder.where(computedColumn).applyOperator(operator, durationLimit * 1000);
             }