From 8d85e4c692ec46979416bf47e899979750687e9f Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 6 Jan 2026 16:37:46 +0100 Subject: [PATCH] Refactor `ShippingFrequencyCalculationService`: Adjust container calculation logic to ensure `minAnnualFrequency` is respected when `fillContainer` is true. --- .../steps/ShippingFrequencyCalculationService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java index 3b4e78d..7f78659 100644 --- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java +++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java @@ -17,10 +17,10 @@ public class ShippingFrequencyCalculationService { int minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue()); int maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue()); - var fullContainers = huAnnualAmount / maxHuPerContainer; - - if(fillContainer && huAnnualAmount > (double) maxAnnualFrequency) - return fullContainers; + if (fillContainer) { + var fullContainers = huAnnualAmount / maxHuPerContainer; + return fullContainers > minAnnualFrequency ? fullContainers : minAnnualFrequency; + } if (huAnnualAmount > (double) maxAnnualFrequency) return maxAnnualFrequency;