From dcbf618008cb880d19ea6b48af1e58cd2baf6914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=87=AF?= <324400663+KyleHuangFromHZ@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:41:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(sound-power):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=B5=8B=E9=87=8F=E9=9D=A2=E7=A7=AF=E5=B9=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9B=BE=E8=B0=B1=E4=B8=8E=E9=87=87=E9=9B=86=E5=9B=9E=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runtime/PublicAlgorithmService.java | 4 + .../runtime/PublicSoundPowerMathTest.java | 30 +++++- .../service/GraphicConfigService.java | 8 +- .../service/GraphicConfigSnapshotService.java | 7 +- .../service/SharedFilePublicationJournal.java | 94 +++++++++------- .../axis/LegacyAxisReadNormalizer.java | 26 ++++- ...boardHistoricalResultArtifactResolver.java | 9 +- ...shboardConfigurationDefinitionService.java | 8 +- .../DashboardDefinitionGraphicPlanner.java | 6 ++ .../ProviderDashboardResultReader.java | 1 + .../framework/ProviderGraphicUnitService.java | 2 +- ...entityDefinitionReconciliationService.java | 101 +++++++++++++++++- .../ProviderPipelineDashboardHandler.java | 4 +- .../service/report/ReportProviderCatalog.java | 7 +- ...hicConfigChannelTypeCardRetentionTest.java | 64 ++++++++--- .../axis/LegacyAxisReadNormalizerTest.java | 32 ++++++ .../ProviderHistoricalValueGraphicTest.java | 7 ++ .../CurrentDefinitionExcitationTest.java | 21 ++++ .../framework/RecorderGraphicHistoryTest.java | 12 +++ .../TableIdentityIncrementalGraphicTest.java | 68 ++++++++++++ .../TableReferenceUnitContinuationTest.java | 8 +- .../provider/ProviderCaptureStagesTest.java | 11 ++ .../SharedFilePublicationJournalTest.java | 20 ++++ .../SharedFlatFilePublicationJournalTest.java | 11 +- .../report/ProjectReportLifecycleTest.java | 2 +- .../api/EngineeringSoundPowerOptions.java | 17 ++- .../api/SoundPowerSurveyOptions.java | 18 +++- .../api/measurement/TableDefinition.java | 30 +++++- apps/desktop/src/report-pdf-export.js | 2 +- .../tests/unit/report-pdf-export.test.mjs | 8 ++ 30 files changed, 561 insertions(+), 77 deletions(-) diff --git a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicAlgorithmService.java b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicAlgorithmService.java index 83cc2e89..54d145f1 100644 --- a/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicAlgorithmService.java +++ b/apps/backend/crydaq-algorithm-runtime/src/main/java/com/opentest/algorithm/runtime/PublicAlgorithmService.java @@ -195,6 +195,8 @@ public PublicAlgorithmService(AlgorithmLibJNIBridgeService runtime, CurveNativeA parameters.put("height", options.height()); parameters.put("roomSurface", options.roomSurface()); parameters.put("absortionCoef", options.absorptionCoefficient()); + if (options.measurementSurfaceArea() != null) + parameters.put("measurementSurfaceArea", options.measurementSurfaceArea()); return Optional.ofNullable(runtime.calculateSimplifiedSoundPowerSurvey( options.surfaceType(), parameters, levels, backgroundLevels)).map(value -> new SoundPowerSurveyResult(value.getSoundPowerLevel(), value.getBackgroundCorrection(), @@ -234,6 +236,8 @@ private Optional calculateEngineeringSoundPower( parameters.put("absortionCoef", options.absorptionCoefficient()); parameters.put("temperature", options.temperature()); parameters.put("humidity", options.humidity()); parameters.put("atmosphericPressure", options.atmosphericPressure()); + if (options.measurementSurfaceArea() != null) + parameters.put("measurementSurfaceArea", options.measurementSurfaceArea()); parameters.values().removeIf(Objects::isNull); var response = terminal ? runtime.calculateTerminalEngineeringSoundPower(options.surfaceType(), options.calculationType(), diff --git a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicSoundPowerMathTest.java b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicSoundPowerMathTest.java index c0367603..2b1d69fa 100644 --- a/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicSoundPowerMathTest.java +++ b/apps/backend/crydaq-algorithm-runtime/src/test/java/com/opentest/algorithm/runtime/PublicSoundPowerMathTest.java @@ -1,10 +1,22 @@ package com.opentest.algorithm.runtime; import com.opentest.core.jni.AlgorithmLibJNIBridge; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.junit.jupiter.api.Test; -import com.opentest.algorithm.api.*; -import static org.junit.jupiter.api.Assertions.*; +import com.opentest.algorithm.api.AlgorithmException; +import com.opentest.algorithm.api.LaeqOptions; +import com.opentest.algorithm.api.SoundPowerSurveyOptions; +import com.opentest.algorithm.api.SoundPowerSurveyResult; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; class PublicSoundPowerMathTest { @Test void independentSessionsPreserveOperandsEmptyFailureAndSingleRelease() { @@ -58,6 +70,18 @@ class PublicSoundPowerMathTest { bridge.surveyStatus=13200001; assertTrue(service.calculateSoundPowerSurvey(options,new double[]{80},new double[]{40}).isEmpty()); } + @Test void explicitSurveyAreaUsesDedicatedSurfaceAndDoesNotChangeLegacyOperands() { + var bridge = new NativeObservation(); + var service = new PublicAlgorithmService(new AlgorithmLibJNIBridgeService(bridge)); + var options = SoundPowerSurveyOptions.withArea(48.849555921539, 1000D, .5); + assertTrue(service.calculateSoundPowerSurvey(options,new double[]{75},new double[]{65}).isPresent()); + assertEquals(-1, bridge.surface); + assertEquals(48.849555921539, bridge.parameters.get("measurementSurfaceArea")); + assertNull(bridge.parameters.get("length")); + assertNull(bridge.parameters.get("sphereRadius")); + assertThrows(IllegalArgumentException.class, () -> SoundPowerSurveyOptions.withArea(Double.NaN,1000D,.5)); + assertThrows(IllegalArgumentException.class, () -> new SoundPowerSurveyOptions(3,1D,1D,1D,1D,1D,1000D,.5,50D)); + } private static final class NativeObservation extends AlgorithmLibJNIBridge { final List ids=new ArrayList<>(),deleted=new ArrayList<>(); final List> options=new ArrayList<>(); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java index 08d95ad9..1ecd6b09 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java @@ -1000,7 +1000,7 @@ private List applyLegacyAxisReadNormalization(GraphicConfi normalizedUnitY = normalizeReadGraphicUnitY(normalizedUnitY, bindings); dto.setUnitY(normalizedUnitY); bindings = rebuildMissingLegacyCarrierUnitsForRead(record, bindings); - LegacyAxisReadResult readResult = legacyAxisReadNormalizer.normalizeForRead( + LegacyAxisReadResult readResult = legacyAxisReadNormalizer.normalizeForDisplay( record.getGraphicType(), record.getChartConfig(), bindings, @@ -25597,6 +25597,8 @@ private CurrentGraphicState assembleCurrentState( state.getGraphicsById().put(graphicId, graphic); List resultCodes = MapUtil.emptyIfNull(graphicResultCodeDtoMap).get(graphicId); + // An unbound card still participates in membership synchronization with an empty catalog. + if (resultCodes == null) resultCodes = new ArrayList<>(); state.getRcByGraphic().put(graphicId, resultCodes); // 构建placement索引 @@ -36059,7 +36061,9 @@ private Map> assignChannelsToResults(List channels, Co channel)) .map(SimpleChannelDto::getVchId) .collect(Collectors.toCollection(LinkedHashSet::new)); - if (CollUtil.isEmpty(effectiveChannelIds)) { + if (effectiveChannelIds.isEmpty()) { + // Provider result members are explicit; an aggregate can omit the new input. + if (result.isProviderDefined()) continue; effectiveChannelIds.add(sourceChannelId); } channelsByResult.computeIfAbsent(result.getId(), k -> new HashSet<>()) diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java index e548707b..0b3b52cf 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java @@ -42,6 +42,7 @@ import com.opentest.service.axis.CurrentReferenceTestGraphicProjection; import com.opentest.service.axis.ScalarGraphicMembershipReadProjection; import com.opentest.service.axis.FrozenEmptyGraphicUnitProjection; +import com.opentest.service.axis.GraphicResultContractClassifier; import com.opentest.service.mapper.DashboardResultPersistenceMapper; import com.opentest.service.mapper.GraphicConfigSnapshotDtoMapper; import com.opentest.service.membership.DomainSpecialGraphicMembershipPlanner; @@ -728,7 +729,7 @@ private List applyLegacyAxisReadNormalization( List bindings, Long expectedRequestId, boolean hasPersistedBindings) { - LegacyAxisReadResult readResult = legacyAxisReadNormalizer.normalizeForRead( + LegacyAxisReadResult readResult = legacyAxisReadNormalizer.normalizeForDisplay( record.getGraphicType(), record.getChartConfig(), bindings, @@ -797,6 +798,10 @@ private List resolveSnapshotResultCodes(GraphicConfigSnaps return CollUtil.newArrayList(); } List channelIds = parseSnapshotChannelIds(record.getChannelIds()); + if (channelIds.isEmpty() && GraphicResultContractClassifier.supportsStableAxisContract(record.getGraphicType())) { + // A retained card title is not a result carrier without a persisted result identity. + return CollUtil.newArrayList(); + } GraphicResultCodeDto resultCode = new GraphicResultCodeDto(); resultCode.setGraphicConfigId(record.getId()); resultCode.setResultCode(record.getResultCode()); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/SharedFilePublicationJournal.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/SharedFilePublicationJournal.java index 20631a41..f22eff2e 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/SharedFilePublicationJournal.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/SharedFilePublicationJournal.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import java.util.regex.Pattern; import javax.sql.DataSource; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; @@ -171,9 +172,7 @@ private Admission claim(Owner owner, String businessId, String logicalName, throw conflict("Invalid shared result identity"); // Released RT60 spectra use a flat filename while retaining the same shared // business identity. Admit only the filename derived exactly from that identity. - String flatName = (owner.projectId() + "_null_" + businessId + ".crybin") - .replaceAll("[\\\\/:*?\"<>|]", "_"); - boolean legacyFlat = logicalName.equals(flatName); + boolean legacyFlat = logicalName.equals(flatName(owner.projectId(), businessId)); Path relative = Path.of(logicalName); if (relative.isAbsolute() || !relative.normalize().toString().replace('\\', '/').equals(logicalName) || !legacyFlat && !logicalName.startsWith(owner.projectId() + "/null/") @@ -195,39 +194,17 @@ private Admission claim(Owner owner, String businessId, String logicalName, requireKnownFileSchema(); var definition = requireDefinition(owner); long tenantId = ((Number) definition.get("tenant_id")).longValue(); - var previous = owner.stageWitness() == null ? exactOwners(businessId) - : stageActiveOwners(businessId, owner.projectId(), owner.dashboardId(), tenantId); + var existing = exactOwners(businessId); + var previous = activeOwners(existing, businessId, owner.projectId(), owner.dashboardId(), + tenantId, candidate, owner.stageWitness() != null); if (owner.stageWitness() != null && !previous.isEmpty()) throw conflict("Stage recapture requires visibility-time invalidation of previous active files"); if (previous.size() > 1) throw conflict("Duplicate shared File owners"); Map row = previous.isEmpty() ? null : previous.getFirst(); - String marker = markerName(businessId); - if (row == null) { - boolean retiredStageOwner = owner.stageWitness() != null && !exactOwners(businessId).isEmpty(); - if (!retiredStageOwner) { - if (Files.exists(root.resolve(".shared-result-admission").resolve(marker))) - throw conflict("Orphan legacy shared reservation requires quarantine"); - ensureAbsent(root, indexRoot, logicalName); - } - } else { - String selected = Objects.toString(row.get("file_url"), ""); - String flatBase = flatName.substring(0, flatName.length() - ".crybin".length()); - long oldShards = number(row.get("shards_no")); - boolean originalFlat = legacyFlat && (selected.equals(flatName) - || oldShards > 0 && selected.equals(flatBase + "_" + oldShards + ".crybin")); - boolean generatedFlat = legacyFlat && selected.matches(java.util.regex.Pattern.quote(flatBase) - + "_g[0-9a-f]{32}(?:_1(?:_\\d{14})?)?\\.crybin"); - if (number(row.get("tenant_id")) != tenantId - && !(row.get("tenant_id") == null && (originalFlat || generatedFlat)) - || number(row.get("business_type")) != FileBusinessTypeEnum.CALCULATE.getType() - || number(row.get("wait_del")) != 0 - || number(row.get("temporary_result")) != 0 - || row.get("request_id") != null) - throw conflict("Shared File owner is foreign or pending deletion"); - if (!(legacyFlat ? originalFlat || generatedFlat - : selected.startsWith(owner.projectId() + "/null/")) - || !selected.toLowerCase(Locale.ROOT).endsWith(".crybin")) - throw conflict("Shared File selected path is outside its owner"); + if (existing.isEmpty()) { + if (Files.exists(root.resolve(".shared-result-admission").resolve(markerName(businessId)))) + throw conflict("Orphan legacy shared reservation requires quarantine"); + ensureAbsent(root, indexRoot, logicalName); } String oldManifest = row == null ? null : selectedManifest(row, root, indexRoot); long id = row == null ? IdWorker.getId() : number(row.get("id")); @@ -453,9 +430,10 @@ private void recoverUnknownPublication(String publication, ConcurrentFileManager String outcome = null; for (Map item : items) { String businessId = Objects.toString(item.get("business_id"), ""); - var current = Objects.toString(item.get("definition_witness"), "").startsWith("STAGE:") - ? stageActiveOwners(businessId, number(item.get("project_id")), number(item.get("dashboard_id")), number(item.get("tenant_id"))) - : exactOwners(businessId); + var current = activeOwners(exactOwners(businessId), businessId, number(item.get("project_id")), + number(item.get("dashboard_id")), number(item.get("tenant_id")), + Objects.toString(item.get("candidate_base"), ""), + Objects.toString(item.get("definition_witness"), "").startsWith("STAGE:")); boolean previous = matchesPreviousUnknown(item, current, root, indexRoot); boolean candidate = matchesCandidateUnknown(item, current, root, indexRoot); if (previous == candidate) { @@ -601,12 +579,50 @@ private static String definitionWitness(Owner owner, Map definiti return (owner.stageWitness() == null ? "" : "STAGE:") + witness(definition); } private List> activeOwners(Admission admission) { - return admission.owner().stageWitness() == null ? exactOwners(admission.businessId()) - : stageActiveOwners(admission.businessId(), admission.owner().projectId(), admission.owner().dashboardId(), admission.tenantId()); + var owner = admission.owner(); + return activeOwners(exactOwners(admission.businessId()), admission.businessId(), owner.projectId(), + owner.dashboardId(), admission.tenantId(), admission.candidateBase(), owner.stageWitness() != null); + } + + private static List> activeOwners(List> existing, + String business, long project, long dashboard, long tenant, String candidate, boolean stage) { + if (stage) return stageActiveOwners(existing, business, project, dashboard, tenant); + boolean legacyFlat = !candidate.startsWith(project + "/null/"); + String flatName = flatName(project, business); + String flatBase = flatName.substring(0, flatName.length() - ".crybin".length()); + var active = new ArrayList>(); + for (var row : existing) { + String selected = Objects.toString(row.get("file_url"), ""); + long oldShards = number(row.get("shards_no")); + boolean originalFlat = legacyFlat && (selected.equals(flatName) + || oldShards > 0 && selected.equals(flatBase + "_" + oldShards + ".crybin")); + boolean generatedFlat = legacyFlat && selected.matches(Pattern.quote(flatBase) + + "_g[0-9a-f]{32}(?:_1(?:_\\d{14})?)?\\.crybin"); + long waitDelete = number(row.get("wait_del")); + if ((number(row.get("tenant_id")) != tenant + && !(row.get("tenant_id") == null && (originalFlat || generatedFlat))) + || number(row.get("business_type")) != FileBusinessTypeEnum.CALCULATE.getType() + || number(row.get("temporary_result")) != 0 || row.get("request_id") != null + || (waitDelete != 0 && waitDelete != 1)) + throw conflict("Shared File owner is foreign or has an invalid deletion state"); + if (!(legacyFlat ? originalFlat || generatedFlat + : selected.startsWith(project + "/null/") && selected.indexOf('\\') < 0 + && Path.of(selected).normalize().toString().replace('\\', '/').equals(selected)) + || !selected.toLowerCase(Locale.ROOT).endsWith(".crybin")) + throw conflict("Shared File selected path is outside its owner"); + if (waitDelete == 0) active.add(row); + } + return active; } - private List> stageActiveOwners(String business, long project, long dashboard, long tenant) { + + private static String flatName(long projectId, String businessId) { + return (projectId + "_null_" + businessId + ".crybin").replaceAll("[\\\\/:*?\"<>|]", "_"); + } + + private static List> stageActiveOwners(List> existing, + String business, long project, long dashboard, long tenant) { var result = new ArrayList>(); - for (var row : exactOwners(business)) { + for (var row : existing) { String path = Objects.toString(row.get("file_url"), ""); if (number(row.get("tenant_id")) != tenant || row.get("request_id") != null || number(row.get("business_type")) != FileBusinessTypeEnum.CALCULATE.getType() diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/LegacyAxisReadNormalizer.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/LegacyAxisReadNormalizer.java index 3ef3057b..cabb6faf 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/LegacyAxisReadNormalizer.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/LegacyAxisReadNormalizer.java @@ -61,6 +61,24 @@ public LegacyAxisReadNormalizer(AxisContractPlanner axisContractPlanner) { this.axisContractPlanner = axisContractPlanner; } + /** Project a retained unbound card as explicitly empty, without changing its stored contract. */ + public LegacyAxisReadResult normalizeForDisplay(Integer graphicType, + String storedChartConfig, + List resultBindings, + String graphDisplaySettings, + String legacyUnitY, + LegacyAxisReadContext readContext, + boolean allowEmptySelectedUnit) { + LegacyAxisReadResult read = normalizeForRead(graphicType, storedChartConfig, resultBindings, graphDisplaySettings, + legacyUnitY, readContext, allowEmptySelectedUnit); + if (read.getAxisPlan() != null || CollUtil.isNotEmpty(resultBindings) + || !GraphicMembershipCapabilityRegistry.supportsStableAxisContract(graphicType)) { + return read; + } + return LegacyAxisReadResult.axisPlan(new AxisContractPlan( + List.of(), List.of(), List.of(), normalizeCarrierGraphDisplaySettings(graphDisplaySettings))); + } + /** * @return 合法 legacy 曲线的运行时计划;非目标图或完整新合同返回 {@code null} */ @@ -189,7 +207,13 @@ public LegacyAxisReadResult normalizeForRead(Integer graphicType, .filter(Objects::nonNull) .anyMatch(this::hasStableMarker); if (CollUtil.isEmpty(resultBindings)) { - if (hasNewAxes) { + JsonNode container = storedChartTree.path(type.getChartType().getCode()); + JsonNode axes = container.path("yAxes"); + // Execution snapshots already use an explicit empty array for a card with no bindings. + boolean explicitEmpty = axes.isArray() && axes.isEmpty() + && !container.has("displayYAxis") && !container.has("overflowAxisSide") + && !storedChart.containsExplicitLegacyYAxisFields(); + if ((hasNewAxes || container.has("displayYAxis")) && !explicitEmpty) { throw new IllegalArgumentException("Stable axis contract has fields without result bindings"); } return LegacyAxisReadResult.axisPlan(null); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/component/dashboard/DashboardHistoricalResultArtifactResolver.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/component/dashboard/DashboardHistoricalResultArtifactResolver.java index 8ce6b77b..b272f4d1 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/component/dashboard/DashboardHistoricalResultArtifactResolver.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/component/dashboard/DashboardHistoricalResultArtifactResolver.java @@ -430,7 +430,7 @@ private Resolution resolveProviderResult(Map fileMap, DashboardRes exactFiles.put(id, file); } var sources = SavedProviderArtifacts.readable(described, identities, exactFiles, files::readResultFileHeader); - String fileSelectionUnitX = fileSelectionUnitX(graphicType, unitX, described); + String fileSelectionUnitX = fileSelectionUnitX(graphicType, unitX, described, units); var selected = SavedProviderArtifacts.select(sources, window ? null : fileSelectionUnitX, window ? "" : displayUnitY, member, channelId, saved.snapshot(), conversion); return selected == null ? noData(null) @@ -438,12 +438,15 @@ private Resolution resolveProviderResult(Map fileMap, DashboardRes } /** A value graphic hides X; its saved source still retains the declared data axis. */ - private String fileSelectionUnitX(Integer graphicType, String displayUnitX, DashboardResultDto savedResult) { + private String fileSelectionUnitX(Integer graphicType, String displayUnitX, DashboardResultDto savedResult, + List frozenUnits) { if (StrUtil.isNotBlank(displayUnitX)) return displayUnitX; GraphicTypeEnum type = GraphicTypeEnum.fromType(graphicType); if (type == GraphicTypeEnum.SINGLE_VALUE || type == GraphicTypeEnum.HORIZONTAL_BAR || type == GraphicTypeEnum.MULTI_VALUE || type == GraphicTypeEnum.VERTICAL_BAR) { - return savedResult.getCustomUnitX(); + if (savedResult.getCustomUnitX() != null) return savedResult.getCustomUnitX(); + var axes = frozenUnits.stream().map(UnitCombination::unitX).distinct().toList(); + return axes.size() == 1 ? axes.getFirst() : displayUnitX; } return displayUnitX; } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardConfigurationDefinitionService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardConfigurationDefinitionService.java index 8e37f328..13568743 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardConfigurationDefinitionService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardConfigurationDefinitionService.java @@ -102,7 +102,7 @@ public TableDefinition readDefinition(DashboardConfig dashboard) { return readDefinition(dashboard, null); } - /** A proposed definition must interpret saved references using their previous configuration. */ + /** Reading the algorithm identity does not plan mutations to persisted graphic references. */ public TableDefinition readDefinition(DashboardConfig dashboard, MeasurementDefinitionFacts previous) { ResultPluginAccess.requireProvider(providers, dashboard.getProviderId()); var configuration = readConfiguration(dashboard.getHandlerConfig()); @@ -112,7 +112,7 @@ public TableDefinition readDefinition(DashboardConfig dashboard, MeasurementDefi var snapshot = definitions.snapshot(dashboard); var current = currentFacts.load(dashboard, configuration); return Objects.requireNonNull(providers.resolveDefinition(registration.providerId(), previous == null ? current : previous, current, - snapshot.currentResults(), snapshot.currentReferences(), null, false), + snapshot.currentResults(), List.of(), null, false), "The current measurement definition is required"); } @@ -130,7 +130,7 @@ public void backfillDefaultGraphicTypes(DashboardConfig dashboard) { var snapshot = definitions.snapshot(dashboard); var facts = currentFacts.load(dashboard, configuration); var declared = providers.resolveDefinition(registration.providerId(), facts.configuration(), - snapshot.currentResults(), snapshot.currentReferences(), null, facts.channels(), false); + snapshot.currentResults(), List.of(), null, facts.channels(), false); definitions.backfillDefaultGraphicTypes(snapshot, registration.providerId(), declared); } @@ -160,7 +160,7 @@ public Optional> readCurrentResults(DashboardConfi .bind(configuration); var facts = currentFacts.load(dashboard, configuration, DashboardConfigurationChannels.fromBoundCatalog(bound)); var declared = providers.resolveDefinition(registration.providerId(), facts.configuration(), - snapshot.currentResults(), snapshot.currentReferences(), null, facts.channels(), false); + snapshot.currentResults(), List.of(), null, facts.channels(), false); var physical = new LinkedHashMap(); bound.availableInputs().forEach(channel -> physical.put("0:" + channel.getVchId(), channel)); bound.selected().forEach(channel -> physical.put("0:" + channel.getVchId(), channel)); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardDefinitionGraphicPlanner.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardDefinitionGraphicPlanner.java index 51e05dfe..4210b46e 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardDefinitionGraphicPlanner.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/DashboardDefinitionGraphicPlanner.java @@ -456,6 +456,12 @@ public PlannedMembership planContinuations(String providerId, JsonNode configura var plan = axisContractPlanner.plan(StoredAxisContract.initialized(chart.getYAxes(), GraphicResultContractClassifier.withoutResultPlaceholders(oldBindings), chart.getDisplayYAxis(), graphic.getOriginal()), members, AxisMutation.membership(graphic.getOriginal(), chart.getOverflowAxisSide()).preservingBindingRows()); + if (members.isEmpty() && carriers.isEmpty()) { + // A retired last result leaves an unbound card, not an initialized axis contract. + chart.setYAxes(null); chart.setDisplayYAxis(null); chart.setOverflowAxisSide(null); + chart.clearLegacyYAxes(); + return new PlannedMembership(ChartConfigStorageCodec.encode(chart), plan.getGraphDisplaySettings(), List.of()); + } if (members.isEmpty() && !carriers.isEmpty()) { String display = new LegacyAxisReadNormalizer(axisContractPlanner) .projectFormalDisplayToPlaceholders(chart.getYAxes(), graphic.getOriginal()); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderDashboardResultReader.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderDashboardResultReader.java index d7a03304..6223af76 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderDashboardResultReader.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderDashboardResultReader.java @@ -208,6 +208,7 @@ private FrozenResultDirectory(DashboardConfigDto dashboard, Long requestId, var custom = new LinkedHashMap(); custom.put("parametersPresent", parameters != null); custom.put("defaultI18nNameKey", row.getDefaultI18nNameKey()); + custom.put("frozenTableResult", true); String descriptorKey = (row.getDefaultI18nNameKey() == null || row.getDefaultI18nNameKey().isBlank()) ? "result.saved" : row.getDefaultI18nNameKey(); var content = new ResultSetDefinition(row.getPrimaryCode(), row.getHash(), descriptorKey, type, domain, List.of(), parameters == null ? Map.of() : parameters, List.of(), diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderGraphicUnitService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderGraphicUnitService.java index d8c3f98e..41495cf4 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderGraphicUnitService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/ProviderGraphicUnitService.java @@ -640,7 +640,7 @@ private CurrentUnitContext prepareCurrentUnitContext(DashboardConfig dashboard, var snapshot = reconciler.snapshot(dashboard); var channelsById = facts.channels(); var definition = providers.resolveDefinition(owner, configuration, snapshot.currentResults(), - snapshot.currentReferences(), null, channelsById, false); + List.of(), null, channelsById, false); var source = ProviderGeneratorConfigurationView.forConfiguration(dashboard.getProjectId(), generatorProjects); GeneratorConfigurationView generator = new GeneratorConfigurationView() { private Optional> captured; diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/TableIdentityDefinitionReconciliationService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/TableIdentityDefinitionReconciliationService.java index 0b3620e7..c423c797 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/TableIdentityDefinitionReconciliationService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/dashboard/framework/TableIdentityDefinitionReconciliationService.java @@ -298,6 +298,9 @@ public Outcome apply(Snapshot snapshot, String providerId, JsonNode dashboardIte } applyContinuations(snapshot, definition, currentById, resolved, retired, dashboardItemConfig); for (var row : retired) deleteRetired(row, originals.get(row.getId())); + restoreUnboundHorizontalBars(dashboard, providerId, dashboardItemConfig, definition, resolved); + if (!createInitialGraphics && !definition.reconcileDefaultGraphics().isEmpty()) + reconcileDefaultGraphics(snapshot, providerId, dashboardItemConfig, definition, resolved); if (createInitialGraphics) createGraphics(dashboard, providerId, dashboardItemConfig, definition, definition.firstCreateGraphics(), resolved, 0); @@ -854,6 +857,97 @@ private ResultOriginal(DashboardResult row) { } } + private void restoreUnboundHorizontalBars(DashboardConfig dashboard, String providerId, JsonNode configuration, + TableDefinition definition, Map resolved) { + for (var request : definition.restoreUnboundHorizontalBars()) { + var result = content(definition, request.result()); + var members = request.memberIds() == null + ? result.channels().stream().map(ResultChannelDefinition::vchId).toList() : request.memberIds(); + if (members.isEmpty()) continue; + String code = result.resultCode(); + var matching = graphics.selectList(new QueryWrapper() + .eq("tenant_id", dashboard.getTenantId()).eq("project_id", dashboard.getProjectId()) + .eq("dashboard_id", dashboard.getId()).eq("node_id", dashboard.getId()) + .isNull("parent_id").isNull("custom_view_id") + .eq("algorithm_code", definition.algorithmCode()).eq("result_code", code) + .eq("graphic_type", GraphicType.HORIZONTAL_BAR.ordinal())); + // A normal unselect clears the saved result code. Only a retained legacy card with + // no bindings at all is eligible; leave deleted, ambiguous and customized bindings alone. + if (matching.size() != 1) continue; + var card = matching.getFirst(); + if (!Objects.equals(ChartConfigStorageCodec.decode(card.getChartConfig(), BaseChartConfig.class).getCode(), code) + || bindings.exists(new QueryWrapper().eq("graphic_config_id", card.getId()))) continue; + var reference = new ResultSetReference(code, result.hash(), result.resultType()); + var graphic = new GraphicDefinition(List.of(reference), GraphicType.HORIZONTAL_BAR, + null, null, members, true, GraphicPresentation.EMPTY); + var plan = graphicPlanner.plan(providerId, configuration, dashboard.getProjectId(), graphic, + List.of(new DashboardDefinitionGraphicPlanner.ResultTarget(resolved.get(request.result()), result, members))); + persistGraphicBindings(dashboard, card.getId(), plan); + } + } + + private void reconcileDefaultGraphics(Snapshot snapshot, String providerId, JsonNode configuration, + TableDefinition definition, Map resolved) { + var dashboard = snapshot.dashboard(); + var priorCatalog = snapshot.currentResults().stream().map(TableDefinitionQuery.CurrentResult::catalogIdentity) + .collect(Collectors.toSet()); + var cards = graphics.selectList(new QueryWrapper() + .eq("tenant_id", dashboard.getTenantId()).eq("project_id", dashboard.getProjectId()) + .eq("dashboard_id", dashboard.getId()).eq("node_id", dashboard.getId()) + .isNull("parent_id").isNull("custom_view_id").isNull("current_version")); + int nextSort = cards.stream().map(GraphicConfig::getSort).filter(Objects::nonNull) + .max(Integer::compareTo).orElse(-1) + 1; + var byCard = cards.isEmpty() ? Map.>of() + : bindings.selectList(new QueryWrapper().eq("tenant_id", dashboard.getTenantId()) + .eq("project_id", dashboard.getProjectId()) + .in("graphic_config_id", cards.stream().map(GraphicConfig::getId).toList())).stream() + .collect(Collectors.groupingBy(GraphicResultCode::getGraphicConfigId)); + for (var template : definition.reconcileDefaultGraphics()) { + var request = template.bindings().getFirst(); + long resultId = resolved.get(request.result()); + var result = content(definition, request.result()); + var members = request.memberIds() == null + ? result.channels().stream().map(ResultChannelDefinition::vchId).toList() : request.memberIds(); + String code = result.resultCode(); + int type = template.graphicType().ordinal(); + var matching = cards.stream().filter(card -> Objects.equals(card.getGraphicType(), type)) + .filter(card -> Objects.equals(card.getResultCode(), code) || byCard.getOrDefault(card.getId(), List.of()) + .stream().anyMatch(binding -> Objects.equals(binding.getDashboardResultId(), resultId))) + .toList(); + if (matching.isEmpty()) { + // Only a newly introduced result may acquire a missing default card. + if (!priorCatalog.contains(request.result())) + createGraphics(dashboard, providerId, configuration, definition, List.of(template), resolved, nextSort++); + continue; + } + if (matching.size() != 1 || members.isEmpty()) continue; + var card = matching.getFirst(); + if (!byCard.getOrDefault(card.getId(), List.of()).isEmpty() || card.getChartConfig() == null + || !Objects.equals(ChartConfigStorageCodec.decode(card.getChartConfig(), BaseChartConfig.class).getCode(), code)) + continue; + var reference = new ResultSetReference(code, result.hash(), result.resultType()); + var savedChart = readMap(card.getChartConfig()); + var graphic = new GraphicDefinition(List.of(reference), template.graphicType(), null, null, members, true, + new GraphicPresentation(savedChart, Map.of(), null)); + var plan = graphicPlanner.plan(providerId, configuration, dashboard.getProjectId(), graphic, + List.of(new DashboardDefinitionGraphicPlanner.ResultTarget(resultId, result, members))); + if (plan.graphDisplaySettings() != null) { + // The saved card retains its chart style; only the fresh stable axis contract is written back. + var update = new UpdateWrapper().eq("id", card.getId()).eq("tenant_id", dashboard.getTenantId()) + .eq("project_id", dashboard.getProjectId()).eq("dashboard_id", dashboard.getId()).isNull("current_version"); + original(update, "chart_config", card.getChartConfig()); + original(update, "original", card.getOriginal()); + var display = new LinkedHashMap<>(readMap(card.getOriginal())); + display.remove("yAxesByKey"); + display.putAll(readMap(plan.graphDisplaySettings())); + update.set("chart_config", plan.chartConfig()).set("original", writeJson(display)); + if (graphics.update(null, update) != 1) + throw new IllegalStateException("Retained graphic changed during reconciliation"); + } + persistGraphicBindings(dashboard, card.getId(), plan); + } + } + private void createGraphics(DashboardConfig dashboard, String providerId, JsonNode configuration, TableDefinition definition, List requested, Map resolved, int startingSort) { @@ -900,9 +994,14 @@ private void persistGraphic(DashboardConfig dashboard, String algorithm, Graphic graphic.setHandlerConfig(writeJson(definition.presentation().basicSettings())); graphic.setUnitX(ChartConfigStorageCodec.decode(plan.chartConfig(), BaseChartConfig.class).getUnitX()); if (graphics.insert(graphic) != 1) throw new IllegalStateException("Default graphic could not be created"); + persistGraphicBindings(dashboard, graphic.getId(), plan); + } + + private void persistGraphicBindings(DashboardConfig dashboard, Long graphicId, + DashboardDefinitionGraphicPlanner.PlannedGraphic plan) { for (GraphicResultCodeDto planned : plan.bindings()) { var binding = new GraphicResultCode(); binding.setTenantId(dashboard.getTenantId()); - binding.setProjectId(dashboard.getProjectId()); binding.setGraphicConfigId(graphic.getId()); + binding.setProjectId(dashboard.getProjectId()); binding.setGraphicConfigId(graphicId); binding.setDashboardResultId(planned.getDashboardResultId()); binding.setChannelIds(String.join(",", planned.getChannelIds())); binding.setAxisType(planned.getAxisType()); binding.setAxisKey(planned.getAxisKey()); binding.setBindingOrder(planned.getBindingOrder()); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/provider/ProviderPipelineDashboardHandler.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/provider/ProviderPipelineDashboardHandler.java index d2380896..995c8043 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/provider/ProviderPipelineDashboardHandler.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/provider/ProviderPipelineDashboardHandler.java @@ -388,7 +388,9 @@ public void startStagedControl() { private boolean inheritedMeasurementSampling; public ProviderExecutionSession measurementSession() { return measurementSession; } @Override public boolean hasExecutionRecord() { - return super.hasExecutionRecord() && (measurementSession == null || measurementSession.createsMeasurementRecord()); + // A stage shares its parent's request ID, which can identify a background run without a Data Set. + return super.hasExecutionRecord() && (stageParent != null + ? stageParent.hasExecutionRecord() : measurementSession == null || measurementSession.createsMeasurementRecord()); } public void inheritMeasurementSampling(DashboardConfigDto active, com.opentest.service.dashboard.framework.InputSamplingSnapshotService sampling) { diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportProviderCatalog.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportProviderCatalog.java index 55ed68e7..ecfe926a 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportProviderCatalog.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportProviderCatalog.java @@ -4,6 +4,11 @@ /** Host layering adapter over the existing Provider registry, with no second registry or defaults. */ public interface ReportProviderCatalog { - record Descriptor(String providerId, String scene) { } + record Descriptor(String providerId, String scene) { + public Descriptor { + // Reports retain their released scene identity while providers use the current name. + if ("soundPower".equals(scene)) scene = "soundPowerTesting"; + } + } Optional find(String providerId); } diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/GraphicConfigChannelTypeCardRetentionTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/GraphicConfigChannelTypeCardRetentionTest.java index 8df9b0e5..95a6346d 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/GraphicConfigChannelTypeCardRetentionTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/GraphicConfigChannelTypeCardRetentionTest.java @@ -21,6 +21,7 @@ import com.opentest.common.model.query.GraphicResultCodeQuery; import com.opentest.service.helper.DefaultDashboardResultConfigContextBuilder; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.provider.ValueSource; import org.mockito.ArgumentCaptor; import org.springframework.test.util.ReflectionTestUtils; @@ -28,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,26 +45,54 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyLong; -import static org.mockito.Mockito.anyBoolean; -import static org.mockito.Mockito.anyList; -import static org.mockito.Mockito.nullable; -import static org.mockito.Mockito.anySet; -import static org.mockito.Mockito.anyCollection; import static org.mockito.Mockito.doAnswer; class GraphicConfigChannelTypeCardRetentionTest { + @Test + void addedMeasurementInputUsesOnlyDeclaredMembersForProviderResults() { + var service = new GraphicConfigService(); + var waveform = new DashboardResultDto(); + waveform.setId(1L); + waveform.setPrimaryCode("Acquired Waveform"); + waveform.setProviderDefined(true); + var input = new SimpleChannelDto(); + input.setVchId("Ch10"); + var derived = new SimpleChannelDto(); + derived.setVchId("Point10"); + derived.setSourceVchId("Ch10"); + waveform.setChannels(List.of(input, derived)); + + var aggregate = new DashboardResultDto(); + aggregate.setId(2L); + aggregate.setPrimaryCode("LwZ"); + aggregate.setProviderDefined(true); + var soundPower = new SimpleChannelDto(); + soundPower.setVchId("LwZ"); + aggregate.setChannels(List.of(soundPower)); + + var legacy = new DashboardResultDto(); + legacy.setId(3L); + legacy.setChannels(List.of()); + + Map> assigned = ReflectionTestUtils.invokeMethod(service, "assignChannelsToResults", + List.of("Ch10"), List.of(waveform, aggregate, legacy), "新增", ChannelIOEnum.INPUT); + + assertEquals(Map.of(1L, Set.of("Ch10", "Point10"), 3L, Set.of("Ch10")), assigned); + } + @ParameterizedTest @ValueSource(ints = {4, 9, 12}) - @SuppressWarnings("unchecked") void typeChangeRetainsCustomMeterCardAndAllSelectedResults(int graphicType) { + verifyTypeChange(graphicType, false); + } + @Test void unboundNeighborCardDoesNotBreakChannelMembershipSynchronization() { + verifyTypeChange(GraphicTypeEnum.SINGLE_VALUE.getType(), true); + } + @SuppressWarnings("unchecked") + private void verifyTypeChange(int graphicType, boolean includeUnboundCard) { GraphicConfigService service = spy(new GraphicConfigService()); DashboardResultService results = mock(DashboardResultService.class); GraphicResultCodeService bindings = mock(GraphicResultCodeService.class); @@ -121,7 +151,17 @@ void typeChangeRetainsCustomMeterCardAndAllSelectedResults(int graphicType) { binding.setUnit(JSONUtil.toJsonStr(List.of(unit))); stored.add(binding); } - doReturn(List.of(graphic)).when(service).list(any(GraphicConfigQuery.class)); + var graphics = new ArrayList(); + graphics.add(graphic); + if (includeUnboundCard) { + var unbound = new GraphicConfig(); + unbound.setId(902L); unbound.setProjectId(1L); unbound.setDashboardId(100L); + unbound.setAlgorithmCode(AlgorithmEnum.SOUND_LEVEL_METER.getCode()); + unbound.setGraphicType(GraphicTypeEnum.SINGLE_VALUE.getType()); + unbound.setChartConfig(graphic.getChartConfig()); + graphics.add(unbound); + } + doReturn(graphics).when(service).list(any(GraphicConfigQuery.class)); when(results.listDto(any(DashboardResultQuery.class))).thenReturn(catalog); when(bindings.list(any(GraphicResultCodeQuery.class))).thenReturn(stored); when(context.buildFromAlgorithmCodes(any())).thenReturn(new DefaultDashboardResultConfigContext(Map.of(), Map.of())); diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/LegacyAxisReadNormalizerTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/LegacyAxisReadNormalizerTest.java index 6bd0fcc2..c0e7a722 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/LegacyAxisReadNormalizerTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/LegacyAxisReadNormalizerTest.java @@ -1665,6 +1665,35 @@ void rejectsStableMarkersBeforeDeferringSpecialCurves() { LegacyAxisReadContext.current())); } + @Test + void displaysUnboundTimeHistoryWithoutInventingAnAxisOrABinding() { + String legacy = """ + {"chartType":"line","code":"LwZ","line":{ + "xAxis":{"unit":"s","enable":true},"yAxis":{"enable":true},"yRightAxis":{"enable":false}}} + """; + String frozenSnapshot = """ + {"chartType":"line","code":"LwZ","line":{"xAxis":{"unit":"s","enable":true},"yAxes":[]}} + """; + String display = """ + {"legend":{"show":false},"yAxesByKey":{"removed-axis":{"start":40}}} + """; + for (String chart : List.of(legacy, frozenSnapshot)) { + var read = normalizer().normalizeForDisplay( + GraphicTypeEnum.TIME_HISTORY_CURVE.getType(), chart, List.of(), display, null, + LegacyAxisReadContext.historyReadOnly(9001L, null, null, "simplified_method"), false); + + assertFalse(read.isCarrier()); + assertNotNull(read.getAxisPlan()); + assertEquals(List.of(), read.getAxisPlan().getYAxes()); + assertEquals(List.of(), read.getAxisPlan().getResultBindings()); + assertEquals(List.of(), read.getAxisPlan().getRenderDataBindings()); + assertNull(read.getAxisPlan().getDisplayYAxis()); + JSONObject settings = JSONUtil.parseObj(read.getAxisPlan().getGraphDisplaySettings()); + assertTrue(settings.getJSONObject("yAxesByKey").isEmpty()); + assertFalse(settings.getJSONObject("legend").getBool("show")); + } + } + @Test void rejectsEmptyBindingsWhenRawStableContainerFieldsArePresent() { LineChartConfig storedChart = legacyLineChart("Pa", null); @@ -1678,6 +1707,9 @@ void rejectsEmptyBindingsWhenRawStableContainerFieldsArePresent() { null, null, LegacyAxisReadContext.current())); + assertThrows(IllegalArgumentException.class, () -> normalizer().normalizeForDisplay( + GraphicTypeEnum.TIME_HISTORY_CURVE.getType(), rawChart.toString(), List.of(), + null, null, LegacyAxisReadContext.current(), false)); } @Test diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/component/dashboard/ProviderHistoricalValueGraphicTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/component/dashboard/ProviderHistoricalValueGraphicTest.java index a88a9ba6..60230a5f 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/component/dashboard/ProviderHistoricalValueGraphicTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/component/dashboard/ProviderHistoricalValueGraphicTest.java @@ -73,6 +73,13 @@ void valueGraphicsReadSavedTimeSeriesWithoutAddingADisplayAxis(GraphicTypeEnum t verifyNoInteractions(fixture.contracts, fixture.conversion); } + @Test + void valueGraphicUsesFrozenMemberAxisWhenNoCustomAxisWasSaved() { + var fixture = new Fixture("s"); + fixture.result.setCustomUnitX(null); + fixture.assertFilesSelected(fixture.render(GraphicTypeEnum.HORIZONTAL_BAR, "")); + } + @ParameterizedTest @NullAndEmptySource void absentDisplayAxisUsesTheSavedAxisRatherThanAssumingSeconds(String displayAxis) { diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/CurrentDefinitionExcitationTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/CurrentDefinitionExcitationTest.java index ab2aaffa..9d6fd5d9 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/CurrentDefinitionExcitationTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/CurrentDefinitionExcitationTest.java @@ -6,7 +6,12 @@ import com.opentest.dal.mapper.sqlite.DashboardResultMapper; import com.opentest.dashboard.api.channel.ChannelCatalog; import com.opentest.plugin.api.MeasurementDefinitionFacts; +import com.opentest.dashboard.api.definition.ResultType; import com.opentest.dashboard.api.measurement.TableDefinition; +import com.opentest.dashboard.api.measurement.TableDefinitionQuery; +import com.opentest.dashboard.api.measurement.TableReferenceLocation; +import com.opentest.dashboard.api.measurement.TableReferenceSelection; +import com.opentest.dashboard.api.measurement.TableResultIdentity; import com.opentest.service.BoxChannelService; import com.opentest.service.ExcitationConfigService; import com.opentest.service.GraphicConfigService; @@ -72,6 +77,22 @@ void algorithmPreflightResolvesOldAndNewExcitationsWithoutChangingSavedConfigura assertEquals("{\"playConfig\":{\"excitationId\":\"9\"}}", previous.getHandlerConfig()); } + @Test + void algorithmReadDoesNotReplanSavedResultReferences() { + var oldReference = new TableDefinitionQuery.CurrentReference(new TableReferenceLocation.Limit(8L), 7L, + new TableResultIdentity.Catalog("Retired", ResultType.VALUE, "0"), + new TableReferenceSelection.Limit("OldMember", null), null); + var snapshot = new TableIdentityDefinitionReconciliationService.Snapshot( + current, List.of(), List.of(), List.of(oldReference), Map.of(), Map.of(), Map.of(), Map.of()); + when(reconciler.snapshot(current)).thenReturn(snapshot); + when(excitations.findById(10L)).thenReturn(excitation(10L, "dBFS")); + when(providers.resolveDefinition(eq(current.getProviderId()), any(MeasurementDefinitionFacts.class), + any(MeasurementDefinitionFacts.class), eq(List.of()), eq(List.of()), isNull(), eq(false))) + .thenReturn(declared); + + assertEquals(declared, definitions.readDefinition(current)); + } + @Test void synchronizationSuppliesUnitsButDoesNotPersistTheTransientExcitation() { when(excitations.findById(10L)).thenReturn(excitation(10L, "dBFS")); diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/RecorderGraphicHistoryTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/RecorderGraphicHistoryTest.java index 0ec8bb74..4b0ad094 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/RecorderGraphicHistoryTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/RecorderGraphicHistoryTest.java @@ -3,6 +3,8 @@ import cn.hutool.core.bean.BeanUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.opentest.common.enums.AxisSide; +import com.opentest.common.enums.GraphicTypeEnum; +import com.opentest.common.model.dto.GraphicResultCodeDto; import com.opentest.common.model.dto.FlowExecuteSnapshotDataDto; import com.opentest.common.model.dto.GraphicConfigDto; import com.opentest.common.model.dto.GraphicConfigSnapshotDto; @@ -78,6 +80,16 @@ class RecorderGraphicHistoryTest { context.close(); } + @Test void retainedEmptySpectrumTitleDoesNotCreateAnIdentityFreeHistoryCarrier() { + var snapshot = new GraphicConfigSnapshot(); + snapshot.setId(71L); + snapshot.setGraphicType(GraphicTypeEnum.FREQUENCY_DOMAIN_CURVE.getType()); + snapshot.setResultCode("K1 Spectrum"); + List bindings = ReflectionTestUtils.invokeMethod( + new GraphicConfigSnapshotService(), "resolveSnapshotResultCodes", snapshot, List.of()); + assertEquals(List.of(), bindings); + } + @ParameterizedTest @ValueSource(strings = {"Ch1", "Math3", "Math8"}) void selectedMembersSurvivePublicationStorageStrictHistoryArtifactsAndExport(String selected) { diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableIdentityIncrementalGraphicTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableIdentityIncrementalGraphicTest.java index b643cb50..8fc8cab3 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableIdentityIncrementalGraphicTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableIdentityIncrementalGraphicTest.java @@ -17,6 +17,7 @@ import org.mockito.InOrder; import com.opentest.dashboard.api.definition.DomainType; import com.opentest.dashboard.api.definition.GraphicType; +import com.opentest.dashboard.api.definition.ResultChannelDefinition; import com.opentest.dashboard.api.definition.ResultSetDefinition; import com.opentest.dashboard.api.definition.ResultType; import com.opentest.dashboard.api.measurement.TableDefinition; @@ -33,6 +34,8 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; class TableIdentityIncrementalGraphicTest { @Test void createsIncrementalGraphicAfterResultCoordinationAndAppendsLayoutSort() { @@ -101,4 +104,69 @@ class TableIdentityIncrementalGraphicTest { assertEquals(41L, persistedBinding.getValue().getDashboardResultId()); assertEquals(91L, persistedBinding.getValue().getGraphicConfigId()); } + + @Test void restoresRetainedDefaultBarOnceAndDoesNotRecreateAnAlreadyDeclaredDeletedCard() { + var dashboards = mock(DashboardConfigMapper.class); + var results = mock(DashboardResultMapper.class); + var graphics = mock(GraphicConfigMapper.class); + var bindings = mock(GraphicResultCodeMapper.class); + var planner = mock(DashboardDefinitionGraphicPlanner.class); + var mapper = new ObjectMapper(); + var service = new TableIdentityDefinitionReconciliationService(dashboards, results, + graphics, bindings, mapper, planner); + var dashboard = new DashboardConfig(); + dashboard.setId(3L); dashboard.setTenantId(1L); dashboard.setProjectId(2L); + dashboard.setProviderId("sound-power-tools:sound-power-measure"); dashboard.setHandlerConfig("{}"); + when(dashboards.selectById(3L)).thenReturn(dashboard); + when(dashboards.update(isNull(), any())).thenReturn(1); + when(results.update(isNull(), any())).thenReturn(1); + when(bindings.insert(any(GraphicResultCode.class))).thenReturn(1); + + var identity = new TableResultIdentity.Catalog("LZeq", ResultType.VALUE, "0"); + var members = List.of("Ch1", "Ch2", "Average"); + var content = new ResultSetDefinition("LZeq", "hash", "result.lzeq", ResultType.VALUE, + DomainType.TIME_DOMAIN, List.of(), Map.of(), members.stream() + .map(id -> new ResultChannelDefinition(id, id)).toList(), Map.of()); + var definition = new TableDefinition(List.of(new TableDefinition.CatalogResult(identity, content)), + List.of(), null, List.of(), "simplified_method", List.of(), + List.of(), List.of(new TableDefinition.DefaultGraphic( + List.of(new TableDefinition.Binding(identity, null)), GraphicType.HORIZONTAL_BAR))); + var row = new DashboardResult(); + row.setId(41L); row.setTenantId(1L); row.setProjectId(2L); row.setDashboardId(3L); + row.setPrimaryCode("LZeq"); row.setResultType(ResultType.VALUE.ordinal()); + row.setBoxId("0"); row.setHash("hash"); row.setAlgorithmCode("simplified_method"); + var current = new TableDefinitionQuery.CurrentResult(41L, identity, content, "simplified_method", false); + var bar = new GraphicConfig(); + bar.setId(80L); + bar.setGraphicType(GraphicType.HORIZONTAL_BAR.ordinal()); + bar.setResultCode("LZeq"); + bar.setChartConfig("{\"chartType\":\"horizontalBar\",\"code\":\"LZeq\"}"); + var snapshot = new TableIdentityDefinitionReconciliationService.Snapshot(dashboard, + List.of(row), List.of(current), List.of(), Map.of(80L, bar), Map.of(), Map.of(), Map.of()); + when(graphics.selectList(any())).thenReturn(List.of(bar), List.of(bar), List.of()); + var retained = new GraphicResultCode(); + retained.setGraphicConfigId(80L); + retained.setDashboardResultId(41L); + when(bindings.selectList(any())).thenReturn(List.of(), List.of(retained)); + var planned = new GraphicResultCodeDto(); + planned.setDashboardResultId(41L); + planned.setChannelIds(members); + when(planner.plan(anyString(), any(), eq(2L), any(), + eq(List.of(new DashboardDefinitionGraphicPlanner.ResultTarget(41L, content, members))))) + .thenReturn(new DashboardDefinitionGraphicPlanner.PlannedGraphic(bar.getChartConfig(), null, List.of(planned))); + + service.apply(snapshot, dashboard.getProviderId(), mapper.createObjectNode(), definition, null, false); + service.apply(snapshot, dashboard.getProviderId(), mapper.createObjectNode(), definition, null, false); + + service.apply(snapshot, dashboard.getProviderId(), mapper.createObjectNode(), definition, null, false); + + var binding = ArgumentCaptor.forClass(GraphicResultCode.class); + verify(bindings).insert(binding.capture()); + assertEquals(80L, binding.getValue().getGraphicConfigId()); + assertEquals(41L, binding.getValue().getDashboardResultId()); + assertEquals(String.join(",", members), binding.getValue().getChannelIds()); + verify(graphics, never()).insert(any(GraphicConfig.class)); + verify(graphics, never()).update(any(), any()); + } + } diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableReferenceUnitContinuationTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableReferenceUnitContinuationTest.java index 782c4300..67b7165b 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableReferenceUnitContinuationTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/dashboard/framework/TableReferenceUnitContinuationTest.java @@ -35,6 +35,8 @@ import com.opentest.dashboard.api.unit.GraphicUnitResolution; import com.opentest.service.BoxChannelService; import com.opentest.service.axis.DefaultAxisContractPlanner; +import com.opentest.service.axis.LegacyAxisReadNormalizer; +import com.opentest.service.axis.LegacyAxisReadContext; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; @@ -331,7 +333,11 @@ void migrationPreservesAnUnaffectedBindingAndItsRightAxisInTheSameGraphic(String dashboard.getProjectId(), graphic, List.of(row), Map.of(row.getId(), List.of())); assertNotNull(plan); assertTrue(plan.bindings().isEmpty()); - assertTrue(ChartConfigStorageCodec.decode(plan.chartConfig(), BaseChartConfig.class).getYAxes().isEmpty()); + var remainingAxes = ChartConfigStorageCodec.decode(plan.chartConfig(), BaseChartConfig.class).getYAxes(); + assertTrue(remainingAxes == null || remainingAxes.isEmpty()); + new LegacyAxisReadNormalizer(new DefaultAxisContractPlanner()).normalizeForRead( + graphic.getGraphicType(), plan.chartConfig(), plan.bindings(), plan.graphDisplaySettings(), + null, LegacyAxisReadContext.current(), false); } @Test void anEmptyResultPlaceholderPromotesTheRemainingAxisWithoutChangingItsIdentity() throws Exception { diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/grpc/provider/ProviderCaptureStagesTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/grpc/provider/ProviderCaptureStagesTest.java index 9bad3f1e..15a3b62a 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/grpc/provider/ProviderCaptureStagesTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/grpc/provider/ProviderCaptureStagesTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; @@ -40,6 +41,16 @@ class ProviderCaptureStagesTest { private static final CaptureStageRequest REQUEST = new CaptureStageRequest(List.of("Ch1")); + @Test void stageInheritsRecordOwnershipInsteadOfInferringItFromARequestId() { + var parent = mock(ProviderPipelineDashboardHandler.class); + var child = new ProviderPipelineDashboardHandler(); + child.setRequestId(71L); + ReflectionTestUtils.setField(child, "stageParent", parent); + when(parent.hasExecutionRecord()).thenReturn(false, true); + assertFalse(child.hasExecutionRecord()); + assertTrue(child.hasExecutionRecord()); + } + @Test void freshStagesShareOwnerButWaitForActualRecorderRelease() throws Exception { var f = new Fixture(); f.attach(); var first = f.stages.prepare(REQUEST); assertEquals(List.of("Ch1"), first.channels().stream().map(ChannelMetadata::vchId).toList()); diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFilePublicationJournalTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFilePublicationJournalTest.java index 18e1dca5..d157abd7 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFilePublicationJournalTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFilePublicationJournalTest.java @@ -120,6 +120,26 @@ class SharedFilePublicationJournalTest { assertArrayEquals(selectedBytes, Files.readAllBytes(temporary.resolve(selected))); assertEquals("STAGING", sql.queryForObject("SELECT phase FROM shared_file_publication_batch " + "WHERE publication_id=?", String.class, retry.publicationId())); + journal.abortStagingBatch(List.of(retry)); + + sql.update("UPDATE file SET tenant_id=2 WHERE id=?", first.selectedFileId()); + assertThrows(IllegalStateException.class, () -> journal.begin(owner, business, logical, manager)); + sql.update("UPDATE file SET tenant_id=1 WHERE id=?", first.selectedFileId()); + + var replacement = journal.begin(owner, business, logical, manager); + assertNotEquals(first.selectedFileId(), replacement.selectedFileId()); + String replacementPath = replacement.candidateBase().replace(".crybin", "_1.crybin"); + write(replacementPath, new byte[]{2}); + journal.publish(replacement, List.of(replacementPath), manager); + assertEquals(replacement.selectedFileId(), sql.queryForObject("SELECT id FROM file " + + "WHERE business_id=? AND wait_del=0", Long.class, business)); + assertEquals(1, sql.queryForObject("SELECT wait_del FROM file WHERE id=?", Integer.class, + first.selectedFileId())); + assertArrayEquals(selectedBytes, Files.readAllBytes(temporary.resolve(selected))); + + var next = journal.begin(owner, business, logical, manager); + assertEquals(replacement.selectedFileId(), next.selectedFileId()); + journal.abortStagingBatch(List.of(next)); } } diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFlatFilePublicationJournalTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFlatFilePublicationJournalTest.java index cb2272d7..4b3ee7e9 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFlatFilePublicationJournalTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/recording/measurement/SharedFlatFilePublicationJournalTest.java @@ -25,7 +25,7 @@ class SharedFlatFilePublicationJournalTest { sql.execute("CREATE TABLE file (id BIGINT PRIMARY KEY,tenant_id BIGINT,created_time TEXT," + "updated_time TEXT,business_id TEXT NOT NULL,request_id BIGINT,business_type INTEGER NOT NULL," + "file_name TEXT,file_url TEXT,type INTEGER NOT NULL,shards_no INTEGER,wait_del INTEGER NOT NULL DEFAULT 0," - + "temporary_result INTEGER NOT NULL DEFAULT 0 CHECK (temporary_result IN (0,1)))"); + + "storage_root TEXT,temporary_result INTEGER NOT NULL DEFAULT 0 CHECK (temporary_result IN (0,1)))"); sql.execute("CREATE TABLE dashboard_result (id BIGINT PRIMARY KEY,tenant_id BIGINT,project_id BIGINT," + "dashboard_id BIGINT,request_id BIGINT,primary_code TEXT,hash TEXT)"); sql.update("INSERT INTO dashboard_result VALUES (71,1,10,20,NULL,'Background Noise 1/1 Octave','saved-hash')"); @@ -73,7 +73,14 @@ class SharedFlatFilePublicationJournalTest { assertEquals(candidate, sql.queryForObject("SELECT file_url FROM file WHERE id=99", String.class)); assertNull(sql.queryForObject("SELECT tenant_id FROM file WHERE id=99", Long.class)); assertArrayEquals(oldBytes, Files.readAllBytes(temporary.resolve(oldShard))); - assertDoesNotThrow(() -> journal.begin(owner, business, logical, manager)); + sql.update("UPDATE file SET wait_del=1 WHERE id=99"); + var replacement = journal.begin(owner, business, logical, manager); + assertNotEquals(99, replacement.selectedFileId()); + String replacementPath = replacement.candidateBase().replace(".crybin", "_1.crybin"); + Files.write(temporary.resolve(replacementPath), oldBytes); + journal.publish(replacement, List.of(replacementPath), manager); + assertEquals(candidate, sql.queryForObject("SELECT file_url FROM file WHERE id=99", String.class)); + assertArrayEquals(oldBytes, Files.readAllBytes(temporary.resolve(candidate))); } } } diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java index 1f74fc74..36f73f15 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java @@ -119,7 +119,7 @@ private static Path migration(String name) { ReflectionTestUtils.setField(service, "archiveCleanupExecutor", (Executor) cleanups::add); ReflectionTestUtils.setField(service, "providerConfigurations", authors); ReflectionTestUtils.setField(service, "reportProviders", (ReportProviderCatalog) id -> "test:measure".equals(id) - ? Optional.of(new ReportProviderCatalog.Descriptor(id, "soundPowerTesting")) : Optional.empty()); + ? Optional.of(new ReportProviderCatalog.Descriptor(id, "soundPower")) : Optional.empty()); var project = new Project(); project.setId(10L); when(projects.selectById(10L)).thenReturn(project); module = new DashboardConfig(); module.setId(20L); module.setProjectId(10L); module.setProviderId("test:measure"); module.setName("Frozen module"); when(dashboards.selectById(20L)).thenReturn(module); when(dashboards.selectList(any())).thenReturn(List.of(module)); diff --git a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/EngineeringSoundPowerOptions.java b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/EngineeringSoundPowerOptions.java index 2cc417e3..0d32f7ab 100644 --- a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/EngineeringSoundPowerOptions.java +++ b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/EngineeringSoundPowerOptions.java @@ -5,4 +5,19 @@ public record EngineeringSoundPowerOptions(int surfaceType, int calculationType, Double sphereRadius, Double measureDistance, Double length, Double width, Double height, Double cylinderMeasureDistance1, Double cylinderMeasureDistance2, Double cylinderMeasureDistance3, Double roomSurface, Double absorptionCoefficient, Double temperature, Double humidity, - Double atmosphericPressure) { } + Double atmosphericPressure, Double measurementSurfaceArea) { + public EngineeringSoundPowerOptions { + if (surfaceType == -1 && (measurementSurfaceArea == null || !Double.isFinite(measurementSurfaceArea) || measurementSurfaceArea <= 0) + || surfaceType != -1 && measurementSurfaceArea != null) + throw new IllegalArgumentException("Explicit area requires surface -1 and a finite positive area in m²"); + } + public EngineeringSoundPowerOptions(int surfaceType, int calculationType, + Double sphereRadius, Double measureDistance, Double length, Double width, Double height, + Double cylinderMeasureDistance1, Double cylinderMeasureDistance2, Double cylinderMeasureDistance3, + Double roomSurface, Double absorptionCoefficient, Double temperature, Double humidity, + Double atmosphericPressure) { + this(surfaceType, calculationType, sphereRadius, measureDistance, length, width, height, + cylinderMeasureDistance1, cylinderMeasureDistance2, cylinderMeasureDistance3, + roomSurface, absorptionCoefficient, temperature, humidity, atmosphericPressure, null); + } +} diff --git a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/SoundPowerSurveyOptions.java b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/SoundPowerSurveyOptions.java index 6352bd19..721289c5 100644 --- a/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/SoundPowerSurveyOptions.java +++ b/apps/backend/opentest-algorithm-api/src/main/java/com/opentest/algorithm/api/SoundPowerSurveyOptions.java @@ -2,4 +2,20 @@ /** Pure numerical surface/environment operands; nullable parameters retain the native contract. */ public record SoundPowerSurveyOptions(int surfaceType, Double sphereRadius, Double measureDistance, - Double length, Double width, Double height, Double roomSurface, Double absorptionCoefficient) { } + Double length, Double width, Double height, Double roomSurface, Double absorptionCoefficient, + Double measurementSurfaceArea) { + public SoundPowerSurveyOptions { + if (surfaceType == -1 && (measurementSurfaceArea == null || !Double.isFinite(measurementSurfaceArea) || measurementSurfaceArea <= 0) + || surfaceType != -1 && measurementSurfaceArea != null) + throw new IllegalArgumentException("Explicit area requires surface -1 and a finite positive area in m²"); + } + public SoundPowerSurveyOptions(int surfaceType, Double sphereRadius, Double measureDistance, + Double length, Double width, Double height, Double roomSurface, Double absorptionCoefficient) { + this(surfaceType, sphereRadius, measureDistance, length, width, height, roomSurface, absorptionCoefficient, null); + } + + /** Area in m²; no synthetic geometry is required. Requires the explicit-area native runtime. */ + public static SoundPowerSurveyOptions withArea(double area, Double roomSurface, Double absorptionCoefficient) { + return new SoundPowerSurveyOptions(-1, null, null, null, null, null, roomSurface, absorptionCoefficient, area); + } +} diff --git a/apps/backend/opentest-dashboard-api/src/main/java/com/opentest/dashboard/api/measurement/TableDefinition.java b/apps/backend/opentest-dashboard-api/src/main/java/com/opentest/dashboard/api/measurement/TableDefinition.java index e6f73df0..53c09e80 100644 --- a/apps/backend/opentest-dashboard-api/src/main/java/com/opentest/dashboard/api/measurement/TableDefinition.java +++ b/apps/backend/opentest-dashboard-api/src/main/java/com/opentest/dashboard/api/measurement/TableDefinition.java @@ -7,7 +7,20 @@ public record TableDefinition(List catalogResults, List manualResults, NewManualResult newManualResult, List firstCreateGraphics, String algorithmCode, - List continuations) { + List continuations, + List restoreUnboundHorizontalBars, + List reconcileDefaultGraphics) { + public TableDefinition(List catalogResults, List manualResults, + NewManualResult newManualResult, List firstCreateGraphics, String algorithmCode, + List continuations, List restoreUnboundHorizontalBars) { + this(catalogResults, manualResults, newManualResult, firstCreateGraphics, algorithmCode, + continuations, restoreUnboundHorizontalBars, List.of()); + } + public TableDefinition(List catalogResults, List manualResults, + NewManualResult newManualResult, List firstCreateGraphics, String algorithmCode, + List continuations) { + this(catalogResults, manualResults, newManualResult, firstCreateGraphics, algorithmCode, continuations, List.of()); + } public TableDefinition(List catalogResults, List manualResults, NewManualResult newManualResult, List firstCreateGraphics) { this(catalogResults, manualResults, newManualResult, firstCreateGraphics, null, List.of()); @@ -22,6 +35,8 @@ public TableDefinition(List catalogResults, List(); @@ -40,6 +55,19 @@ public TableDefinition(List catalogResults, List(); + for (var binding : restoreUnboundHorizontalBars) { + if (!(binding.result() instanceof TableResultIdentity.Catalog) || !available.contains(binding.result()) + || !restored.add(binding.result())) + throw new IllegalArgumentException("Invalid or duplicate unbound horizontal bar target"); + } + // One existing catalog result and chart type identify a default card placement. + for (var graphic : reconcileDefaultGraphics) { + if (graphic.bindings().size() != 1 + || !(graphic.bindings().getFirst().result() instanceof TableResultIdentity.Catalog key) + || !catalog.contains(key)) + throw new IllegalArgumentException("Reconciled default graphic needs one available catalog result"); + } var sources = new LinkedHashSet(); for (var continuation : continuations) { if (!sources.add(continuation.source())) diff --git a/apps/desktop/src/report-pdf-export.js b/apps/desktop/src/report-pdf-export.js index 87a8dcc5..fcfcf4f1 100644 --- a/apps/desktop/src/report-pdf-export.js +++ b/apps/desktop/src/report-pdf-export.js @@ -56,7 +56,7 @@ function registerReportPdfExportHandler({ ipcMain, BrowserWindow, mainWindow, de printWindow.webContents.on('will-navigate', blockNavigation) printWindow.webContents.on('will-redirect', blockNavigation) // Fonts and images stay embedded; CSP blocks external resources. - const policy = `` + const policy = `` const html = /]*)?>/i.test(options.html) ? options.html.replace(/]*)?>/i, match => match + policy) : policy + options.html diff --git a/apps/desktop/tests/unit/report-pdf-export.test.mjs b/apps/desktop/tests/unit/report-pdf-export.test.mjs index 6fae9cab..28349791 100644 --- a/apps/desktop/tests/unit/report-pdf-export.test.mjs +++ b/apps/desktop/tests/unit/report-pdf-export.test.mjs @@ -106,6 +106,14 @@ it('loads large embedded report content from a temporary file instead of an over expect(printed.content).toContain("font-src data:") expect(readdirSync(env.temporaryRoot)).toEqual([]) }) +it.each(['fragment', 'document'])('declares UTF-8 before embedded fonts for a multilingual %s', async kind => { + const content = `

声功率 31.46 m²

` + const html = kind === 'document' ? `${content}` : content + await env.api.exportReportPdf({ html }) + const printed = env.latest().content + expect(printed.slice(0, 1024)).toContain('') + expect(printed).toContain('声功率 31.46 m²') +}) it.each(['foreign-origin', 'iframe', 'unregistered', 'detached-frame', 'empty-content'])('rejects %s before creating a print window', async reason => { env.sender(env.child) if (reason === 'foreign-origin') env.child.webContents.mainFrame.url = 'https://foreign.example/'