Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 10:27:09 +00:00
Code Issues Packages Projects Releases Activity

Adapt QC endpoints to new configuration APIs

Browse Source
This commit is contained in:
D. Berge
2023-09-14 13:15:59 +02:00
parent 33618b6b82
commit dc4b9002fe
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/www/server/lib/db/qc/definitions/get.js
View File

@@ -1,11 +1,11 @@
const fs = require('fs'); const fs = require('fs');
const YAML = require('yaml'); const YAML = require('yaml');
const flattenQCDefinitions = require('../../../utils/flattenQCDefinitions'); const flattenQCDefinitions = require('../../../utils/flattenQCDefinitions');
const configuration = require('../../configuration'); // lib/db/configuration const project = require('../../project'); // lib/db/project
async function get (projectId, opts = {}) { async function get (projectId, opts = {}) {
const qcConfig = await configuration.get(projectId, "qc"); const qcConfig = (await project.configuration.get(projectId))?.qc;
if (qcConfig?.definitions) { if (qcConfig?.definitions) {
try { try {
const definitions = YAML.parse(fs.readFileSync(qcConfig.definitions).toString()); const definitions = YAML.parse(fs.readFileSync(qcConfig.definitions).toString());

10
lib/www/server/lib/qc/index.js
View File

@@ -42,7 +42,7 @@ function forceQC (projectId, sequenceNumber) {
async function getProjectQCConfig (projectId) { async function getProjectQCConfig (projectId) {
console.log("getProjectQCConfig"); console.log("getProjectQCConfig");
const qcConfig = await configuration.get(projectId, "qc"); const qcConfig = (await project.configuration.get(projectId))?.qc;
console.log("qcConfig", qcConfig); console.log("qcConfig", qcConfig);
if (qcConfig?.definitions && qcConfig?.parameters) { if (qcConfig?.definitions && qcConfig?.parameters) {
const definitions = const definitions =
@@ -57,11 +57,11 @@ async function main () {
// Fetch list of projects // Fetch list of projects
console.log("GET PROJECTS"); console.log("GET PROJECTS");
const projects = await project.get(); const projects = await project.get();
console.log("PROJECTS", projects);
for (const proj of projects) { for (const {pid} of projects) {
const projectId = proj.pid; const projectId = pid;
console.log("PROJECT ID", projectId); console.log("PROJECT ID", projectId);
const proj = await project.configuration.get(projectId);
if (!proj.archived) { if (!proj.archived) {
const QCTstamp = new Date(); const QCTstamp = new Date();
@@ -75,7 +75,7 @@ async function main () {
console.log("currentQCHash != lastQCHash", projectId, currentQCHash, lastQCHash); console.log("currentQCHash != lastQCHash", projectId, currentQCHash, lastQCHash);
// Fetch definitions and parameters // Fetch definitions and parameters
const { definitions, parameters } = await getProjectQCConfig(projectId) ?? {}; const { definitions, parameters } = await getProjectQCConfig(projectId, proj.qc) ?? {};
if (definitions && parameters) { if (definitions && parameters) {
console.log("PROJECT ID", projectId); console.log("PROJECT ID", projectId);