diff --git a/lib/www/server/lib/db/qc/definitions/get.js b/lib/www/server/lib/db/qc/definitions/get.js index bc99b92..2d1df79 100644 --- a/lib/www/server/lib/db/qc/definitions/get.js +++ b/lib/www/server/lib/db/qc/definitions/get.js @@ -1,11 +1,11 @@ const fs = require('fs'); const YAML = require('yaml'); const flattenQCDefinitions = require('../../../utils/flattenQCDefinitions'); -const configuration = require('../../configuration'); // lib/db/configuration +const project = require('../../project'); // lib/db/project async function get (projectId, opts = {}) { - const qcConfig = await configuration.get(projectId, "qc"); + const qcConfig = (await project.configuration.get(projectId))?.qc; if (qcConfig?.definitions) { try { const definitions = YAML.parse(fs.readFileSync(qcConfig.definitions).toString()); diff --git a/lib/www/server/lib/qc/index.js b/lib/www/server/lib/qc/index.js index 54a9e60..6ec90c7 100755 --- a/lib/www/server/lib/qc/index.js +++ b/lib/www/server/lib/qc/index.js @@ -42,7 +42,7 @@ function forceQC (projectId, sequenceNumber) { async function getProjectQCConfig (projectId) { console.log("getProjectQCConfig"); - const qcConfig = await configuration.get(projectId, "qc"); + const qcConfig = (await project.configuration.get(projectId))?.qc; console.log("qcConfig", qcConfig); if (qcConfig?.definitions && qcConfig?.parameters) { const definitions = @@ -57,11 +57,11 @@ async function main () { // Fetch list of projects console.log("GET PROJECTS"); const projects = await project.get(); - console.log("PROJECTS", projects); - for (const proj of projects) { - const projectId = proj.pid; + for (const {pid} of projects) { + const projectId = pid; console.log("PROJECT ID", projectId); + const proj = await project.configuration.get(projectId); if (!proj.archived) { const QCTstamp = new Date(); @@ -75,7 +75,7 @@ async function main () { console.log("currentQCHash != lastQCHash", projectId, currentQCHash, lastQCHash); // Fetch definitions and parameters - const { definitions, parameters } = await getProjectQCConfig(projectId) ?? {}; + const { definitions, parameters } = await getProjectQCConfig(projectId, proj.qc) ?? {}; if (definitions && parameters) { console.log("PROJECT ID", projectId);