Merge branch 'cherry-pick-2ada84c8' into 'main'

[SOY] bug corrected

See merge request !24

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();
     }
 

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",