EXPERIMENT: undo changes for GetAllLogsUseCase

Author: NarrowsProjects

lib/usecases/log/GetAllLogsUseCase.js

@@ -30,7 +30,6 @@ const { Op } = require('sequelize');
 const { dataSource } = require('../../database/DataSource.js');
 const { checkForFilterExclusion } = require('../common/checkForFilterExclusion.js');
 const { setTimeRangeQuery } = require('../../utilities/setTimeRangeQuery.js');
-const { logSummary } = require('../../server/views/logs/summary.js');
 
 /**
  * Apply the given filter on the given query builder
@@ -220,14 +219,18 @@ class GetAllLogsUseCase {
      * @returns {Promise} Promise object represents the result of this use case.
      */
     async execute(dto = {}) {
-        const queryBuilder = dataSource.createQueryBuilder();
+        const queryBuilder = dataSource.createQueryBuilder(true);
         const { query = {} } = dto;
         const { filter, sort = { id: 'desc' }, page = {} } = query;
 
-        queryBuilder.selectAttributes([...logSummary.attributes]);
-        queryBuilder.includeAll([...logSummary.include]);
-
         const { count, rows } = await dataSource.transaction(async () => {
+            queryBuilder.include('user')
+                .include('tags')
+                .include({ association: 'runs', attributes: ['id', 'runNumber'] })
+                .include({ association: 'lhcFills', attributes: ['fillNumber'] })
+                .include('attachments')
+                .include({ association: 'environments', attributes: ['id'] });
+
             if (filter) {
                 await applyFilter(dataSource, queryBuilder, filter);
             }
@@ -253,7 +256,7 @@ class GetAllLogsUseCase {
 
         return {
             count,
-            logs: rowsWithReplies.map(logAdapter.toSummary),
+            logs: rowsWithReplies.map(logAdapter.toEntity),
         };
     }
 }