Skip to content

[O2B-1446] Allow flags creation to continue if initial one fails for sync #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graduta merged 3 commits into from
May 28, 2025
Merged

[O2B-1446] Allow flags creation to continue if initial one fails for sync #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edef35b
Allow flags creation to continue if initial one fails for sync
graduta May 28, 2025
adebc46
Merge branch 'main' into improv/graduta/O2B-1446/do-not-drop-all-subs…
graduta May 28, 2025
b287462
Bump correctly the version in package-lock
graduta May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 48 additions & 43 deletions lib/server/services/qualityControlFlag/QcFlagService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,50 +156,55 @@
const createdFlags = [];
for (const qcFlag of qcFlags) {
const { comment, flagTypeId, origin } = qcFlag;
const { from, to } = this._prepareQcFlagPeriod({ from: qcFlag.from, to: qcFlag.to }, targetRun);

// Insert
const newInstance = await QcFlagRepository.insert({
from,
to,
comment,
origin,
createdById: user.id,
flagTypeId,
runNumber,
detectorId: detector.id,
});
if (dataPass) {
await newInstance.addDataPass(dataPass);
} else if (simulationPass) {
await newInstance.addSimulationPass(simulationPass);
// Each flag should be treated separately and the for loop should not fail on the first error
try {
const { from, to } = this._prepareQcFlagPeriod({ from: qcFlag.from, to: qcFlag.to }, targetRun);

// Insert
const newInstance = await QcFlagRepository.insert({
from,
to,
comment,
origin,
createdById: user.id,
flagTypeId,
runNumber,
detectorId: detector.id,
});
if (dataPass) {
await newInstance.addDataPass(dataPass);
} else if (simulationPass) {
await newInstance.addSimulationPass(simulationPass);
}

/** @var {SequelizeQcFlag} createdFlag */
const createdFlag = await QcFlagRepository.findOne({
where: { id: newInstance.id },
include: [
{ association: 'dataPasses' },
{ association: 'simulationPasses' },
{ association: 'createdBy' },
],
});

// Update effective periods
const effectivePeriodsToBeUpdated = await QcFlagEffectivePeriodRepository.findOverlappingPeriodsCreatedBeforeLimit(
{ from, to },
createdFlag.createdAt,
{ dataPassId: dataPass?.id, simulationPassId: simulationPass?.id, runNumber, detectorId: detector.id },
);
await this._removeEffectivePeriodsAndPeriodIntersection(createdFlag, effectivePeriodsToBeUpdated);

await QcFlagEffectivePeriodRepository.insert({
flagId: newInstance.id,
from: newInstance.from,
to: newInstance.to,
});

createdFlags.push(qcFlagAdapter.toEntity(createdFlag));
} catch (error) {
this._logger.warnMessage(`Failed to create QC flag with properties: ${JSON.stringify(qcFlag)}. Error: ${error}`);

Check warning on line 206 in lib/server/services/qualityControlFlag/QcFlagService.js

View check run for this annotation

Codecov / codecov/patch

lib/server/services/qualityControlFlag/QcFlagService.js#L206 

Added line #L206 was not covered by tests
}

/** @var {SequelizeQcFlag} createdFlag */
const createdFlag = await QcFlagRepository.findOne({
where: { id: newInstance.id },
include: [
{ association: 'dataPasses' },
{ association: 'simulationPasses' },
{ association: 'createdBy' },
],
});

// Update effective periods
const effectivePeriodsToBeUpdated = await QcFlagEffectivePeriodRepository.findOverlappingPeriodsCreatedBeforeLimit(
{ from, to },
createdFlag.createdAt,
{ dataPassId: dataPass?.id, simulationPassId: simulationPass?.id, runNumber, detectorId: detector.id },
);
await this._removeEffectivePeriodsAndPeriodIntersection(createdFlag, effectivePeriodsToBeUpdated);

await QcFlagEffectivePeriodRepository.insert({
flagId: newInstance.id,
from: newInstance.from,
to: newInstance.to,
});

createdFlags.push(qcFlagAdapter.toEntity(createdFlag));
}
return createdFlags;
});
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aliceo2/bookkeeping",
"version": "1.9.1",
"version": "1.9.2",
"author": "ALICEO2",
"scripts": {
"coverage": "nyc npm test && npm run coverage:report",
Expand Down
Loading