From c36e22f70acff74f2593f329d56ae0fd74db90d3 Mon Sep 17 00:00:00 2001
From: LEMERCIER Denis <denis.lemercier@soprasteria.com>
Date: Thu, 13 Jun 2024 15:34:07 +0000
Subject: [PATCH] [SOY] bug corrected
---
.../data/demande/DemandeCalculImpactOperationNonIT.java | 4 +++-
.../service/CalculImpactOperationNonITServiceTest.java | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
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 746d3648..fade2b05 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 e9340db0..9e9b31c4 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",
--
GitLab