diff --git a/.gitignore b/.gitignore index 636867290d6bb1c14a23e5cdbfcfc20b3553834c..0d72066f7bb5117df1e05dd9e5b570131992bfb8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,10 +12,12 @@ target/ .settings .springBeans .sts4-cache +.idea/ ### IntelliJ IDEA ### *.iws *.ipr +*.iml ### NetBeans ### /nbproject/private/ diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactReseauMapper.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactReseauMapper.java index 82858eb7e733385d1cf1db62954ed986d88dcd8e..4bc31228316513146020b5470b7b82d481a354de 100644 --- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactReseauMapper.java +++ b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactReseauMapper.java @@ -39,7 +39,6 @@ public interface ImpactReseauMapper { List<ImpactReseau> toDomainsFromDTO(List<ImpactReseauDTO> dtos); @Mapping(target = "nom", source = "refReseau") - @Mapping(target = "niveau", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.RESEAU_NIVEAU)") @Mapping(target = "tiers", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.RESEAU_TIERS)") FacteurCaracterisation toFacteurCaracterisation(ImpactReseau impactReseau); diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/MixElectriqueMapper.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/MixElectriqueMapper.java index 1c71400c3e7a0b6d0dc2929ccbca45f16c2505a1..bbafcff07fb6487f139c1a6cd78474fbb82770ad 100644 --- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/MixElectriqueMapper.java +++ b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/MixElectriqueMapper.java @@ -33,7 +33,7 @@ public interface MixElectriqueMapper { MixElectriqueDTO toDTO(MixElectrique mixElectrique); @Mapping(target = "localisation", source = "pays") - @Mapping(target = "nom", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.MIXELEC_NOM" + " " + "+mixElectrique.getRaccourcisAnglais())") + @Mapping(target = "nom", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.MIXELEC_NOM_LOW_VOLTAGE + mixElectrique.getRaccourcisAnglais())") @Mapping(target = "etape", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.MIXELEC_ETAPEACV)") @Mapping(target = "niveau", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.MIXELEC_NIVEAU)") @Mapping(target = "categorie", expression = "java(org.mte.numecoeval.referentiel.utils.Constants.MIXELEC_CATEGORIE)") diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/utils/Constants.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/utils/Constants.java index 8a8f89312dc716010049ab6fcf15aa7814a081a6..27b7430f4e7a134e442d0c8d784d914db06572d7 100644 --- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/utils/Constants.java +++ b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/utils/Constants.java @@ -6,7 +6,7 @@ public class Constants { public static final String MIXELEC_NIVEAU = "0-Base data"; public static final String MIXELEC_CATEGORIE = "electricity-mix"; public static final String MIXELEC_ETAPEACV = "FABRICATION"; - public static final String MIXELEC_NOM = "Electricity Mix"; + public static final String MIXELEC_NOM_LOW_VOLTAGE = "Electricity Mix/ Production mix/ Low voltage/ "; public static final String RESEAU_NIVEAU = "3-System"; public static final String RESEAU_TIERS = "Network"; diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/domain/port/input/ImportFacteurCaracterisationPortTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/domain/port/input/ImportFacteurCaracterisationPortTest.java index dfbd2140235baf92eca6425fcfa2cd41b09eb25f..3054d4c1cd8722e7d0b58478070a155890260bb8 100644 --- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/domain/port/input/ImportFacteurCaracterisationPortTest.java +++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/domain/port/input/ImportFacteurCaracterisationPortTest.java @@ -24,7 +24,7 @@ public class ImportFacteurCaracterisationPortTest { assertEquals(4, resultatImport.getNbrLignesImportees()); assertEquals(0, resultatImport.getErreurs().size()); assertEquals(4, resultatImport.getObjects().size()); - String name = Constants.MIXELEC_NOM + " FR"; + String name = Constants.MIXELEC_NOM_LOW_VOLTAGE + "FR"; assertTrue(resultatImport.getObjects().stream().anyMatch(dto -> name.equals(dto.getNom()) && Constants.MIXELEC_ETAPEACV.equals(dto.getEtape()) @@ -81,7 +81,7 @@ public class ImportFacteurCaracterisationPortTest { assertTrue(resultatImport.getErreurs().stream().anyMatch("La ligne n°5 est invalide : La colonne etapeacv ne peut être vide"::equals)); assertTrue(resultatImport.getErreurs().stream().anyMatch("La ligne n°6 est invalide : La colonne critere ne peut être vide"::equals)); assertEquals(4, resultatImport.getObjects().size()); - String name = Constants.MIXELEC_NOM + " FR"; + String name = Constants.MIXELEC_NOM_LOW_VOLTAGE + "FR"; assertTrue(resultatImport.getObjects().stream().anyMatch(dto -> name.equals(dto.getNom()) && Constants.MIXELEC_ETAPEACV.equals(dto.getEtape()) diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactEquipementJpaAdapterTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactEquipementJpaAdapterTest.java index db3a2c9191945ec636ea91dce1bf349285e57460..97b140c9f6504b78b337879956450a560ad00233 100644 --- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactEquipementJpaAdapterTest.java +++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactEquipementJpaAdapterTest.java @@ -57,6 +57,7 @@ class ImpactEquipementJpaAdapterTest { .setNom(NOM) .setEtape(ETAPE) .setCritere(CRITERE) + .setNiveau(Constants.EQUIPEMENT_NIVEAU) .setSource("Test") .setConsoElecMoyenne(0.020) .setValeur(0.120); @@ -141,11 +142,16 @@ class ImpactEquipementJpaAdapterTest { @Test void save_shouldSaveAndReturnDomain() { var domain = impactEquipement(); - var expectedEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); - Mockito.when(repository.save(expectedEntity)).thenReturn(expectedEntity); + var actualEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); + var expectedEntity = facteurCaracterisationEntity(); + + assertEquals(expectedEntity.getNom(), actualEntity.getNom()); + assertEquals(expectedEntity.getNiveau(), actualEntity.getNiveau()); + + Mockito.when(repository.save(actualEntity)).thenReturn(actualEntity); assertDoesNotThrow(() -> jpaAdapter.save(domain)); - Mockito.verify(repository).save(expectedEntity); + Mockito.verify(repository).save(actualEntity); } @ParameterizedTest diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactReseauJpaAdapterTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactReseauJpaAdapterTest.java index c8af4ddbd8ed8aeb6efc39257530d87ad4cd96a0..3989ea4d167eee296eaf59ca87000040f0afb181 100644 --- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactReseauJpaAdapterTest.java +++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/ImpactReseauJpaAdapterTest.java @@ -140,11 +140,17 @@ class ImpactReseauJpaAdapterTest { @Test void save_shouldSaveAndReturnDomain() { var domain = impactReseau(); - var expectedEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); - Mockito.when(repository.save(expectedEntity)).thenReturn(expectedEntity); + var actualEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); + var expectedEntity = facteurCaracterisationEntity(); + + assertEquals(expectedEntity.getNom(), actualEntity.getNom()); + assertEquals(expectedEntity.getNiveau(), actualEntity.getNiveau()); + assertEquals(expectedEntity.getTiers(), actualEntity.getTiers()); + + Mockito.when(repository.save(actualEntity)).thenReturn(actualEntity); assertDoesNotThrow(() -> jpaAdapter.save(domain)); - Mockito.verify(repository).save(expectedEntity); + Mockito.verify(repository).save(actualEntity); } @ParameterizedTest diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/MixElectriqueJpaAdapterTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/MixElectriqueJpaAdapterTest.java index 3ad4e89ee2c2a4525c1158df547e74d4b88726d6..f06a4f596029bee7ae713c317a51124b5ecd20ad 100644 --- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/MixElectriqueJpaAdapterTest.java +++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/jpa/MixElectriqueJpaAdapterTest.java @@ -48,8 +48,9 @@ class MixElectriqueJpaAdapterTest { private FacteurCaracterisationEntity facteurCaracterisationEntity() { return new FacteurCaracterisationEntity() - .setNom("Electricity Mix FR") + .setNom(Constants.MIXELEC_NOM_LOW_VOLTAGE + "FR") .setNiveau(Constants.MIXELEC_NIVEAU) + .setEtape(Constants.MIXELEC_ETAPEACV) .setCategorie(Constants.MIXELEC_CATEGORIE) .setCritere(CRITERE) .setLocalisation(PAYS) @@ -138,13 +139,21 @@ class MixElectriqueJpaAdapterTest { } @Test - void save_shouldSaveAndReturnDomain() throws ReferentielException { + void save_shouldSaveAndReturnDomain() { var domain = mixelectrique(); - var expectedEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); - Mockito.when(repository.save(expectedEntity)).thenReturn(expectedEntity); + var actualEntity = facteurCaracterisationMapper.toEntity(mapper.toFacteurCaracterisation(domain)); + var expectedEntity = facteurCaracterisationEntity(); + + assertEquals(expectedEntity.getNom(), actualEntity.getNom()); + assertEquals(expectedEntity.getLocalisation(), actualEntity.getLocalisation()); + assertEquals(expectedEntity.getEtape(), actualEntity.getEtape()); + assertEquals(expectedEntity.getNiveau(), actualEntity.getNiveau()); + assertEquals(expectedEntity.getCategorie(), actualEntity.getCategorie()); + + Mockito.when(repository.save(actualEntity)).thenReturn(actualEntity); assertDoesNotThrow(() -> jpaAdapter.save(domain)); - Mockito.verify(repository).save(expectedEntity); + Mockito.verify(repository).save(actualEntity); } @ParameterizedTest diff --git a/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation.csv b/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation.csv index fc4971a4e025db26e87224c8054d41cd2c032ede..e9611bb43993df1da7a6ae5e307cece533f7b53e 100644 --- a/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation.csv +++ b/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation.csv @@ -1,5 +1,5 @@ nom;etapeacv;critere;description;niveau;tiers;categorie;consoElecMoyenne;localisation;valeur;unite;source -Electricity Mix FR;FABRICATION;Changement climatique;;0-Base data;;electricity-mix;;France;0.0813225;kWh;BaseImpact +Electricity Mix/ Production mix/ Low voltage/ FR;FABRICATION;Changement climatique;;0-Base data;;electricity-mix;;France;0.0813225;kWh;BaseImpact Laptop;DISTRIBUTION;Ressources use, minerals and metals;HP;2-Equipement;End-user/Terminals;Consultation;0.4;Allemagne;0.000882;Item;NegaOctet Blade server;DISTRIBUTION;Climate change;;2-Equipement;Datacenter;IT equipment;0.4;Allemagne;0.0092;Item;NegaOctet Mobile network;FABRICATION;Climate change;;3-System;Network;;0.8;;0.00000159;GB;NegaOctet diff --git a/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation_errorInMiddle.csv b/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation_errorInMiddle.csv index 01e507fd58de781abf7b4f1886f9c06a319e3604..a98bd5aa438cc6e1d384b3c532a8ce47e38f277a 100644 --- a/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation_errorInMiddle.csv +++ b/services/api-referentiel/src/test/resources/csv/unit/facteurCaracterisation_errorInMiddle.csv @@ -1,5 +1,5 @@ nom;etapeacv;critere;description;niveau;tiers;categorie;consoElecMoyenne;localisation;valeur;unite;source -Electricity Mix FR;FABRICATION;Changement climatique;;0-Base data;;electricity-mix;;France;0.0813225;kWh;BaseImpact +Electricity Mix/ Production mix/ Low voltage/ FR;FABRICATION;Changement climatique;;0-Base data;;electricity-mix;;France;0.0813225;kWh;BaseImpact Laptop;DISTRIBUTION;Ressources use, minerals and metals;HP;2-Equipement;End-user/Terminals;Consultation;0.4;Allemagne;0.000882;Item;NegaOctet ;SansRefEquipement;Critère inconnu;;;;;;;;; SansEtape;;Critère inconnu;;;;;;;;;