[ORCT-162] provide number of existing related data for simulation passes views

app/lib/database/adapters/SimulationPassAdapter.js

@@ -28,7 +28,9 @@ class SimulationPassAdapter {
             PWG,
             requestedEvents,
             outputSize,
-        } = databaseObject;
+            dataPassesCount,
+            runsCount,
+        } = databaseObject.dataValues;
 
         return {
             id,
@@ -38,6 +40,8 @@ class SimulationPassAdapter {
             PWG,
             requestedEvents,
             outputSize,
+            dataPassesCount: Number(dataPassesCount),
+            runsCount: Number(runsCount),
         };
     }
 

app/lib/services/simulationPasses/SimulationPassService.js

@@ -18,22 +18,65 @@ const {
         },
         models: {
             Period,
+            Run,
             DataPass,
         },
     },
 } = require('../../database/DatabaseManager');
 const { simulationPassAdapter } = require('../../database/adapters');
 const { QueryBuilder } = require('../../database/utilities');
 
+const { Sequelize } = require('sequelize');
+const { deepmerge } = require('../../utils');
+
+const additionalFields = [
+    [Sequelize.fn('count', Sequelize.fn('DISTINCT', Sequelize.col('Runs.run_number'))), 'runsCount'],
+    [Sequelize.fn('count', Sequelize.fn('DISTINCT', Sequelize.col('DataPasses.id'))), 'dataPassesCount'],
+];
+
+const commonGroupClause = ['SimulationPass.id'];
+
+const commonClause = {
+    include: [
+        {
+            model: Run,
+            required: false,
+            attributes: [],
+            through: {
+                attributes: [],
+            },
+        },
+        {
+            model: DataPass,
+            required: false,
+            attributes: [],
+            through: {
+                attributes: [],
+            },
+        },
+    ],
+
+    attributes: {
+        include: additionalFields,
+    },
+
+    group: commonGroupClause,
+    subQuery: false,
+};
+
 class SimulationPassService {
     /**
      * Return all simulation passes,
      * @param {Object} query -  Filtering query definiton from http request
      * @returns {Promise<SimulationPass[]>} Promise object represents the result of this use case.
      */
     async getAll(query) {
-        const { count, rows } = await SimulationPassRepository.findAndCountAll(new QueryBuilder().addFromHttpRequestQuery(query));
-        return { count, rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)) };
+        const baseClause = commonClause;
+        const { count, rows } = await SimulationPassRepository.findAndCountAll(new QueryBuilder(baseClause).addFromHttpRequestQuery(query));
+        return {
+            count: count.length,
+            rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)),
+        };
     }
 
     /**
@@ -43,23 +86,28 @@ class SimulationPassService {
      * @returns {Promise<SimulationPass[]>} Promise object represents the result of this use case.
      */
     async getSimulationPassesPerPeriod(periodId, query) {
-        const baseClause = {
-            include: [
-                {
-                    model: Period,
-                    required: true,
-                    attributes: [],
-                    through: {
+        const baseClause = deepmerge(commonClause,
+            {
+                include: [
+                    {
+                        model: Period,
+                        required: true,
+                        attributes: [],
                         where: {
-                            period_id: periodId,
+                            id: periodId,
+                        },
+                        through: {
+                            attributes: [],
                         },
                     },
-                },
-            ],
-        };
+                ],
+            });
 
         const { count, rows } = await SimulationPassRepository.findAndCountAll(new QueryBuilder(baseClause).addFromHttpRequestQuery(query));
-        return { count, rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)) };
+        return {
+            count: count.length,
+            rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)),
+        };
     }
 
     /**
@@ -70,22 +118,36 @@ class SimulationPassService {
      */
     async getAnchorageForDataPass(dataPassId, query) {
         const baseClause = {
-            include: [
-                {
-                    model: DataPass,
-                    required: true,
-                    attributes: [],
-                    through: {
+            ...commonClause,
+            ...{
+                include: [
+                    {
+                        model: Run,
+                        required: false,
+                        attributes: [],
+                        through: {
+                            attributes: [],
+                        },
+                    },
+                    {
+                        model: DataPass,
+                        required: true,
+                        attributes: [],
                         where: {
-                            data_pass_id: dataPassId,
+                            id: dataPassId,
+                        },
+                        through: {
+                            attributes: [],
                         },
                     },
-                },
-            ],
+                ] },
         };
 
         const { count, rows } = await SimulationPassRepository.findAndCountAll(new QueryBuilder(baseClause).addFromHttpRequestQuery(query));
-        return { count, rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)) };
+        return {
+            count: count.length,
+            rows: rows.map((simulationPass) => simulationPassAdapter.toEntity(simulationPass)),
+        };
     }
 }