[DLE] correction e2e et constructeur openapi

e2e/1_load_ref.sh

@@ -3,12 +3,14 @@
 # CONTANTS
 REFERENTIELS="criteres etapes hypotheses impactequipements impactreseaux mixelecs typeEquipement correspondanceRefEquipement"
 
+E2E_LOCAL_PATH=../../../e2e
+
 . ./.env
 . ./utils.sh
 
 log "Send referentiel data"
 for ref in $REFERENTIELS; do
     log_n
-    curl -s -XPOST $REFERENTIEL_URL/referentiel/$ref/csv --form file=@input_ref/$ref.csv
+    curl -s -XPOST $REFERENTIEL_URL/referentiel/$ref/csv --form file=@${E2E_LOCAL_PATH}/input_ref/$ref.csv
     echo ""
 done

e2e/5_assert.sh

@@ -3,6 +3,8 @@
 ORGANISATION=${1:-org1}
 NOM_LOT=${2:-lot1}
 
+E2E_LOCAL_PATH=../../../e2e
+
 # load INDICATEUR_URL
 . ./.env
 
@@ -20,11 +22,11 @@ export_table reseau etapeacv,critere,source,statut_indicateur,trace,version_calc
 ALL_OK=true
 for file in $(ls actual/); do
     echo -n "Check file $file : "
-    res=$(diff -qs actual/$file expected/$file)
+    res=$(diff -qs actual/$file ${E2E_LOCAL_PATH}/expected/$file)
     if [ $? -eq 1 ]; then
         echo "KO"
         echo "*** REGRESSION : file $file is different from expected, see file: reports/diff_$file"
-        diff actual/$file expected/$files > reports/diff_$file
+        diff actual/$file ${E2E_LOCAL_PATH}/expected/$file > reports/diff_$file
         ALL_OK=false
     else
         echo "OK"

services/api-event-calculs/pom.xml

@@ -230,9 +230,6 @@
                                 <serviceInterface>true</serviceInterface>
                                 <serviceImplementation>false</serviceImplementation>
                                 <booleanGetterPrefix>is</booleanGetterPrefix>
-                                <additionalModelTypeAnnotations>
-                                    @lombok.experimental.SuperBuilder
-                                </additionalModelTypeAnnotations>
                             </configOptions>
                         </configuration>
                     </execution>
@@ -274,9 +271,6 @@
                                 <serviceInterface>true</serviceInterface>
                                 <serviceImplementation>false</serviceImplementation>
                                 <booleanGetterPrefix>is</booleanGetterPrefix>
-                                <additionalModelTypeAnnotations>
-                                    @lombok.experimental.SuperBuilder
-                                </additionalModelTypeAnnotations>
                             </configOptions>
                         </configuration>
                     </execution>

services/api-event-calculs/src/main/java/org/mte/numecoeval/calculs/infrastructure/controller/ExceptionHandler.java

@@ -26,11 +26,12 @@ public class ExceptionHandler {
      * @return l'objet erreur
      */
     private static ErreurRest writeErrorResponse(Exception ex, HttpStatus status) {
-        return ErreurRest.builder()
-                .status(status.value())
-                .code(status.name())
-                .timestamp(LocalDateTime.now())
-                .message(ex.getLocalizedMessage()).build();
+        var erreurRest = new ErreurRest();
+        erreurRest.status(status.value());
+        erreurRest.setCode(status.name());
+        erreurRest.setTimestamp(LocalDateTime.now());
+        erreurRest.setMessage(ex.getLocalizedMessage());
+        return erreurRest;
     }
 
     @org.springframework.web.bind.annotation.ExceptionHandler(value = {CalculImpactException.class})

services/api-event-calculs/src/main/java/org/mte/numecoeval/calculs/infrastructure/service/sync/calculs/SyncCalculService.java

@@ -24,7 +24,7 @@ public class SyncCalculService {
 
 
     public ReponseCalculRest calcul(SyncCalculRest syncCalculRest) {
-        var result = ReponseCalculRest.builder().build();
+        var result = new ReponseCalculRest();
 
         if (syncCalculRest.getEquipementPhysiqueIds() != null && !syncCalculRest.getEquipementPhysiqueIds().isEmpty()) {
             List<CalculSizes> calculSizesList = equipementPhysiqueRepository.findEquipementPhysiqueDTOs(syncCalculRest.getEquipementPhysiqueIds()).stream()

services/api-event-calculs/src/test/java/org/mte/numecoeval/calculs/infrastructure/service/sync/calculs/SyncCalculServiceTest.java

@@ -56,10 +56,11 @@ class SyncCalculServiceTest {
 
         Mockito.when(mainEquipementPhysiqueService.calcul(any())).thenReturn(calculSizes);
 
+        var syncCalculRest = new SyncCalculRest();
+        syncCalculRest.setEquipementPhysiqueIds(List.of(1L, 2L));
+
         /* EXECUTE */
-        var actual = syncCalculService.calcul(SyncCalculRest.builder()
-                .equipementPhysiqueIds(List.of(1L, 2L))
-                .build());
+        var actual = syncCalculService.calcul(syncCalculRest);
 
         /* ASSERT */
         Assertions.assertEquals(2, actual.getNbrEquipementPhysique());
@@ -81,10 +82,11 @@ class SyncCalculServiceTest {
 
         Mockito.when(mainMessagerieService.calcul(any())).thenReturn(calculSizes);
 
+        var syncCalculRest = new SyncCalculRest();
+        syncCalculRest.setMessagerieIds(List.of(10L, 20L, 30L));
+
         /* EXECUTE */
-        var actual = syncCalculService.calcul(SyncCalculRest.builder()
-                .messagerieIds(List.of(10L, 20L, 30L))
-                .build());
+        var actual = syncCalculService.calcul(syncCalculRest);
 
         /* ASSERT */
         Assertions.assertEquals(3, actual.getNbrMessagerie());