From 7a3420d7d57e754ba0836c13bee980179653816d Mon Sep 17 00:00:00 2001
From: gaouizer <gilles.aouizerate@rte-france.com>
Date: Fri, 5 Jul 2024 18:10:35 +0200
Subject: [PATCH] make discrete measurement id optional on reading

Signed-off-by: gaouizer <gilles.aouizerate@rte-france.com>

add test

Signed-off-by: gaouizer <gilles.aouizerate@rte-france.com>

improve test case

Signed-off-by: gaouizer <gilles.aouizerate@rte-france.com>
---
 extensions/iidm/resources/disMeasRef.xml        | 10 ++++++++++
 .../src/DiscreteMeasurementsXmlSerializer.cpp   |  5 ++++-
 .../iidm/test/DiscreteMeasurementsTest.cpp      | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/extensions/iidm/resources/disMeasRef.xml b/extensions/iidm/resources/disMeasRef.xml
index 08a386e4..75e7040f 100644
--- a/extensions/iidm/resources/disMeasRef.xml
+++ b/extensions/iidm/resources/disMeasRef.xml
@@ -206,6 +206,16 @@
             </dm:discreteMeasurement>
         </dm:discreteMeasurements>
     </iidm:extension>
+    <iidm:extension id="S1VL1_BBS_TWT_DISCONNECTOR">
+        <dm:discreteMeasurements>
+            <dm:discreteMeasurement type="SWITCH_POSITION" valueType="STRING" value="CLOSED" valid="false">
+                <dm:property name="source" value="test"/>
+            </dm:discreteMeasurement>
+            <dm:discreteMeasurement type="OTHER" valueType="STRING" value="CLOSED" valid="false">
+                <dm:property name="source" value="test"/>
+            </dm:discreteMeasurement>
+        </dm:discreteMeasurements>
+    </iidm:extension>
     <iidm:extension id="TWT">
         <dm:discreteMeasurements>
             <dm:discreteMeasurement id="DIS_MEAS_TAP_POS" type="TAP_POSITION" tapChanger="PHASE_TAP_CHANGER" valueType="INT" value="15" valid="true">
diff --git a/extensions/iidm/src/DiscreteMeasurementsXmlSerializer.cpp b/extensions/iidm/src/DiscreteMeasurementsXmlSerializer.cpp
index a128544f..589f09b8 100644
--- a/extensions/iidm/src/DiscreteMeasurementsXmlSerializer.cpp
+++ b/extensions/iidm/src/DiscreteMeasurementsXmlSerializer.cpp
@@ -52,9 +52,12 @@ Extension& DiscreteMeasurementsXmlSerializer::read(Extendable& extendable, conve
 
 void DiscreteMeasurementsXmlSerializer::readDiscreteMeasurement(DiscreteMeasurements& discreteMeasurements, const xml::XmlStreamReader& reader) {
     DiscreteMeasurementAdder adder = discreteMeasurements.newDiscreteMeasurement()
-        .setId(reader.getAttributeValue(ID))
         .setType(Enum::fromString<DiscreteMeasurement::Type>(reader.getAttributeValue(TYPE)))
         .setValid(reader.getAttributeValue<bool>(VALID));
+    const std::string& dmId = reader.getOptionalAttributeValue(ID, "");
+    if (!dmId.empty()) {
+        adder.setId(dmId);
+    }
     const std::string& tapChanger = reader.getOptionalAttributeValue(TAP_CHANGER, "");
     if (!tapChanger.empty()) {
         adder.setTapChanger(Enum::fromString<DiscreteMeasurement::TapChanger>(tapChanger));
diff --git a/extensions/iidm/test/DiscreteMeasurementsTest.cpp b/extensions/iidm/test/DiscreteMeasurementsTest.cpp
index d21b674b..c9b7c2f8 100644
--- a/extensions/iidm/test/DiscreteMeasurementsTest.cpp
+++ b/extensions/iidm/test/DiscreteMeasurementsTest.cpp
@@ -227,6 +227,23 @@ BOOST_FIXTURE_TEST_CASE(DiscreteMeasurementsXmlSerializerTest, test::ResourceFix
         .putProperty("source", "test2")
         .add();
 
+    Switch& sw2 = network.getSwitch("S1VL1_BBS_TWT_DISCONNECTOR");
+    sw2.newExtension<DiscreteMeasurementsAdder>().add();
+    sw2.getExtension<DiscreteMeasurements>()
+        .newDiscreteMeasurement()
+        .setType(DiscreteMeasurement::Type::SWITCH_POSITION)
+        .setValue("CLOSED")
+        .setValid(false)
+        .putProperty("source", "test")
+        .add();
+    sw2.getExtension<DiscreteMeasurements>()
+        .newDiscreteMeasurement()
+        .setType(DiscreteMeasurement::Type::OTHER)
+        .setValue("CLOSED")
+        .setValid(false)
+        .putProperty("source", "test")
+        .add();
+
     const std::string& networkStrRef = ResourceFixture::getResource("/disMeasRef.xml");
 
     test::converter::RoundTrip::runXml(network, networkStrRef);