Merge pull request #549 from com-pas/develop

Release 0.2.48

Author: ecoquilleau

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ReportControlBlock.java

@@ -115,7 +115,7 @@ private static TTrgOps newDefaultTrgOps() {
         newDefaultTrgOps.setQchg(true);
         newDefaultTrgOps.setDupd(false);
         newDefaultTrgOps.setPeriod(true);
-        newDefaultTrgOps.setGi(true);
+        newDefaultTrgOps.setGi(false);
         return newDefaultTrgOps;
     }
 

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/InputsAdapter.java

@@ -166,7 +166,7 @@ private Optional<SclReportItem> updateSourceDataSetsAndControlBlocks(TExtRef ext
                 String dataSetName = DATASET_NAME_PREFIX + datasetSuffix;
                 String cbName = CONTROLBLOCK_NAME_PREFIX + datasetSuffix;
                 createDataSetWithFCDA(extRef, sourceLDevice, sourceDa, dataSetName);
-                createControlBlockWithTarget(extRef, sourceLDevice, sourceDa, cbName, dataSetName);
+                createControlBlock(extRef, sourceLDevice, sourceDa, cbName, dataSetName);
                 setExtRefSrcAttributes(extRef, cbName);
             });
         } catch (ScdException e) {
@@ -187,15 +187,18 @@ private void createDataSetWithFCDA(TExtRef extRef, LDeviceAdapter sourceLDevice,
                 sourceDa.getFc());
     }
 
-    private void createControlBlockWithTarget(TExtRef extRef, LDeviceAdapter sourceLDevice, DataAttributeRef sourceDa, String cbName, String datSet) {
+    private void createControlBlock(TExtRef extRef, LDeviceAdapter sourceLDevice, DataAttributeRef sourceDa, String cbName, String datSet) {
         String sourceLDName = sourceLDevice.getLdName();
         String idSeed = "%s/%s.%s".formatted(StringUtils.trimToEmpty(sourceLDName), TLLN0Enum.LLN_0.value(), cbName);
-        ControlBlockAdapter controlBlockAdapter = sourceLDevice.getLN0Adapter().createControlBlockIfNotExists(cbName, idSeed, datSet, ControlBlockEnum.from(extRef.getServiceType()));
+        ControlBlockEnum controlBlockEnum = ControlBlockEnum.from(extRef.getServiceType());
+        ControlBlockAdapter controlBlockAdapter = sourceLDevice.getLN0Adapter().createControlBlockIfNotExists(cbName, idSeed, datSet, controlBlockEnum);
         if (sourceDa.getFc() != TFCEnum.ST && controlBlockAdapter.getCurrentElem() instanceof TReportControl tReportControl) {
             tReportControl.getTrgOps().setDchg(false);
             tReportControl.getTrgOps().setQchg(false);
         }
-        controlBlockAdapter.addTargetIfNotExists(getLNAdapter());
+        if (!ControlBlockEnum.REPORT.equals(controlBlockEnum)) {
+            controlBlockAdapter.addTargetIfNotExists(getLNAdapter());
+        }
     }
 
     private void setExtRefSrcAttributes(TExtRef extRef, String cbName) {

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ControlBlockEditorServiceTest.java

@@ -11,7 +11,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.lfenergy.compas.scl2007b4.model.*;
-import org.lfenergy.compas.sct.commons.dto.ControlBlockTarget;
 import org.lfenergy.compas.sct.commons.dto.SclReportItem;
 import org.lfenergy.compas.sct.commons.model.cbcom.*;
 import org.lfenergy.compas.sct.commons.model.da_comm.DACOMM;
@@ -182,12 +181,10 @@ void createDataSetAndControlBlocks_should_create_ControlBlocks() {
 
         assertThat(tReportControl.getTrgOps())
                 .extracting(TTrgOps::isDchg, TTrgOps::isQchg, TTrgOps::isDupd, TTrgOps::isPeriod, TTrgOps::isGi)
-                .containsExactly(false, false, false, true, true);
+                .containsExactly(false, false, false, true, false);
 
         assertThat(tReportControl.getRptEnabled().getMax()).isEqualTo(4L);
-        assertThat(tReportControl.getRptEnabled().getClientLN().stream().map(ControlBlockTarget::from))
-                .containsExactly(
-                        new ControlBlockTarget("AP_NAME", "IED_NAME1", "LD_INST11", "", "LLN0", "", ""));
+        assertThat(tReportControl.getRptEnabled().getClientLN()).isEmpty();
     }
 
     @Test

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/dto/ReportControlBlockTest.java

@@ -37,7 +37,7 @@ void constructor_should_fill_default_values() {
 
         assertThat(reportControlBlock.getTrgOps())
             .extracting(TTrgOps::isDchg, TTrgOps::isQchg, TTrgOps::isPeriod, TTrgOps::isGi)
-            .containsOnly(true);
+            .containsExactly(true, true, true, false);
         assertThat(reportControlBlock.getTrgOps().isDupd()).isFalse();
 
         assertThat(reportControlBlock.getOptFields())

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ln/LN0AdapterTest.java

@@ -880,7 +880,7 @@ void createControlBlockIfNotExists_should_create_ReportControl() {
 
         assertThat(tReportControl.getTrgOps())
                 .extracting(TTrgOps::isDchg, TTrgOps::isQchg, TTrgOps::isPeriod, TTrgOps::isGi)
-                .containsOnly(true);
+                .containsExactly(true, true, true, false);
         assertThat(tReportControl.getTrgOps().isDupd()).isFalse();
 
         assertThat(tReportControl.getOptFields())