From 05ca9353485d5b27197a1b68e7ae445b614aa528 Mon Sep 17 00:00:00 2001
From: OURY Sarah <sarah.oury@soprasteria.com>
Date: Fri, 28 Jun 2024 12:49:37 +0000
Subject: [PATCH] [SOY] Nettoyage
---
CHANGELOG.md | 1 +
.../FusionFacteurCaracterisationService.java | 58 -------------------
.../init/MigrationToRefTypeItem.java | 35 -----------
.../jpa/entity/ImpactEquipementEntity.java | 35 -----------
.../jpa/entity/ImpactReseauEntity.java | 34 -----------
.../jpa/entity/MixElectriqueEntity.java | 30 ----------
.../jpa/entity/TypeEquipementEntity.java | 47 ---------------
.../entity/id/ImpactEquipementIdEntity.java | 38 ------------
.../jpa/entity/id/ImpactReseauIdEntity.java | 37 ------------
.../jpa/entity/id/MixElectriqueIdEntity.java | 38 ------------
.../ImpactEquipementRepository.java | 13 -----
.../repository/ImpactReseauRepository.java | 13 -----
.../repository/MixElectriqueRepository.java | 13 -----
.../repository/TypeEquipementRepository.java | 11 ----
.../mapper/ImpactEquipementMapper.java | 13 -----
.../mapper/ImpactReseauMapper.java | 13 -----
.../mapper/MixElectriqueMapper.java | 13 -----
.../mapper/TypeEquipementMapper.java | 10 ----
.../src/main/resources/schema.sql | 50 ----------------
.../referentiel/factory/TestDataFactory.java | 50 +---------------
.../ImpactEquipementCsvExportServiceTest.java | 18 +++---
...pactMixElectriqueCsvExportServiceTest.java | 29 +++++-----
.../ImpactReseauCsvExportServiceTest.java | 14 ++---
.../TypeEquipementCsvExportServiceTest.java | 19 +++---
24 files changed, 44 insertions(+), 588 deletions(-)
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/FusionFacteurCaracterisationService.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/MigrationToRefTypeItem.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactEquipementEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactReseauEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/MixElectriqueEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/TypeEquipementEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactEquipementIdEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactReseauIdEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/MixElectriqueIdEntity.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactEquipementRepository.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactReseauRepository.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/MixElectriqueRepository.java
delete mode 100644 services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/TypeEquipementRepository.java
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d38e661..1af720e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
Tous les changements de ce projet seront documentés dans ce document.
## [Non livré]
+- Nettoyage : Supression des tables, Entities et Repositories plus utilisés (pour MixElectrique, ImpactEquipement, ImpactReseau & TypeEquipement)
## [2.0.0] - 2024-06-14
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/FusionFacteurCaracterisationService.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/FusionFacteurCaracterisationService.java
deleted file mode 100644
index 986138c7..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/FusionFacteurCaracterisationService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.init;
-
-import jakarta.annotation.PostConstruct;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.mte.numecoeval.referentiel.domain.exception.ReferentielException;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.adapter.ImpactEquipementJpaAdapter;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.adapter.ImpactReseauJpaAdapter;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.adapter.MixElectriqueJpaAdapter;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.ImpactEquipementRepository;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.ImpactReseauRepository;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.MixElectriqueRepository;
-import org.mte.numecoeval.referentiel.infrastructure.mapper.ImpactEquipementMapper;
-import org.mte.numecoeval.referentiel.infrastructure.mapper.ImpactReseauMapper;
-import org.mte.numecoeval.referentiel.infrastructure.mapper.MixElectriqueMapper;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-@AllArgsConstructor
-public class FusionFacteurCaracterisationService {
- private MixElectriqueJpaAdapter mixElectriqueJpaAdapter;
- private MixElectriqueRepository mixElectriqueRepository;
- private MixElectriqueMapper mixElectriqueMapper;
- private ImpactReseauJpaAdapter impactReseauJpaAdapter;
- private ImpactReseauRepository impactReseauRepository;
- private ImpactReseauMapper impactReseauMapper;
- private ImpactEquipementJpaAdapter impactEquipementJpaAdapter;
- private ImpactEquipementRepository impactEquipementRepository;
- private ImpactEquipementMapper impactEquipementMapper;
-
- @PostConstruct
- public void init() throws ReferentielException {
- log.info("démarrage de la fusion des tables vers ref_facteurcaracterisation");
-
- var mixelecs = mixElectriqueRepository.findAll();
- if (!mixelecs.isEmpty()) {
- log.info("migration des mix électriques vers la nouvelle table");
- mixElectriqueJpaAdapter.saveAll(mixElectriqueMapper.toDomains(mixelecs));
- mixElectriqueRepository.deleteAll();
- log.info("fin de la migration des mix électriques vers la nouvelle table");
- }
- var impactReseaux = impactReseauRepository.findAll();
- if (!impactReseaux.isEmpty()) {
- log.info("migration des impact réseaux vers la nouvelle table");
- impactReseauJpaAdapter.saveAll(impactReseauMapper.toDomains(impactReseaux));
- impactReseauRepository.deleteAll();
- log.info("fin de la migration des impact réseaux vers la nouvelle table");
- }
- var impactEquipements = impactEquipementRepository.findAll();
- if (!impactEquipements.isEmpty()) {
- log.info("migration des impacts équipements vers la nouvelle table");
- impactEquipementJpaAdapter.saveAll(impactEquipementMapper.toDomains(impactEquipements));
- impactEquipementRepository.deleteAll();
- log.info("fin de la migration des impacts équipements vers la nouvelle table");
- }
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/MigrationToRefTypeItem.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/MigrationToRefTypeItem.java
deleted file mode 100644
index a4f9a4cf..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/init/MigrationToRefTypeItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.init;
-
-import jakarta.annotation.PostConstruct;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.mte.numecoeval.referentiel.domain.exception.ReferentielException;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.adapter.TypeItemJpaAdapter;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.TypeEquipementEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.TypeEquipementRepository;
-import org.mte.numecoeval.referentiel.infrastructure.mapper.TypeEquipementMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-@AllArgsConstructor
-public class MigrationToRefTypeItem {
-
- private TypeEquipementRepository typeEquipementRepository;
- private TypeEquipementMapper typeEquipementMapper;
- private TypeItemJpaAdapter typeItemJpaAdapter;
-
- @PostConstruct
- public void init() throws ReferentielException {
- log.info("démarrage de la migration de la table ref_type_equipement vers ref_type_item");
- List<TypeEquipementEntity> typesEquipement = typeEquipementRepository.findAll();
- if (!typesEquipement.isEmpty()) {
- log.info("migration des référentiels de types d'équipements existants vers la nouvelle table");
- typeItemJpaAdapter.saveAll(typeEquipementMapper.toTypesItem(typeEquipementMapper.toDomaines(typesEquipement)));
- typeEquipementRepository.deleteAll();
- log.info("fin de la migration de la table ref_type_equipement vers ref_type_item");
- }
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactEquipementEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactEquipementEntity.java
deleted file mode 100644
index d878dc03..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactEquipementEntity.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity;
-
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactEquipementIdEntity;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Entity
-@IdClass(ImpactEquipementIdEntity.class)
-@Table(name = "REF_IMPACTEQUIPEMENT")
-@EqualsAndHashCode
-public class ImpactEquipementEntity implements AbstractReferentielEntity {
- @Id
- @Column(name = "REFEQUIPEMENT")
- String refEquipement;
- @Id
- @Column(name = "ETAPEACV")
- String etape;
- @Id
- @Column(name = "NOMCRITERE")
- String critere;
- String source;
- String type;
- Double valeur;
- Double consoElecMoyenne;
- String description;
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactReseauEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactReseauEntity.java
deleted file mode 100644
index de8f5b5f..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/ImpactReseauEntity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity;
-
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactReseauIdEntity;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Entity
-@IdClass(ImpactReseauIdEntity.class)
-@Table(name = "REF_IMPACTRESEAU")
-@EqualsAndHashCode
-public class ImpactReseauEntity implements AbstractReferentielEntity {
- @Id
- @Column(name = "REFRESEAU", nullable = false)
- String refReseau;
- @Id
- @Column(name = "ETAPEACV", nullable = false)
- String etape;
- @Id
- @Column(name = "NOMCRITERE", nullable = false)
- String critere;
- String source;
- Double valeur;
- @Column(name = "CONSOELECMOYENNE")
- Double consoElecMoyenne;
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/MixElectriqueEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/MixElectriqueEntity.java
deleted file mode 100644
index f73d5334..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/MixElectriqueEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity;
-
-import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.MixElectriqueIdEntity;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@Entity
-@IdClass(MixElectriqueIdEntity.class)
-@Table(name = "REF_MIXELEC")
-@EqualsAndHashCode
-public class MixElectriqueEntity implements AbstractReferentielEntity {
- @Id
- String pays;
- @Id
- @Column(name = "NOMCRITERE")
- String critere;
- @Column(name = "RACCOURCISANGLAIS")
- String raccourcisAnglais;
- String source;
- Double valeur;
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/TypeEquipementEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/TypeEquipementEntity.java
deleted file mode 100644
index dced599b..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/TypeEquipementEntity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-@Builder
-@Getter
-@Setter
-@Accessors(chain = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity(name = "REF_TYPE_EQUIPEMENT")
-public class TypeEquipementEntity implements AbstractReferentielEntity {
- @Id
- String type;
- boolean serveur;
- String commentaire;
- Double dureeVieDefaut;
- String source;
-
- // Référence de l'équipement par défaut, permet des correspondances en cas d'absence de correspondance direct.
- String refEquipementParDefaut;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- TypeEquipementEntity that = (TypeEquipementEntity) o;
-
- return new EqualsBuilder().append(serveur, that.serveur).append(type, that.type).append(commentaire, that.commentaire).append(dureeVieDefaut, that.dureeVieDefaut).append(source, that.source).isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder(17, 37).append(type).append(serveur).append(commentaire).append(dureeVieDefaut).append(source).toHashCode();
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactEquipementIdEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactEquipementIdEntity.java
deleted file mode 100644
index 2cec43b7..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactEquipementIdEntity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@NoArgsConstructor
-
-public class ImpactEquipementIdEntity implements AbstractReferentieIdEntity {
- String refEquipement;
- String etape;
- String critere;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- ImpactEquipementIdEntity that = (ImpactEquipementIdEntity) o;
-
- return new EqualsBuilder().append(refEquipement, that.refEquipement).append(etape, that.etape).append(critere, that.critere).isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder(17, 37).append(refEquipement).append(etape).append(critere).toHashCode();
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactReseauIdEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactReseauIdEntity.java
deleted file mode 100644
index e43e7251..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/ImpactReseauIdEntity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@NoArgsConstructor
-public class ImpactReseauIdEntity implements AbstractReferentieIdEntity {
- String refReseau;
- String etape;
- String critere;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- ImpactReseauIdEntity that = (ImpactReseauIdEntity) o;
-
- return new EqualsBuilder().append(refReseau, that.refReseau).append(etape, that.etape).append(critere, that.critere).isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder(17, 37).append(refReseau).append(etape).append(critere).toHashCode();
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/MixElectriqueIdEntity.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/MixElectriqueIdEntity.java
deleted file mode 100644
index feae6b5e..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/entity/id/MixElectriqueIdEntity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import lombok.experimental.FieldDefaults;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-@Getter
-@Setter
-@Accessors(chain = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@NoArgsConstructor
-
-public class MixElectriqueIdEntity implements AbstractReferentieIdEntity {
-
- String pays;
- String critere;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- MixElectriqueIdEntity that = (MixElectriqueIdEntity) o;
-
- return new EqualsBuilder().append(pays, that.pays).append(critere, that.critere).isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder(17, 37).append(pays).append(critere).toHashCode();
- }
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactEquipementRepository.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactEquipementRepository.java
deleted file mode 100644
index af84c79c..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactEquipementRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.repository;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.ImpactEquipementEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactEquipementIdEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(path = "ImpactEquipement" , itemResourceRel = "ImpactEquipements")
-@Tag(name = "ImpactEquipement - CRUD/Spring Data REST")
-public interface ImpactEquipementRepository extends JpaRepository<ImpactEquipementEntity, ImpactEquipementIdEntity> {
-
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactReseauRepository.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactReseauRepository.java
deleted file mode 100644
index f37f3c3a..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/ImpactReseauRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.repository;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.ImpactReseauEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactReseauIdEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(path = "ImpactReseau" , itemResourceRel = "ImpactReseaux")
-@Tag(name = "ImpactReseau - CRUD/Spring Data REST")
-public interface ImpactReseauRepository extends JpaRepository<ImpactReseauEntity, ImpactReseauIdEntity> {
-
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/MixElectriqueRepository.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/MixElectriqueRepository.java
deleted file mode 100644
index 448a8b3b..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/MixElectriqueRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.repository;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.MixElectriqueEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.MixElectriqueIdEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(path = "MixElectrique" , itemResourceRel = "MixElectriques")
-@Tag(name = "MixElectrique - CRUD/Spring Data REST")
-public interface MixElectriqueRepository extends JpaRepository<MixElectriqueEntity, MixElectriqueIdEntity> {
-
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/TypeEquipementRepository.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/TypeEquipementRepository.java
deleted file mode 100644
index c924a861..00000000
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/jpa/repository/TypeEquipementRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.mte.numecoeval.referentiel.infrastructure.jpa.repository;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.TypeEquipementEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-
-@RepositoryRestResource(path = "TypeEquipement" , itemResourceRel = "TypesEquipements")
-@Tag(name = "TypeEquipement - CRUD/Spring Data REST")
-public interface TypeEquipementRepository extends JpaRepository<TypeEquipementEntity,String> {
-}
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactEquipementMapper.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactEquipementMapper.java
index 50743926..eddf92bf 100644
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactEquipementMapper.java
+++ b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/ImpactEquipementMapper.java
@@ -5,28 +5,15 @@ import org.mapstruct.Mapping;
import org.mte.numecoeval.referentiel.domain.model.FacteurCaracterisation;
import org.mte.numecoeval.referentiel.domain.model.ImpactEquipement;
import org.mte.numecoeval.referentiel.domain.model.id.ImpactEquipementId;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.ImpactEquipementEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactEquipementIdEntity;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.ImpactEquipementDTO;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.id.ImpactEquipementIdDTO;
-import java.util.Collection;
import java.util.List;
@Mapper(componentModel = "spring")
public interface ImpactEquipementMapper {
ImpactEquipementId toDomainId(ImpactEquipementIdDTO id);
- ImpactEquipementEntity toEntity(ImpactEquipement referentiel);
-
- List<ImpactEquipementEntity> toEntities(Collection<ImpactEquipement> referentiel);
-
- ImpactEquipementIdEntity toEntityId(ImpactEquipementId id);
-
- ImpactEquipement toDomain(ImpactEquipementEntity entity);
-
- List<ImpactEquipement> toDomains(List<ImpactEquipementEntity> entities);
-
ImpactEquipement toDomain(ImpactEquipementDTO dto);
List<ImpactEquipement> toDomainsFromDTO(List<ImpactEquipementDTO> iesDTO);
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 4bc31228..82bd261f 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
@@ -5,37 +5,24 @@ import org.mapstruct.Mapping;
import org.mte.numecoeval.referentiel.domain.model.FacteurCaracterisation;
import org.mte.numecoeval.referentiel.domain.model.ImpactReseau;
import org.mte.numecoeval.referentiel.domain.model.id.ImpactReseauId;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.ImpactReseauEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.ImpactReseauIdEntity;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.ImpactReseauDTO;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.id.ImpactReseauIdDTO;
-import java.util.Collection;
import java.util.List;
@Mapper(componentModel = "spring")
public interface ImpactReseauMapper {
- ImpactReseauEntity toEntity(ImpactReseau impactReseau);
-
@Mapping(source = "etape", target = "etapeACV")
ImpactReseauDTO toDTO(ImpactReseau impactReseau);
- ImpactReseauIdEntity toEntityId(ImpactReseauId reseauId);
-
- ImpactReseau toDomain(ImpactReseauEntity reseauEntity);
-
@Mapping(source = "etapeACV", target = "etape")
ImpactReseau toDomain(ImpactReseauDTO impactReseauDTO);
@Mapping(source = "etapeACV", target = "etape")
ImpactReseauId toDomainId(ImpactReseauIdDTO idImpactReseauDTO);
- List<ImpactReseauEntity> toEntity(Collection<ImpactReseau> facteursImpacts);
-
- List<ImpactReseau> toDomains(List<ImpactReseauEntity> entities);
-
List<ImpactReseau> toDomainsFromDTO(List<ImpactReseauDTO> dtos);
@Mapping(target = "nom", source = "refReseau")
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 bbafcff0..b29345dc 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
@@ -5,12 +5,9 @@ import org.mapstruct.Mapping;
import org.mte.numecoeval.referentiel.domain.model.FacteurCaracterisation;
import org.mte.numecoeval.referentiel.domain.model.MixElectrique;
import org.mte.numecoeval.referentiel.domain.model.id.MixElectriqueId;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.MixElectriqueEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.MixElectriqueIdEntity;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.MixElectriqueDTO;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.id.MixElectriqueIdDTO;
-import java.util.Collection;
import java.util.List;
@Mapper(componentModel = "spring")
@@ -18,16 +15,6 @@ public interface MixElectriqueMapper {
MixElectriqueId toDomainId(MixElectriqueIdDTO id);
- MixElectriqueEntity toEntity(MixElectrique mixElecs);
-
- List<MixElectriqueEntity> toEntities(Collection<MixElectrique> mixElecs);
-
- MixElectriqueIdEntity toEntityId(MixElectriqueId id);
-
- MixElectrique toDomain(MixElectriqueEntity mixElec);
-
- List<MixElectrique> toDomains(List<MixElectriqueEntity> mixElec);
-
List<MixElectrique> toDomainsFromDTO(List<MixElectriqueDTO> mixElecs);
MixElectriqueDTO toDTO(MixElectrique mixElectrique);
diff --git a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/TypeEquipementMapper.java b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/TypeEquipementMapper.java
index 5af2f6ad..87dd9b83 100644
--- a/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/TypeEquipementMapper.java
+++ b/services/api-referentiel/src/main/java/org/mte/numecoeval/referentiel/infrastructure/mapper/TypeEquipementMapper.java
@@ -4,25 +4,15 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mte.numecoeval.referentiel.domain.model.TypeEquipement;
import org.mte.numecoeval.referentiel.domain.model.TypeItem;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.TypeEquipementEntity;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.TypeEquipementDTO;
-import java.util.Collection;
import java.util.List;
@Mapper(componentModel = "spring")
public interface TypeEquipementMapper {
- TypeEquipement toDomaine(TypeEquipementEntity typeEquipementEntity);
-
- List<TypeEquipement> toDomaines(List<TypeEquipementEntity> typeEquipementEntities);
-
TypeEquipement toDomaine(TypeEquipementDTO typeEquipementDTO);
- TypeEquipementEntity toEntity(TypeEquipement typeEquipement);
-
- List<TypeEquipementEntity> toEntities(Collection<TypeEquipement> typeEquipements);
-
TypeEquipementDTO toDto(TypeEquipement typeEquipement);
@Mapping(target = "refItemParDefaut", source = "refEquipementParDefaut")
diff --git a/services/api-referentiel/src/main/resources/schema.sql b/services/api-referentiel/src/main/resources/schema.sql
index 1f910575..d81d8dde 100644
--- a/services/api-referentiel/src/main/resources/schema.sql
+++ b/services/api-referentiel/src/main/resources/schema.sql
@@ -22,17 +22,6 @@ CREATE TABLE IF NOT EXISTS ref_hypothese
CONSTRAINT ref_hypothese_pkey PRIMARY KEY (code)
);
-CREATE TABLE IF NOT EXISTS ref_type_equipement
-(
- "type" varchar(255) NOT NULL,
- commentaire varchar(255) NULL,
- duree_vie_defaut float8 NULL,
- serveur bool NOT NULL,
- "source" varchar(255) NULL,
- ref_equipement_par_defaut varchar(255) NULL,
- CONSTRAINT ref_type_equipement_pkey PRIMARY KEY (type)
-);
-
CREATE TABLE IF NOT EXISTS ref_type_item
(
"type" varchar(255) NOT NULL,
@@ -61,40 +50,6 @@ CREATE TABLE IF NOT EXISTS ref_correspondance_ref_eqp
ref_equipement_cible varchar(255) NULL,
CONSTRAINT ref_correspondance_ref_eqp_pkey PRIMARY KEY (modele_equipement_source)
);
-
-CREATE TABLE IF NOT EXISTS ref_impactequipement
-(
- refequipement varchar(255) NOT NULL,
- conso_elec_moyenne float8 NULL,
- "source" varchar(255) NULL,
- "type" varchar(255) NULL,
- valeur float8 NULL,
- etapeacv varchar(255) NOT NULL,
- nomcritere varchar(255) NOT NULL,
- description varchar(255) NULL,
- CONSTRAINT ref_impactequipement_pkey PRIMARY KEY (nomcritere, etapeacv, refequipement)
-);
-
-CREATE TABLE IF NOT EXISTS ref_impactreseau
-(
- refreseau varchar(255) NOT NULL,
- consoelecmoyenne float8 NULL,
- "source" varchar(255) NULL,
- valeur float8 NULL,
- etapeacv varchar(255) NOT NULL,
- nomcritere varchar(255) NOT NULL,
- CONSTRAINT ref_impactreseau_pkey PRIMARY KEY (nomcritere, etapeacv, refreseau)
-);
-
-CREATE TABLE IF NOT EXISTS ref_mixelec
-(
- pays varchar(255) NOT NULL,
- raccourcisanglais varchar(255) NULL,
- "source" varchar(255) NULL,
- valeur float8 NULL,
- nomcritere varchar(255) NOT NULL,
- CONSTRAINT ref_mixelec_pkey PRIMARY KEY (nomcritere, pays)
-);
CREATE TABLE IF NOT EXISTS ref_facteurcaracterisation
(
nom varchar(255) NOT NULL,
@@ -112,9 +67,4 @@ CREATE TABLE IF NOT EXISTS ref_mixelec
CONSTRAINT ref_facteurcaracterisation_pkey PRIMARY KEY (nom, etapeacv, nomcritere)
);
-- suppression des contraintes de clés étrangères
-ALTER TABLE ref_impactequipement DROP CONSTRAINT IF EXISTS fk5iuiwnk7rymtob1fku71uuj52;
-ALTER TABLE ref_impactequipement DROP CONSTRAINT IF EXISTS fksfjum8kagn7q6vsv5uqn6kimx;
-ALTER TABLE ref_impactreseau DROP CONSTRAINT IF EXISTS fk31ykp7xtj41win3ptqlr3us9s;
-ALTER TABLE ref_impactreseau DROP CONSTRAINT IF EXISTS fkb8tkreu8c8s8pqqnft6vr4pnf;
-ALTER TABLE ref_mixelec DROP CONSTRAINT IF EXISTS fkdncd4m2je6fbno7pkn850u1fs;
ALTER TABLE ref_impact_messagerie DROP CONSTRAINT IF EXISTS fkohnlpwfp0ebk7dswmfbe5l3k0;
diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/factory/TestDataFactory.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/factory/TestDataFactory.java
index 6082c03d..62338a5d 100644
--- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/factory/TestDataFactory.java
+++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/factory/TestDataFactory.java
@@ -3,7 +3,9 @@ package org.mte.numecoeval.referentiel.factory;
import org.mte.numecoeval.referentiel.domain.model.*;
import org.mte.numecoeval.referentiel.domain.model.id.*;
import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.*;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.*;
+import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.CritereIdEntity;
+import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.EtapeIdEntity;
+import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.id.HypotheseIdEntity;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.*;
import org.mte.numecoeval.referentiel.infrastructure.restapi.dto.id.*;
@@ -141,9 +143,6 @@ public class TestDataFactory {
.build();
}
- public static TypeEquipementEntity entity(String type, boolean estUnServeur, Double dureeVieDefaut, String commentaire, String source, String refEquipementParDefaut) {
- return new TypeEquipementEntity(type, estUnServeur, commentaire, dureeVieDefaut, source, refEquipementParDefaut);
- }
}
public static class TypeItemFactory {
@@ -200,15 +199,6 @@ public class TestDataFactory {
.setSource(source);
}
- public static MixElectriqueEntity entity(CritereEntity critere, String pays, String raccourcisAnglais, Double valeur, String source) {
- return new MixElectriqueEntity()
- .setCritere(critere.getNomCritere())
- .setPays(pays)
- .setRaccourcisAnglais(raccourcisAnglais)
- .setValeur(valeur)
- .setSource(source);
- }
-
public static MixElectriqueIdDTO idDTO(CritereIdDTO critereId, String pays) {
return MixElectriqueIdDTO
.builder()
@@ -222,12 +212,6 @@ public class TestDataFactory {
.setCritere(critereId.getNomCritere())
.setPays(pays);
}
-
- public static MixElectriqueIdEntity idEntity(CritereIdEntity critereId, String pays) {
- return new MixElectriqueIdEntity()
- .setCritere(critereId.getNomCritere())
- .setPays(pays);
- }
}
public static class ImpactEquipementFactory {
@@ -256,17 +240,6 @@ public class TestDataFactory {
.setConsoElecMoyenne(consoElecMoyenne);
}
- public static ImpactEquipementEntity entity(EtapeEntity etape, CritereEntity critere, String refEquipement, String source, String type, Double valeur, Double consoElecMoyenne) {
- return new ImpactEquipementEntity()
- .setEtape(etape.getCode())
- .setCritere(critere.getNomCritere())
- .setRefEquipement(refEquipement)
- .setSource(source)
- .setType(type)
- .setValeur(valeur)
- .setConsoElecMoyenne(consoElecMoyenne);
- }
-
public static ImpactEquipementIdDTO idDTO(String etapeIdDTO, String critereId, String refEquipement) {
return ImpactEquipementIdDTO
.builder()
@@ -379,16 +352,6 @@ public class TestDataFactory {
.setConsoElecMoyenne(consoElecMoyenne);
}
- public static ImpactReseauEntity entity(EtapeEntity etape, CritereEntity critere, String refReseau, String source, Double valeur, Double consoElecMoyenne) {
- return new ImpactReseauEntity()
- .setEtape(etape.getCode())
- .setCritere(critere.getNomCritere())
- .setRefReseau(refReseau)
- .setSource(source)
- .setValeur(valeur)
- .setConsoElecMoyenne(consoElecMoyenne);
- }
-
public static ImpactReseauIdDTO idDTO(EtapeIdDTO etapeIdDTO, CritereIdDTO critereId, String refReseau) {
return ImpactReseauIdDTO
.builder()
@@ -404,13 +367,6 @@ public class TestDataFactory {
.setCritere(critereId.getNomCritere())
.setRefReseau(refReseau);
}
-
- public static ImpactReseauIdEntity idEntity(EtapeIdEntity etapeIdEntity, CritereIdEntity critereId, String refReseau) {
- return new ImpactReseauIdEntity()
- .setEtape(etapeIdEntity.getCode())
- .setCritere(critereId.getNomCritere())
- .setRefReseau(refReseau);
- }
}
public static class ImpactMessagerieFactory {
diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactEquipementCsvExportServiceTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactEquipementCsvExportServiceTest.java
index dc702968..175cfa44 100644
--- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactEquipementCsvExportServiceTest.java
+++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactEquipementCsvExportServiceTest.java
@@ -85,33 +85,33 @@ class ImpactEquipementCsvExportServiceTest {
@Test
void printRecordShouldUseEntityAttributes() throws IOException {
- var entity = TestDataFactory.ImpactEquipementFactory.entity(
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Laptop",
TestDataFactory.EtapeFactory.entity("UTILISATION", ""),
TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
- "Ref-Ecran", "RefTest", "Ecran", 0.1, 0.2
+ "", Constants.EQUIPEMENT_NIVEAU, "", "Ecran", 0.1, "", 0.2, "", "NegaOctet"
);
+
DecimalFormat df = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
df.setMaximumFractionDigits(340);
- assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, equipementMapper.toDomain(entity)));
+ assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, equipementMapper.toImpactEquipement(facteurCaracterisationMapper.toDomain(entity))));
- Mockito.verify(csvPrinter, times(1)).printRecord(entity.getRefEquipement(),
+ Mockito.verify(csvPrinter, times(1)).printRecord(entity.getNom(),
entity.getEtape(), entity.getCritere(),
df.format(entity.getConsoElecMoyenne()), df.format(entity.getValeur()),
- entity.getSource(), entity.getType());
+ entity.getSource(), null);
}
@Test
void logRecordErrorShouldLogSpecificErrorForRecord() {
- var entity = TestDataFactory.ImpactEquipementFactory.entity(
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Laptop",
TestDataFactory.EtapeFactory.entity("UTILISATION", ""),
TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
- "Ref-Ecran", "RefTest", "Ecran", 0.1, 0.2
+ "", Constants.EQUIPEMENT_NIVEAU, "", "Ecran", 0.1, "", 0.2, "", "NegaOctet"
);
-
- assertDoesNotThrow(() -> exportService.logRecordError(equipementMapper.toDomain(entity), new Exception("Test")));
+ assertDoesNotThrow(() -> exportService.logRecordError(equipementMapper.toImpactEquipement(facteurCaracterisationMapper.toDomain(entity)), new Exception("Test")));
}
@Test
diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactMixElectriqueCsvExportServiceTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactMixElectriqueCsvExportServiceTest.java
index 1553433e..2ef28e59 100644
--- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactMixElectriqueCsvExportServiceTest.java
+++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactMixElectriqueCsvExportServiceTest.java
@@ -12,7 +12,6 @@ import org.mte.numecoeval.referentiel.domain.model.MixElectrique;
import org.mte.numecoeval.referentiel.domain.ports.input.impl.ImportMixElectriquePortImpl;
import org.mte.numecoeval.referentiel.factory.TestDataFactory;
import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.FacteurCaracterisationEntity;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.MixElectriqueEntity;
import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.FacteurCaracterisationRepository;
import org.mte.numecoeval.referentiel.infrastructure.mapper.FacteurCaracterisationMapper;
import org.mte.numecoeval.referentiel.infrastructure.mapper.FacteurCaracterisationMapperImpl;
@@ -68,13 +67,6 @@ class ImpactMixElectriqueCsvExportServiceTest {
);
}
- private MixElectriqueEntity mixElectriqueEntity() {
- return TestDataFactory.MixElectriqueFactory.entity(
- TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
- "France", "FR", 0.2, "Test"
- );
- }
-
@Test
void getHeadersShouldReturnSameHeadersAsImport() {
Assertions.assertEquals(ImportMixElectriquePortImpl.getHeaders(), exportService.getHeaders());
@@ -91,15 +83,20 @@ class ImpactMixElectriqueCsvExportServiceTest {
@Test
void printRecordShouldUseEntityAttributes() throws IOException {
- var entity = mixElectriqueEntity();
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Electricity mix FR",
+ TestDataFactory.EtapeFactory.entity("FABRICATION", ""),
+ TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
+ "", Constants.MIXELEC_NIVEAU, "", Constants.MIXELEC_CATEGORIE, 0.0, "France", 0.2, "", "NegaOctet"
+ );
+
DecimalFormat df = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
df.setMaximumFractionDigits(340);
- assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, mixElectriqueMapper.toDomain(entity)));
+ assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, mixElectriqueMapper.toMixElectrique(facteurCaracterisationMapper.toDomain(entity))));
Mockito.verify(csvPrinter, times(1)).printRecord(
- entity.getPays(),
- entity.getRaccourcisAnglais(),
+ entity.getLocalisation(),
+ null,
entity.getCritere(),
df.format(entity.getValeur()),
entity.getSource());
@@ -107,9 +104,13 @@ class ImpactMixElectriqueCsvExportServiceTest {
@Test
void logRecordErrorShouldLogSpecificErrorForRecord() {
- var entity = mixElectriqueEntity();
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Electricity mix FR",
+ TestDataFactory.EtapeFactory.entity("FABRICATION", ""),
+ TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
+ "", Constants.MIXELEC_NIVEAU, "", Constants.MIXELEC_CATEGORIE, 0.0, "France", 0.2, "", "NegaOctet"
+ );
- assertDoesNotThrow(() -> exportService.logRecordError(mixElectriqueMapper.toDomain(entity), new Exception("Test")));
+ assertDoesNotThrow(() -> exportService.logRecordError(mixElectriqueMapper.toMixElectrique(facteurCaracterisationMapper.toDomain(entity)), new Exception("Test")));
}
@Test
diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactReseauCsvExportServiceTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactReseauCsvExportServiceTest.java
index c398b1ec..008e8f04 100644
--- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactReseauCsvExportServiceTest.java
+++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/ImpactReseauCsvExportServiceTest.java
@@ -84,18 +84,18 @@ class ImpactReseauCsvExportServiceTest {
@Test
void printRecordShouldUseEntityAttributes() throws IOException {
- var entity = TestDataFactory.ImpactReseauFactory.entity(
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Fixed-line network",
TestDataFactory.EtapeFactory.entity("UTILISATION", ""),
TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
- "Ref-Ecran", "RefTest", 0.1, 0.2
+ "", Constants.RESEAU_NIVEAU, Constants.RESEAU_TIERS, "Ecran", 0.1, "", 0.2, "", "NegaOctet"
);
DecimalFormat df = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
df.setMaximumFractionDigits(340);
- assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, reseauMapper.toDomain(entity)));
+ assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, reseauMapper.toImpactReseau(facteurCaracterisationMapper.toDomain(entity))));
- Mockito.verify(csvPrinter, times(1)).printRecord(entity.getRefReseau(),
+ Mockito.verify(csvPrinter, times(1)).printRecord(entity.getNom(),
entity.getEtape(), entity.getCritere(),
df.format(entity.getValeur()), df.format(entity.getConsoElecMoyenne()),
entity.getSource());
@@ -103,13 +103,13 @@ class ImpactReseauCsvExportServiceTest {
@Test
void logRecordErrorShouldLogSpecificErrorForRecord() {
- var entity = TestDataFactory.ImpactReseauFactory.entity(
+ var entity = TestDataFactory.FacteurCaracterisationFactory.entity("Fixed-line network",
TestDataFactory.EtapeFactory.entity("UTILISATION", ""),
TestDataFactory.CritereFactory.entity("Changement climatique", "", ""),
- "Ref-Ecran", "RefTest", 0.1, 0.2
+ "", Constants.RESEAU_NIVEAU, Constants.RESEAU_TIERS, "Ecran", 0.1, "", 0.2, "", "NegaOctet"
);
- assertDoesNotThrow(() -> exportService.logRecordError(reseauMapper.toDomain(entity), new Exception("Test")));
+ assertDoesNotThrow(() -> exportService.logRecordError(reseauMapper.toImpactReseau(facteurCaracterisationMapper.toDomain(entity)), new Exception("Test")));
}
@Test
diff --git a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/TypeEquipementCsvExportServiceTest.java b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/TypeEquipementCsvExportServiceTest.java
index 47eb4fcf..434e3a84 100644
--- a/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/TypeEquipementCsvExportServiceTest.java
+++ b/services/api-referentiel/src/test/java/org/mte/numecoeval/referentiel/infrastructure/adapter/export/TypeEquipementCsvExportServiceTest.java
@@ -11,7 +11,6 @@ import org.mockito.MockitoAnnotations;
import org.mte.numecoeval.referentiel.domain.model.TypeEquipement;
import org.mte.numecoeval.referentiel.domain.ports.input.impl.ImportTypeEquipementPortImpl;
import org.mte.numecoeval.referentiel.factory.TestDataFactory;
-import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.TypeEquipementEntity;
import org.mte.numecoeval.referentiel.infrastructure.jpa.entity.TypeItemEntity;
import org.mte.numecoeval.referentiel.infrastructure.jpa.repository.TypeItemRepository;
import org.mte.numecoeval.referentiel.infrastructure.mapper.TypeEquipementMapper;
@@ -64,10 +63,8 @@ class TypeEquipementCsvExportServiceTest {
);
}
- private TypeEquipementEntity typeEquipementEntity() {
- return TestDataFactory.TypeEquipementFactory.entity(
- "Serveur", true, 6.0, "Commentaires", "Test",
- "test");
+ private TypeItemEntity typeItemEntity() {
+ return TestDataFactory.TypeItemFactory.entity("Serveur", CATEGORIE_EQUIPEMENT_PHYSIQUE, true, null, 6.0, null, "", "Test");
}
@Test
@@ -86,11 +83,13 @@ class TypeEquipementCsvExportServiceTest {
@Test
void printRecordShouldUseEntityAttributes() throws IOException {
- var entity = typeEquipementEntity();
+ var entity = TestDataFactory.TypeItemFactory.entity(
+ "Serveur", null, true, "Exemple de serveur basique",
+ 6.0, null, "NegaOctet", "serveur_par_defaut");
DecimalFormat df = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
df.setMaximumFractionDigits(340);
- assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, typeEquipementMapper.toDomaine(entity)));
+ assertDoesNotThrow(() -> exportService.printRecord(csvPrinter, typeEquipementMapper.toTypeEquipement(typeItemMapper.toDomain(entity))));
Mockito.verify(csvPrinter, times(1)).printRecord(
entity.getType(),
@@ -98,13 +97,13 @@ class TypeEquipementCsvExportServiceTest {
entity.getCommentaire(),
df.format(entity.getDureeVieDefaut()),
entity.getSource(),
- entity.getRefEquipementParDefaut());
+ entity.getRefItemParDefaut());
}
@Test
void logRecordErrorShouldLogSpecificErrorForRecord() {
- var entity = typeEquipementEntity();
- assertDoesNotThrow(() -> exportService.logRecordError(typeEquipementMapper.toDomaine(entity), new Exception("Test")));
+ var entity = typeItemEntity();
+ assertDoesNotThrow(() -> exportService.logRecordError(typeEquipementMapper.toTypeEquipement(typeItemMapper.toDomain(entity)), new Exception("Test")));
}
@Test
--
GitLab