AER-2979 Validating additional systems based on housing (#271)

Data apparantly also contains additional systems that should only be used for one specific housing category. As that is more specific, it's better to always check on housing category over the animal category.
aerius · May 24, 2024 · 8f705ed · 8f705ed
1 parent 1511d09
commit 8f705ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...r-util/src/main/java/nl/overheid/aerius/validation/FarmAnimalHousingValidationHelper.java b/...r-util/src/main/java/nl/overheid/aerius/validation/FarmAnimalHousingValidationHelper.java
@@ -28,7 +28,7 @@ public interface FarmAnimalHousingValidationHelper {
 
   boolean isValidFarmAdditionalSystemCode(String systemCode);
 
-  boolean isValidFarmAdditionalSystemCombination(String animalCode, String systemCode);
+  boolean isValidFarmAdditionalSystemCombination(String housingCode, String systemCode);
 
   FarmEmissionFactorType getAnimalHousingEmissionFactorType(final String animalHousingCode);
 

diff --git a/...ce/imaer-util/src/main/java/nl/overheid/aerius/validation/FarmAnimalHousingValidator.java b/...ce/imaer-util/src/main/java/nl/overheid/aerius/validation/FarmAnimalHousingValidator.java
@@ -75,7 +75,7 @@ private boolean validateStandardAnimalHousing(final StandardFarmAnimalHousing su
       valid = false;
     } else {
       valid = validateNumberOfDays(subSource, sourceId) && valid;
-      valid = validateAdditionalSystems(subSource.getAdditionalSystems(), animalCode, sourceId) && valid;
+      valid = validateAdditionalSystems(subSource.getAdditionalSystems(), housingCode, sourceId) && valid;
     }
     return valid;
   }
@@ -86,11 +86,11 @@ private boolean validateNumberOfDays(final StandardFarmAnimalHousing subSource,
     return FarmEmissionFactorTypeValidatorUtil.validate(EXPECTED_EMISSION_FACTOR_TYPES, emissionFactorType, subSource, sourceId, getErrors());
   }
 
-  private boolean validateAdditionalSystems(final List<AdditionalHousingSystem> additionalSystems, final String animalCode, final String sourceId) {
+  private boolean validateAdditionalSystems(final List<AdditionalHousingSystem> additionalSystems, final String housingCode, final String sourceId) {
     boolean valid = true;
     for (final AdditionalHousingSystem additionalSystem : additionalSystems) {
       if (additionalSystem instanceof final StandardAdditionalHousingSystem standardSystem) {
-        valid = validateStandardAdditionalSystem(standardSystem, animalCode, sourceId) && valid;
+        valid = validateStandardAdditionalSystem(standardSystem, housingCode, sourceId) && valid;
       } else if (additionalSystem instanceof final CustomAdditionalHousingSystem customSystem) {
         valid = validateCustomAdditionalSystem(customSystem, sourceId) && valid;
       } else {
@@ -101,15 +101,15 @@ private boolean validateAdditionalSystems(final List<AdditionalHousingSystem> ad
     return valid;
   }
 
-  private boolean validateStandardAdditionalSystem(final StandardAdditionalHousingSystem standardSystem, final String animalCode,
+  private boolean validateStandardAdditionalSystem(final StandardAdditionalHousingSystem standardSystem, final String housingCode,
       final String sourceId) {
     final String code = standardSystem.getAdditionalSystemCode();
     boolean valid = true;
     if (!validationHelper.isValidFarmAdditionalSystemCode(code)) {
       getErrors().add(new AeriusException(ImaerExceptionReason.GML_UNKNOWN_ANIMAL_HOUSING_CODE, sourceId, code));
       valid = false;
-    } else if (!validationHelper.isValidFarmAdditionalSystemCombination(animalCode, code)) {
-      getErrors().add(new AeriusException(ImaerExceptionReason.GML_UNSUPPORTED_ANIMAL_HOUSING_COMBINATION, sourceId, animalCode, code));
+    } else if (!validationHelper.isValidFarmAdditionalSystemCombination(housingCode, code)) {
+      getErrors().add(new AeriusException(ImaerExceptionReason.GML_UNSUPPORTED_ANIMAL_HOUSING_COMBINATION, sourceId, housingCode, code));
       valid = false;
     }
     return valid;