Merge pull request #17 from com-pas/fix-historyitem

Changed the HItem records being added.

Author: Flurb

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericHeader.java

@@ -25,14 +25,15 @@ public String getVersion() {
     }
 
     public void addHistoryItem(String who, String fullmessage) {
-        var formatter = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssXXX");
+        var formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
         var history = getOrCreateHistory();
 
+        var now = new Date();
         var document = getElement().getOwnerDocument();
         Element hItem = document.createElementNS(SCL_NS_URI, "Hitem");
         hItem.setAttribute("version", getVersion());
-        hItem.setAttribute("revision", "saa");
-        hItem.setAttribute("when", formatter.format(new Date()));
+        hItem.setAttribute("revision", String.valueOf(now.getTime()));
+        hItem.setAttribute("when", formatter.format(now));
         hItem.setAttribute("who", who);
         hItem.setAttribute("what", fullmessage);
         history.appendChild(hItem);

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java

@@ -50,10 +50,11 @@ public String updateSCL(String sclData, List<String> substationNames, String who
             // Use that JSON to enrich the passed SCL XML with X/Y Coordinates.
             var enricher = new SclAutoAlignmentEnricher(scl, jsonGraphInfo);
             enricher.enrich();
-        });
 
-        // Add an extra History Element to show there was a change.
-        scl.getOrCreateHeader().addHistoryItem(who, "Add or replaced the X/Y Coordinates in the SCL File.");
+            // Add an extra History Element to show there was a change.
+            scl.getOrCreateHeader().addHistoryItem(who, "Add or replaced the X/Y Coordinates for Substation '" +
+                    substationName + "' in the SCL File.");
+        });
 
         return converter.convertToString(scl.getElement());
     }

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericHeaderTest.java

@@ -19,6 +19,9 @@
 import static org.lfenergy.compas.scl.auto.alignment.model.GenericSCLTest.BASIC_SCD_FILENAME;
 
 class GenericHeaderTest {
+    private static final String USERNAME = "Test User";
+    private static final String MESSAGE = "Some message";
+
     private GenericHeader header;
 
     @BeforeEach
@@ -45,15 +48,16 @@ void getVersion_WhenCalled_ThenTypeReturned() {
 
     @Test
     void addHistoryItem_WhenCalled_ThenAllElementsAreCreated() {
-        header.addHistoryItem("Test User", "Some message");
+        header.addHistoryItem(USERNAME, MESSAGE);
 
         var history = ElementUtil.getElementsStream(header.getElement(), "History").findFirst().orElse(null);
         assertNotNull(history);
         var historyItems = ElementUtil.getElementsStream(header.getElement(), "Hitem").collect(Collectors.toList());
         var historyItem = historyItems.get(historyItems.size() - 1);
         assertNotNull(historyItem);
-        assertEquals("Test User", historyItem.getAttribute("who"));
-        assertEquals("Some message", historyItem.getAttribute("what"));
+        assertNotNull(historyItem.getAttribute("revision"));
+        assertEquals(USERNAME, historyItem.getAttribute("who"));
+        assertEquals(MESSAGE, historyItem.getAttribute("what"));
     }
 
     @Test
@@ -64,7 +68,7 @@ void addHistoryItem_WhenCalledNotContainingHistory_ThenAllElementsAreCreated() {
         var scl = new GenericSCL(sclElement);
         header = scl.getOrCreateHeader();
 
-        header.addHistoryItem("Test User", "Some message");
+        header.addHistoryItem(USERNAME, MESSAGE);
 
         var history = ElementUtil.getElementsStream(header.getElement(), "History").findFirst().orElse(null);
         assertNotNull(history);