EXPERIMENT: undo changes for getAllEnvironments

Author: NarrowsProjects

lib/database/utilities/OldQueryBuilder.js

@@ -635,4 +635,4 @@ class OldQueryBuilder extends QueryBuilder {
     }
 }
 
-exports.OldQueryBuilder = OldQueryBuilder;
+exports.OldQueryBuilder = OldQueryBuilder;

lib/usecases/environment/GetAllEnvironmentsUseCase.js

@@ -24,7 +24,6 @@ const { statusAcronyms } = require('../../domain/enums/StatusAcronyms.js');
 const { unpackNumberRange } = require('../../utilities/rangeUtils.js');
 const { splitStringToStringsTrimmed } = require('../../utilities/stringUtils.js');
 const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
-const { environmentSummary } = require('../../server/views/environments/summary.js');
 
 /**
  * Subquery to select the latest history item for each environment.
@@ -71,7 +70,10 @@ class GetAllEnvironmentsUseCase {
         const { filter, page = {} } = query;
         const { limit = ApiConfig.pagination.limit, offset = 0 } = page;
 
-        const queryBuilder = dataSource.createQueryBuilder().orderBy('updatedAt', 'desc').limit(limit).offset(offset);
+        const queryBuilder = dataSource.createQueryBuilder(true)
+            .orderBy('updatedAt', 'desc')
+            .limit(limit)
+            .offset(offset);
 
         if (filter) {
             const {
@@ -189,13 +191,12 @@ class GetAllEnvironmentsUseCase {
             }
         }
 
-        queryBuilder.selectAttributes([...environmentSummary.attributes]);
-        queryBuilder.includeAll([...environmentSummary.include]);
-        queryBuilder.pushOrders([...environmentSummary.order]);
+        queryBuilder.include({ association: 'runs' });
+        queryBuilder.include({ association: 'historyItems' });
         const { count, rows } = await EnvironmentRepository.findAndCountAll(queryBuilder);
         return {
             count,
-            environments: rows.map((environment) => environmentAdapter.toSummary(environment)),
+            environments: rows.map((environment) => environmentAdapter.toEntity(environment)),
         };
     }
 }