diff --git a/services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java b/services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java index 746d364850e01523509e3406e671c0e21fde79c1..fade2b05612d66d8489bd351486c6aa6865c64b4 100644 --- a/services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java +++ b/services/calculs/src/main/java/org/mte/numecoeval/calculs/domain/data/demande/DemandeCalculImpactOperationNonIT.java @@ -72,7 +72,9 @@ public class DemandeCalculImpactOperationNonIT { return facteurCaracterisations.stream() .filter(Objects::nonNull) .filter(fc -> Constants.ELECTRICITY_MIX_CATEGORY.equals(fc.getCategorie()) && - localisation.equals(fc.getLocalisation())) + localisation.equals(fc.getLocalisation()) && + critere.getNomCritere().equals(fc.getCritere()) + ) .findFirst(); } diff --git a/services/calculs/src/test/java/org/mte/numecoeval/calculs/domain/service/CalculImpactOperationNonITServiceTest.java b/services/calculs/src/test/java/org/mte/numecoeval/calculs/domain/service/CalculImpactOperationNonITServiceTest.java index e9340db028c3166bec2728721e8cece2ed24ae7c..9e9b31c4be2e802bd79312b5e7e3e3da5d543cef 100644 --- a/services/calculs/src/test/java/org/mte/numecoeval/calculs/domain/service/CalculImpactOperationNonITServiceTest.java +++ b/services/calculs/src/test/java/org/mte/numecoeval/calculs/domain/service/CalculImpactOperationNonITServiceTest.java @@ -247,6 +247,14 @@ class CalculImpactOperationNonITServiceTest { "valeur": 10, "source": "SSG" }, + { + "nom": "Electricty Mix FR", + "etape": "FABRICATION", + "critere": "Acidification", + "categorie" : "electricity-mix", + "localisation": "France", + "valeur" : 0.02 + }, { "nom": "Electricty Mix FR", "etape": "FABRICATION",