Merge pull request #272 from com-pas/fix/271-compas-creation-report-cb-for-the-hmi-cb-not-created-when-ln-mod-stval-is-missing

fix(#271): RSR-724 ReportControl for the HMI was not created when LN Mod stVal is missing

Author: massifben

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

@@ -1045,15 +1045,6 @@ public Optional<String> getDaiModStValValue() {
                 .flatMap(ResumedDataTemplate::findFirstValue);
     }
 
-    /**
-     * Check the status ("Mod.stVal" value) of the current LN
-     *
-     * @return true if data Mod.stVal is present and has value equals to LnStatus.ON
-     */
-    public boolean isDaiModStValOn() {
-        return DAI_MOD_STVAL_VALUE_ON.equals(getDaiModStValValue().orElse(null));
-    }
-
     protected Optional<ResumedDataTemplate> getDaiModStVal() {
         ResumedDataTemplate daiModFilter = new ResumedDataTemplate(this, MOD_DO_TYPE_NAME, STVAL_DA_TYPE_NAME);
         return getDAI(daiModFilter, false).stream()

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

@@ -13,6 +13,7 @@
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.scl.dtt.DataTypeTemplateAdapter;
 import org.lfenergy.compas.sct.commons.util.ControlBlockEnum;
+import org.lfenergy.compas.sct.commons.util.LDeviceStatus;
 import org.lfenergy.compas.sct.commons.util.MonitoringLnClassEnum;
 import org.lfenergy.compas.sct.commons.util.Utils;
 
@@ -76,12 +77,12 @@ public LDeviceAdapter(IEDAdapter parentAdapter, TLDevice currentElem) {
      */
     public void createHmiReportControlBlocks(List<TFCDA> fcdas) {
         LN0Adapter ln0 = getLN0Adapter();
-        if (!ln0.isDaiModStValOn()) return;
+        if (!ln0.getDaiModStValValue().map(LDeviceStatus.ON::equals).orElse(false)) return;
         fcdas.stream()
                 .filter(fcda -> getInst().equals(fcda.getLdInst()) && fcda.isSetLnClass())
                 .forEach(fcda -> (fcda.getLnClass().get(0).equals(TLLN0Enum.LLN_0.value()) ?
                         Optional.of(ln0) // ln0 Mod stVal "ON" has already been checked, no need to check it again
-                        : findLnAdapter(fcda.getLnClass().get(0), fcda.getLnInst(), fcda.getPrefix()).filter(AbstractLNAdapter::isDaiModStValOn))
+                        : findLnAdapter(fcda.getLnClass().get(0), fcda.getLnInst(), fcda.getPrefix()).filter(lnAdapter -> lnAdapter.getDaiModStValValue().map(LDeviceStatus.ON::equals).orElse(true)))
                         .map(sourceLn -> sourceLn.getDAI(new ResumedDataTemplate(fcda), false))
                         .filter(das -> das.stream().anyMatch(da -> fcda.getFc() == da.getFc())) // getDAI does not filter on DA.
                         .ifPresent(resumedDataTemplates -> createHmiReportCB(ln0, fcda)));

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

@@ -104,7 +104,31 @@ void createAllIhmReportControlBlocks_with_FCDA_on_ln0_should_create_dataset_and_
     }
 
     @Test
-    void createAllIhmReportControlBlocks_when_lDevice_ON_but_LN_status_OFF_should_not_create_dataset() {
+    void createAllIhmReportControlBlocks_when_lDevice_ON_but_LN_Mod_StVal_missing_should_create_dataset_and_controlblock() {
+        // Given
+        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml");
+        SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
+        LNAdapter ln = findLn(sclRootAdapter, "IedName1", "LdInst11", "ANCR", "1", null);
+        ln.getCurrentElem().unsetDOI();
+        TFCDA fcda = newFcda("LdInst11", "ANCR", "1", null, "DoName1", null, TFCEnum.ST);
+        // When
+        HmiService.createAllHmiReportControlBlocks(scd, List.of(fcda));
+        // Then
+        // Check DataSet is created
+        DataSetAdapter dataSet = findDataSet(sclRootAdapter, "IedName1", "LdInst11", "DS_LDINST11_DQPO");
+        assertThat(dataSet.getCurrentElem().getFCDA()).hasSize(1).first()
+                .usingRecursiveComparison().isEqualTo(fcda);
+        // Check ControlBlock is created
+        LN0Adapter ln0 = findLn0(sclRootAdapter, "IedName1", "LdInst11");
+        assertThat(ln0.getTControlsByType(TReportControl.class)).hasSize(1);
+        TReportControl reportControl = findControlBlock(sclRootAdapter, "IedName1", "LdInst11", "CB_LDINST11_DQPO", TReportControl.class);
+        assertThat(reportControl).extracting(TReportControl::getRptID, TControl::getDatSet, TReportControl::getConfRev, TReportControl::isBuffered, TReportControl::getBufTime, TReportControl::isIndexed,
+                        TControlWithTriggerOpt::getIntgPd)
+                .containsExactly("IedName1LdInst11/LLN0.CB_LDINST11_DQPO", "DS_LDINST11_DQPO", 1L, true, 0L, true, 60000L);
+    }
+
+    @Test
+    void createAllIhmReportControlBlocks_when_lDevice_ON_but_LN_Mod_StVal_OFF_should_not_create_dataset() {
         // Given
         SCL scd = SclTestMarshaller.getSCLFromFile("/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml");
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);

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

@@ -701,42 +701,6 @@ void getLnStatus_should_return_empty_Optional() {
         assertThat(lnStatus).isEmpty();
     }
 
-    @Test
-    void isStatusOn_when_ModStVal_is_on_should_return_true() {
-        // Given
-        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml");
-        SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
-        LN0Adapter ln0 = findLn0(sclRootAdapter, "IED_NAME1", "LD_INST11");
-        // When
-        boolean isStatusOn = ln0.isDaiModStValOn();
-        // Then
-        assertThat(isStatusOn).isTrue();
-    }
-
-    @Test
-    void isStatusOn_when_ModStVal_is_not_on_should_return_false() {
-        // Given
-        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml");
-        SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
-        LN0Adapter ln0 = findLn0(sclRootAdapter, "IED_NAME1", "LD_INST13");
-        // When
-        boolean isStatusOn = ln0.isDaiModStValOn();
-        // Then
-        assertThat(isStatusOn).isFalse();
-    }
-
-    @Test
-    void isStatusOn_when_ModStVal_has_no_value_should_return_false() {
-        // Given
-        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml");
-        SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
-        LN0Adapter ln0 = findLn0(sclRootAdapter, "IED_NAME1", "LD_INST14");
-        // When
-        boolean isStatusOn = ln0.isDaiModStValOn();
-        // Then
-        assertThat(isStatusOn).isFalse();
-    }
-
     @Test
     void createDataSetIfNotExists_should_create_dataSet() {
         // Given