Improved atVersion.supportedByAutomation field handling

client/components/AddTestToQueueWithConfirmation/index.jsx

@@ -66,7 +66,13 @@ function AddTestToQueueWithConfirmation({
   );
 
   const existingTestPlanReports =
-    existingTestPlanReportsData?.existingTestPlanVersion?.testPlanReports;
+    existingTestPlanReportsData?.existingTestPlanVersion?.testPlanReports.filter(
+      tpr =>
+        tpr.at?.id === at?.id &&
+        tpr.browser?.id === browser?.id &&
+        tpr.minimumAtVersion?.id === minimumAtVersion?.id &&
+        tpr.exactAtVersion?.id === exactAtVersion?.id
+    );
 
   let latestOldVersion;
   let oldReportToCopyResultsFrom;

server/models/AtVersion.js

@@ -1,7 +1,3 @@
-const {
-  AT_VERSIONS_SUPPORTED_BY_COLLECTION_JOBS
-} = require('../util/constants');
-
 const MODEL_NAME = 'AtVersion';
 
 module.exports = function (sequelize, DataTypes) {
@@ -32,10 +28,7 @@ module.exports = function (sequelize, DataTypes) {
         defaultValue: new Date()
       },
       supportedByAutomation: {
-        type: DataTypes.VIRTUAL,
-        get() {
-          return Model.isSupportedByAutomation(this.atId, this.name);
-        }
+        type: DataTypes.VIRTUAL
       }
     },
     {
@@ -56,14 +49,5 @@ module.exports = function (sequelize, DataTypes) {
     });
   };
 
-  Model.isSupportedByAutomation = async function (atId, versionName) {
-    const At = sequelize.models.At;
-    const at = await At.findByPk(atId);
-    if (!at) return false;
-    const supportedVersions =
-      AT_VERSIONS_SUPPORTED_BY_COLLECTION_JOBS[at.name] || [];
-    return supportedVersions.includes(versionName);
-  };
-
   return Model;
 };

server/resolvers/AtVersion/index.js

@@ -0,0 +1,7 @@
+const supportedByAutomation = require('./supportedByAutomationResolver');
+
+const AtVersion = {
+  supportedByAutomation
+};
+
+module.exports = AtVersion;

server/resolvers/AtVersion/supportedByAutomationResolver.js

@@ -0,0 +1,16 @@
+const { getAtVersionById } = require('../../models/services/AtService');
+const {
+  isSupportedByAutomation
+} = require('../../util/isSupportedByAutomation');
+
+const supportedByAutomationResolver = async (parent, _, { transaction }) => {
+  const atVersion = await getAtVersionById({
+    id: parent.id,
+    transaction
+  });
+  return isSupportedByAutomation(atVersion.at.id, atVersion.name, {
+    transaction
+  });
+};
+
+module.exports = supportedByAutomationResolver;

server/resolvers/index.js

@@ -45,6 +45,7 @@ const CollectionJob = require('./CollectionJob');
 const TestPlanRun = require('./TestPlanRun');
 const Test = require('./Test');
 const ScenarioResult = require('./ScenarioResult');
+const AtVersion = require('./AtVersion');
 
 const resolvers = {
   Query: {
@@ -97,7 +98,8 @@ const resolvers = {
   TestPlanRunOperations,
   TestResultOperations,
   TestPlanVersionOperations,
-  CollectionJobOperations
+  CollectionJobOperations,
+  AtVersion
 };
 
 module.exports = resolvers;

server/util/getAtVersionWithRequirements.js

@@ -18,13 +18,11 @@ const getAtVersionWithRequirements = async (
       );
     }
 
-    const isMinimumVersionSupported =
-      await minimumAtVersion.supportedByAutomation;
-    if (isMinimumVersionSupported) {
+    if (minimumAtVersion.supportedByAutomation) {
       return minimumAtVersion;
     }
 
-    const matchingAts = await getAtVersions({
+    const matchingAtVersions = await getAtVersions({
       where: {
         atId,
         releasedAt: { [Op.gte]: minimumAtVersion.releasedAt }
@@ -35,23 +33,20 @@ const getAtVersionWithRequirements = async (
       transaction
     });
 
-    const supportedAts = await Promise.all(
-      matchingAts.map(async version => {
-        const supportedByAutomation = await version.supportedByAutomation;
-        return supportedByAutomation ? version.toJSON() : null;
-      })
-    );
-
-    const latestSupportedAt = supportedAts.find(Boolean);
+    const latestSupportedAtVersion = matchingAtVersions.find(async atv => {
+      // supportedByAutomation is a computed graphql field,
+      // so we need to compute directly here
+      return atv.supportedByAutomation;
+    });
 
-    if (!latestSupportedAt) {
+    if (!latestSupportedAtVersion) {
       throw new Error(
         `No suitable AT version found for automation for AT ${atId} ` +
           `with minimumAtVersion ${minimumAtVersion?.name}`
       );
     }
 
-    return latestSupportedAt;
+    return latestSupportedAtVersion;
   } catch (error) {
     console.error('Error while determining AT version:', error);
     throw error;

server/util/isSupportedByAutomation.js

@@ -0,0 +1,30 @@
+const AtLoader = require('../models/loaders/AtLoader');
+const { AT_VERSIONS_SUPPORTED_BY_COLLECTION_JOBS } = require('./constants');
+
+let atIdToNameCache = {};
+
+const isSupportedByAutomation = async function (
+  atId,
+  versionName,
+  { transaction }
+) {
+  if (Object.keys(atIdToNameCache).length === 0) {
+    const ats = await AtLoader().getAll({ transaction });
+    for (const at of ats) {
+      atIdToNameCache[at.id] = at.name;
+    }
+  }
+  const atName = atIdToNameCache[atId];
+  if (!atName) {
+    console.warn(
+      `Attempt to check if ${versionName} is supported by automation for unknown AT ${atId}`
+    );
+    return false;
+  }
+  const supportedVersions =
+    AT_VERSIONS_SUPPORTED_BY_COLLECTION_JOBS[atName] || [];
+  const isSupported = supportedVersions.includes(versionName);
+  return isSupported;
+};
+
+module.exports = { isSupportedByAutomation };